From 0e734621028b92251bc60a2dfaf8fb82b0a65021 Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 07:04:06 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 82414: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 80283: ACE-2276 - More clock fixing, git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/workflow/api/tests/TaskWorkflowApiTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java index 69d30d55d7..0899fe22c1 100644 --- a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java +++ b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java @@ -37,6 +37,7 @@ import java.util.Set; import java.util.UUID; import org.activiti.engine.history.HistoricTaskInstance; +import org.activiti.engine.runtime.Clock; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.DelegationState; import org.activiti.engine.task.IdentityLinkType; @@ -85,6 +86,8 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi // Alter current engine date Calendar createdCal = Calendar.getInstance(); createdCal.set(Calendar.MILLISECOND, 0); + Clock actiClock = activitiProcessEngine.getProcessEngineConfiguration().getClock(); + actiClock.setCurrentTime(createdCal.getTime()); ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null); @@ -1130,7 +1133,10 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi { // Alter current engine date Calendar createdCal = Calendar.getInstance(); - createdCal.set(Calendar.MILLISECOND, 0); + createdCal.set(Calendar.MILLISECOND, 0); + Clock actiClock = activitiProcessEngine.getProcessEngineConfiguration().getClock(); + actiClock.setCurrentTime(createdCal.getTime()); + RequestContext requestContext = initApiClientWithTestUser(); String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();