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

Fixed test-failure

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26302 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Frederik Heremans
2011-03-18 12:22:39 +00:00
parent 638ad1b530
commit cbfdbccabd
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java
View File

@@ -28,6 +28,7 @@ import java.util.Map;
import org.activiti.engine.ProcessEngine; import org.activiti.engine.ProcessEngine;
import org.activiti.engine.impl.runtime.TimerEntity; import org.activiti.engine.impl.runtime.TimerEntity;
import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.Job;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent;
@@ -46,7 +47,6 @@ import org.alfresco.service.cmr.workflow.WorkflowInstance;
import org.alfresco.service.cmr.workflow.WorkflowPath; import org.alfresco.service.cmr.workflow.WorkflowPath;
import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.cmr.workflow.WorkflowTimer;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest; import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
@@ -73,13 +73,8 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest {
private TestPersonManager personManager; private TestPersonManager personManager;
public void testNothing()
{
// dummy test so that something gets executed
}
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public void offTestTimerExecutionAuthentication() throws Exception public void testTimerExecutionAuthentication() throws Exception
{ {
this.setComplete(); this.setComplete();
this.endTransaction(); this.endTransaction();
@@ -168,7 +163,7 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest {
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public void offTestTimerExecutionTransactionRollback() throws Exception public void testTimerExecutionTransactionRollback() throws Exception
{ {
this.setComplete(); this.setComplete();
this.endTransaction(); this.endTransaction();
@@ -293,8 +288,12 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest {
private void waitForTimersToBeExecuted(String workflowInstanceId) throws Exception private void waitForTimersToBeExecuted(String workflowInstanceId) throws Exception
{ {
String processInstanceId = BPMEngineRegistry.getLocalId(workflowInstanceId);
// Job-executor should finish the job, no timers should be available for WF // Job-executor should finish the job, no timers should be available for WF
List<WorkflowTimer> timers = workflowService.getTimers(workflowInstanceId); List<Job> timers = activitiProcessEngine.getManagementService().createJobQuery()
.timers()
.processInstanceId(processInstanceId)
.list();
int numberOfRetries = 5; int numberOfRetries = 5;
for(int i=0; i< numberOfRetries; i++) for(int i=0; i< numberOfRetries; i++)
@@ -304,7 +303,10 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest {
break; break;
} }
Thread.sleep(1000); Thread.sleep(1000);
timers = workflowService.getTimers(workflowInstanceId); timers = activitiProcessEngine.getManagementService().createJobQuery()
.timers()
.processInstanceId(processInstanceId)
.list();
} }
} }