[jbpm-commits] JBoss JBPM SVN: r6112 - in jbpm4/trunk/modules: test-db and 1 other directories.

Author: jbarrez Date: 2010-01-21 04:17:34 -0500 (Thu, 21 Jan 2010) New Revision: 6112 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/intermediatecatch/IntermediateCatchTimerEventTest.java Log: Fix for Hudson Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java 2010-01-21 09:12:26 UTC (rev 6111) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java 2010-01-21 09:17:34 UTC (rev 6112) @@ -28,6 +28,7 @@ import java.util.TimeZone; import org.jbpm.api.JbpmException; +import org.jbpm.pvm.internal.util.Clock; /** * a calendar that knows about business hours. @@ -85,7 +86,7 @@ Date end = null; long millis = convertToMillis(duration); end = new Date(date.getTime()-millis); - if (end.before(new Date())) { + if (end.before(Clock.getCurrentTime())) { throw new JbpmException("Duedate "+ end+ " in the past"); } return end; Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2010-01-21 09:12:26 UTC (rev 6111) +++ jbpm4/trunk/modules/test-db/pom.xml 2010-01-21 09:17:34 UTC (rev 6112) @@ -105,8 +105,7 @@ <trimStackTrace>false</trimStackTrace> <redirectTestOutputToFile>true</redirectTestOutputToFile> <excludes> - <exclude>org/jbpm/bpmn/UserTaskTest.java</exclude> - <exclude>org/jbpm/bpmn/test/intermediatecatch/IntermediateCatchTimerEventTest.java</exclude> + </excludes> </configuration> </plugin> Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/intermediatecatch/IntermediateCatchTimerEventTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/intermediatecatch/IntermediateCatchTimerEventTest.java 2010-01-21 09:12:26 UTC (rev 6111) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/bpmn/test/intermediatecatch/IntermediateCatchTimerEventTest.java 2010-01-21 09:17:34 UTC (rev 6112) @@ -166,9 +166,9 @@ assertProcessInstanceEnded(pi); } - public void testCronExpression() { + public void testCronExpression() throws InterruptedException { deployBpmn2XmlString(TIMER_CATCH_WITH_CRON_EXPRESSION); - Clock.setCurrentTime(new Date(61000)); // Start on 35 seconds + Clock.setCurrentTime(new Date(61000)); // Start on 61 seconds ProcessInstance pi = executionService.startProcessInstanceByKey("timeDateProcess"); CollectionAssertions.assertContainsSameElements(pi.findActiveActivityNames(), "intermediateTimer");