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 
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
This commit is contained in:
Erik Winlof
2014-09-04 07:04:06 +00:00
parent 6bd37d727a
commit 0e73462102
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
import org.activiti.engine.history.HistoricTaskInstance; import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.runtime.Clock;
import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.DelegationState; import org.activiti.engine.task.DelegationState;
import org.activiti.engine.task.IdentityLinkType; import org.activiti.engine.task.IdentityLinkType;
@@ -85,6 +86,8 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
// Alter current engine date // Alter current engine date
Calendar createdCal = Calendar.getInstance(); Calendar createdCal = Calendar.getInstance();
createdCal.set(Calendar.MILLISECOND, 0); createdCal.set(Calendar.MILLISECOND, 0);
Clock actiClock = activitiProcessEngine.getProcessEngineConfiguration().getClock();
actiClock.setCurrentTime(createdCal.getTime());
ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null); ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
@@ -1130,7 +1133,10 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
{ {
// Alter current engine date // Alter current engine date
Calendar createdCal = Calendar.getInstance(); 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(); RequestContext requestContext = initApiClientWithTestUser();
String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId(); String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();