Author: tom.baeyens(a)jboss.com Date: 2009-10-12 02:48:23 -0400 (Mon, 12 Oct 2009) New Revision: 5728 Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java Log: fixing testsuite problem with clock Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java 2009-10-09 15:32:24 UTC (rev 5727) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custombusinesscalendarcfg/CustomBusinessCalendarCfgTest.java 2009-10-12 06:48:23 UTC (rev 5728) @@ -58,22 +58,27 @@ Date clockDate = gregorianCalendar.getTime(); Clock.setCurrentTime(clockDate); - ProcessInstance processInstance = executionService.startProcessInstanceByKey("CustomBusinessCalendarCfg"); + try { + ProcessInstance processInstance = executionService.startProcessInstanceByKey("CustomBusinessCalendarCfg"); - Job job = managementService.createJobQuery() - .processInstanceId(processInstance.getId()) - .uniqueResult(); + Job job = managementService.createJobQuery() + .processInstanceId(processInstance.getId()) + .uniqueResult(); + + Date duedate = job.getDueDate(); + + gregorianCalendar = new GregorianCalendar(); + gregorianCalendar.setTime(duedate); + assertEquals(2009, gregorianCalendar.get(Calendar.YEAR)); + assertEquals(Calendar.NOVEMBER, gregorianCalendar.get(Calendar.MONTH)); + assertEquals(2, gregorianCalendar.get(Calendar.DAY_OF_MONTH)); + assertEquals(10, gregorianCalendar.get(Calendar.HOUR_OF_DAY)); + assertEquals(0, gregorianCalendar.get(Calendar.MINUTE)); + assertEquals(0, gregorianCalendar.get(Calendar.SECOND)); + + } finally { + Clock.setCurrentTime(null); + } - Date duedate = job.getDueDate(); - - gregorianCalendar = new GregorianCalendar(); - gregorianCalendar.setTime(duedate); - assertEquals(2009, gregorianCalendar.get(Calendar.YEAR)); - assertEquals(Calendar.NOVEMBER, gregorianCalendar.get(Calendar.MONTH)); - assertEquals(2, gregorianCalendar.get(Calendar.DAY_OF_MONTH)); - assertEquals(10, gregorianCalendar.get(Calendar.HOUR_OF_DAY)); - assertEquals(0, gregorianCalendar.get(Calendar.MINUTE)); - assertEquals(0, gregorianCalendar.get(Calendar.SECOND)); - } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-10-09 15:32:24 UTC (rev 5727) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-10-12 06:48:23 UTC (rev 5728) @@ -63,7 +63,7 @@ assertEquals(HistoryProcessInstance.STATE_ENDED, historyProcessInstance.getState()); assertNotNull(historyProcessInstance.getStartTime()); assertNotNull(historyProcessInstance.getEndTime()); - assertTrue(historyProcessInstance.getDuration()>=0); + assertTrue("hpi.duration should be bigger then 0: "+historyProcessInstance.getDuration(), historyProcessInstance.getDuration()>=0); } // also check that the ended process instances have been removed from the