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
This commit is contained in:
Erik Winlof
2014-09-04 07:04:06 +00:00
parent 6bd37d727a
commit 0e73462102

View File

@@ -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);
@@ -1131,6 +1134,9 @@ 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());
RequestContext requestContext = initApiClientWithTestUser();
String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();