Author: alex.guizar(a)jboss.com Date: 2010-12-16 02:01:05 -0500 (Thu, 16 Dec 2010) New Revision: 6871 Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml Log: fix tests that depended on a specific time zone Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java 2010-12-16 06:46:34 UTC (rev 6870) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java 2010-12-16 07:01:05 UTC (rev 6871) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.examples.bpmn.event.error; +package org.jbpm.examples.bpmn.event.escalation; import org.jbpm.api.NewDeployment; import org.jbpm.api.ProcessInstance; Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java 2010-12-16 06:46:34 UTC (rev 6870) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerInterruptingTest.java 2010-12-16 07:01:05 UTC (rev 6871) @@ -21,7 +21,7 @@ */ package org.jbpm.examples.bpmn.event.timer; -import java.util.Date; +import java.util.Calendar; import java.util.List; import org.jbpm.api.NewDeployment; @@ -32,7 +32,6 @@ import org.jbpm.test.JbpmTestCase; /** - * * @author Huisheng Xu */ public class BoundaryEventTimerInterruptingTest extends JbpmTestCase { @@ -58,20 +57,25 @@ taskService.completeTask(task.getId()); assertProcessInstanceEnded(processInstance); - List timerJobs = managementService.createJobQuery() + List<Job> timerJobs = managementService.createJobQuery() .processInstanceId(processInstance.getId()) .list(); assertEquals(0, timerJobs.size()); } public void testTimerEvent() { - Clock.setExplicitTime(new Date(0)); + Calendar calendar = Calendar.getInstance(); + calendar.set(2007, Calendar.JULY, 7, 0, 0, 0); + calendar.set(Calendar.MILLISECOND, 0); + Clock.setExplicitTime(calendar.getTime()); ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_event_timer_interrupting"); Job timerJob = managementService.createJobQuery() .processInstanceId(processInstance.getId()) .uniqueResult(); - assertEquals(new Date(60 * 60 * 1000).getTime(), timerJob.getDueDate().getTime()); + calendar.set(Calendar.HOUR_OF_DAY, 19); + calendar.set(Calendar.MINUTE, 7); + assertEquals(calendar.getTimeInMillis(), timerJob.getDueDate().getTime()); managementService.executeJob(timerJob.getId()); Task task = taskService.createTaskQuery().uniqueResult(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java 2010-12-16 06:46:34 UTC (rev 6870) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/timer/BoundaryEventTimerNoneInterruptingTest.java 2010-12-16 07:01:05 UTC (rev 6871) @@ -21,7 +21,7 @@ */ package org.jbpm.examples.bpmn.event.timer; -import java.util.Date; +import java.util.Calendar; import java.util.List; import org.jbpm.api.NewDeployment; @@ -32,7 +32,6 @@ import org.jbpm.test.JbpmTestCase; /** - * * @author Huisheng Xu */ public class BoundaryEventTimerNoneInterruptingTest extends JbpmTestCase { @@ -58,22 +57,27 @@ taskService.completeTask(task.getId()); assertProcessInstanceEnded(processInstance); - List timerJobs = managementService.createJobQuery() + List<Job> timerJobs = managementService.createJobQuery() .processInstanceId(processInstance.getId()) .list(); assertEquals(0, timerJobs.size()); } public void testTimerEvent() { - Clock.setExplicitTime(new Date(0)); + Calendar calendar = Calendar.getInstance(); + calendar.set(2007, Calendar.JULY, 7, 0, 0, 0); + calendar.set(Calendar.MILLISECOND, 0); + Clock.setExplicitTime(calendar.getTime()); ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_event_timer_none_interrupting"); Job timerJob = managementService.createJobQuery() .processInstanceId(processInstance.getId()) .uniqueResult(); - assertEquals(new Date(60 * 60 * 1000).getTime(), timerJob.getDueDate().getTime()); + calendar.set(Calendar.HOUR_OF_DAY, 19); + calendar.set(Calendar.MINUTE, 7); + assertEquals(calendar.getTimeInMillis(), timerJob.getDueDate().getTime()); + managementService.executeJob(timerJob.getId()); - assertProcessInstanceEnded(processInstance); } Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml 2010-12-16 06:46:34 UTC (rev 6870) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_interrupting.bpmn.xml 2010-12-16 07:01:05 UTC (rev 6871) @@ -24,7 +24,7 @@ <boundaryEvent id="escalationTimer" cancelActivity="true" attachedToRef="firstLineSupport"> <timerEventDefinition> - <timeDate xsi:type="tFormalExpression">01/01/1970 09:00:00</timeDate> + <timeDate xsi:type="tFormalExpression">07/07/2007 19:07:00</timeDate> </timerEventDefinition> </boundaryEvent> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml 2010-12-16 06:46:34 UTC (rev 6870) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/timer/boundary_event_timer_none_interrupting.bpmn.xml 2010-12-16 07:01:05 UTC (rev 6871) @@ -24,7 +24,7 @@ <boundaryEvent id="escalationTimer" cancelActivity="false" attachedToRef="firstLineSupport"> <timerEventDefinition> - <timeDate xsi:type="tFormalExpression">01/01/1970 09:00:00</timeDate> + <timeDate xsi:type="tFormalExpression">07/07/2007 19:07:00</timeDate> </timerEventDefinition> </boundaryEvent>