[jbpm-commits] JBoss JBPM SVN: r6698 - in jbpm4/trunk/modules/test-cfg/src/test: resources/org/jbpm/test/custom/cal/cfg and 1 other directory.
Author: alex.guizar(a)jboss.com
Date: 2010-09-28 17:03:54 -0400 (Tue, 28 Sep 2010)
New Revision: 6698
Modified:
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custom/cal/cfg/CustomBusinessCalendarCfgTest.java
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custom/cal/cfg/jbpm.cfg.xml
Log:
test saturday working day in custom business calendar configuration
Modified:
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custom/cal/cfg/CustomBusinessCalendarCfgTest.java
===================================================================
---
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custom/cal/cfg/CustomBusinessCalendarCfgTest.java 2010-09-28
20:49:32 UTC (rev 6697)
+++
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/custom/cal/cfg/CustomBusinessCalendarCfgTest.java 2010-09-28
21:03:54 UTC (rev 6698)
@@ -22,15 +22,12 @@
package org.jbpm.test.custom.cal.cfg;
import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
import org.jbpm.api.ProcessInstance;
import org.jbpm.api.job.Job;
import org.jbpm.pvm.internal.util.Clock;
import org.jbpm.test.JbpmCustomCfgTestCase;
-
/**
* @author Tom Baeyens
*/
@@ -59,10 +56,10 @@
"</process>"
);
- GregorianCalendar gregorianCalendar = new GregorianCalendar();
- gregorianCalendar.set(2009, Calendar.JANUARY, 30, 11, 0, 0);
- Date clockDate = gregorianCalendar.getTime();
- Clock.setExplicitTime(clockDate);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(2009, Calendar.JANUARY, 30, 11, 0, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
+ Clock.setExplicitTime(calendar.getTime());
try {
ProcessInstance processInstance =
executionService.startProcessInstanceByKey("CustomBusinessCalendarCfg");
@@ -71,20 +68,14 @@
.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));
+ calendar.add(Calendar.HOUR, 8);
+ // there are 15 hours between 18:00 and 9:00 next day
+ calendar.add(Calendar.HOUR, 15);
- } finally {
+ assertEquals(calendar.getTimeInMillis(), job.getDueDate().getTime());
+ }
+ finally {
Clock.setExplicitTime(null);
}
-
}
}
Modified:
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custom/cal/cfg/jbpm.cfg.xml
===================================================================
---
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custom/cal/cfg/jbpm.cfg.xml 2010-09-28
20:49:32 UTC (rev 6697)
+++
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/custom/cal/cfg/jbpm.cfg.xml 2010-09-28
21:03:54 UTC (rev 6698)
@@ -14,7 +14,7 @@
<wednesday hours="9:00-18:00"/>
<thursday hours="9:00-18:00"/>
<friday hours="9:00-18:00"/>
- <holiday period="01/02/2009 - 31/10/2009"/>
+ <saturday hours="9:00-18:00"/>
</business-calendar>
</process-engine-context>