inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
84674: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84521: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         84435: MNT-11522 : Document modified date is being updated by Workflow
            - Unit test was corrected and refactored.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84688 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-19 08:35:02 +00:00
parent 0faa62e500
commit c6c08ef677
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/test-java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java
View File

@@ -148,26 +148,34 @@ public class ActivitiWorkflowServiceIntegrationTest extends AbstractWorkflowServ
props.put(ContentModel.PROP_NAME, "MNT-11522-testfile.txt");
final ChildAssociationRef childAssoc = nodeService.createNode(companyHome, ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.CONTENT_MODEL_PREFIX, "MNT-11522-test"), ContentModel.TYPE_CONTENT, props);
NodeRef node = childAssoc.getChildRef();
Date lastDate = new Date();
nodeService.setProperty(node, ContentModel.PROP_MODIFIED, lastDate);
NodeRef addedNodeRef = childAssoc.getChildRef();
Date lastModifiedDate = (Date)nodeService.getProperty(addedNodeRef, ContentModel.PROP_MODIFIED);
WorkflowDefinition definition = deployDefinition(getPooledReviewDefinitionPath());
assertNotNull(definition);
// Create workflow parameters
Map<QName, Serializable> params = new HashMap<QName, Serializable>();
NodeRef wfPackage = workflowService.createPackage(null);
params.put(WorkflowModel.ASSOC_PACKAGE, wfPackage);
NodeRef workflowPackage = workflowService.createPackage(null);
params.put(WorkflowModel.ASSOC_PACKAGE, workflowPackage);
NodeRef group = groupManager.get(GROUP);
assertNotNull(group);
params.put(WorkflowModel.ASSOC_GROUP_ASSIGNEE, group);
ChildAssociationRef childAs = nodeService.addChild(wfPackage, node, WorkflowModel.ASSOC_PACKAGE_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,
QName.createValidLocalName((String)nodeService.getProperty(node, ContentModel.PROP_NAME))));
nodeService.addChild(workflowPackage, addedNodeRef, WorkflowModel.ASSOC_PACKAGE_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,
QName.createValidLocalName((String)nodeService.getProperty(addedNodeRef, ContentModel.PROP_NAME))));
WorkflowPath startTask = workflowService.startWorkflow(definition.getId(), params);
assertNotNull(startTask);
WorkflowPath workflowPath = workflowService.startWorkflow(definition.getId(), params);
assertNotNull(workflowPath);
assertTrue(workflowPath.isActive());
final String workflowInstanceId = workflowPath.getInstance().getId();
// End start task to progress workflow
WorkflowTask startTask = workflowService.getStartTask(workflowInstanceId);
String startTaskId = startTask.getId();
assertEquals(lastDate, nodeService.getProperty(node, ContentModel.PROP_MODIFIED));
workflowService.endTask(startTaskId, null);
assertEquals(lastModifiedDate, nodeService.getProperty(addedNodeRef, ContentModel.PROP_MODIFIED));
}
public void testGetWorkflowTaskDefinitionsWithMultiInstanceTask()