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

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

Browse Source 
82400: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80250: ACE-2276	 - Update Activiti to 5.16.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 07:00:28 +00:00
parent f1583306ca
commit 9f7a5d3bfe
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
View File

@@ -37,7 +37,6 @@ import java.util.Set;
import java.util.UUID;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.DelegationState;
import org.activiti.engine.task.IdentityLinkType;
@@ -86,8 +85,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
// Alter current engine date
Calendar createdCal = Calendar.getInstance();
createdCal.set(Calendar.MILLISECOND, 0);
ClockUtil.setCurrentTime(createdCal.getTime());
ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
try
@@ -1132,9 +1130,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
{
// Alter current engine date
Calendar createdCal = Calendar.getInstance();
createdCal.set(Calendar.MILLISECOND, 0);
ClockUtil.setCurrentTime(createdCal.getTime());
createdCal.set(Calendar.MILLISECOND, 0);
RequestContext requestContext = initApiClientWithTestUser();
String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
@@ -1222,7 +1218,6 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
Calendar taskCreated = Calendar.getInstance();
taskCreated.set(Calendar.MILLISECOND, 0);
ClockUtil.setCurrentTime(taskCreated.getTime());
String businessKey = UUID.randomUUID().toString();
ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), businessKey);