Author: jbarrez Date: 2009-06-22 14:01:48 -0400 (Mon, 22 Jun 2009) New Revision: 5083 Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java Log: Added test for JBPM-2331 Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-06-22 17:03:36 UTC (rev 5082) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-06-22 18:01:48 UTC (rev 5083) @@ -195,7 +195,8 @@ assertExecutionEnded(processInstance.getId()); } - public void assertIsActiveActivity(String activityName, Execution execution) { + public void assertActiveActivity(String activityName, String executionId) { + Execution execution = executionService.findExecutionById(executionId); assertTrue("The given execution (or any child execution) isn't in the activity '" + activityName + "' (current activities : " + listAllActiveActivites(execution) + ")", execution.isActive(activityName)); Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java 2009-06-22 17:03:36 UTC (rev 5082) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java 2009-06-22 18:01:48 UTC (rev 5083) @@ -31,7 +31,7 @@ */ public class TimerTest extends JbpmTestCase { - public void testSignalExecutionById() { + public void testTimerTimeout() { deployJpdlXmlString( "<process name='Insurance claim' key='ICL'>" + " <start>" + @@ -55,6 +55,7 @@ .uniqueResult(); managementService.executeJob(job.getDbid()); + assertProcessInstanceEnded(processInstance); } -} +} \ No newline at end of file