Author: alex.guizar(a)jboss.com Date: 2010-08-27 02:54:23 -0400 (Fri, 27 Aug 2010) New Revision: 6629 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java Log: JBPM-1776 correct exception message assumption in scheduler test; replace "substraction" with "subtraction" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java 2010-08-27 06:48:53 UTC (rev 6628) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java 2010-08-27 06:54:23 UTC (rev 6629) @@ -29,7 +29,7 @@ import org.jbpm.calendar.Duration; /** - * Business time substraction delivers unexpected results. + * Business time subtraction delivers unexpected results. * * @see <a href="https://jira.jboss.org/browse/JBPM-1776">JBPM-1776<... * @author Alejandro Guizar @@ -38,7 +38,7 @@ static BusinessCalendar businessCalendar = new BusinessCalendar(); - public void testNonBusinessSecondSubstraction() throws Exception { + public void testNonBusinessSecondSubtraction() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 7, 10, 30, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -51,7 +51,7 @@ assertEquals(expected, actual); } - public void testNonBusinessMinuteSubstraction() throws Exception { + public void testNonBusinessMinuteSubtraction() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 7, 11, 55, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -63,7 +63,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-10 minutes"))); } - public void testNonBusinessFractionalDurationSubstraction() { + public void testNonBusinessFractionalDurationSubtraction() { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45); calendar.set(Calendar.MILLISECOND, 125); @@ -76,7 +76,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-7.75 hours"))); } - public void testNonBusinessDaySubstraction() { + public void testNonBusinessDaySubtraction() { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.FEBRUARY, 5, 6, 30, 45); calendar.set(Calendar.MILLISECOND, 125); @@ -88,7 +88,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-10 days"))); } - public void testNonBusinessWeekSubstraction() throws Exception { + public void testNonBusinessWeekSubtraction() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45); calendar.set(Calendar.MILLISECOND, 125); @@ -100,7 +100,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-5 weeks"))); } - public void testNonBusinessMonthSubstraction() throws Exception { + public void testNonBusinessMonthSubtraction() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45); calendar.set(Calendar.MILLISECOND, 125); @@ -112,7 +112,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-3 months"))); } - public void testNonBusinessYearSubstraction() throws Exception { + public void testNonBusinessYearSubtraction() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45); calendar.set(Calendar.MILLISECOND, 125); @@ -124,7 +124,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-1 year"))); } - public void testBusinessDurationSubstractionOverBusinessTime() throws Exception { + public void testBusinessDurationSubtractionOverBusinessTime() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 7, 11, 55, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -136,7 +136,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-1 business minute"))); } - public void testBusinessDurationSubstractionOverLunchBreak() throws Exception { + public void testBusinessDurationSubtractionOverLunchBreak() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 7, 12, 35, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -150,7 +150,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-10 business minutes"))); } - public void testBusinessDurationSubstractionOverDayBreak() throws Exception { + public void testBusinessDurationSubtractionOverDayBreak() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 8, 9, 5, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -164,7 +164,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-10 business minutes"))); } - public void testBusinessDurationSubstractionOverHoliday() throws Exception { + public void testBusinessDurationSubtractionOverHoliday() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2010, Calendar.NOVEMBER, 12, 9, 5, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -180,7 +180,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-10 business minutes"))); } - public void testBusinessDurationSubstractionOverWeekend() throws Exception { + public void testBusinessDurationSubtractionOverWeekend() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 11, 9, 5, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -210,7 +210,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-2 business hours"))); } - public void testBusinessDurationSubstractionOutsideBusinessHours() throws Exception { + public void testBusinessDurationSubtractionOutsideBusinessHours() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 8, 12, 15, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -224,7 +224,7 @@ assertEquals(expected, businessCalendar.add(start, new Duration("-30 business minutes"))); } - public void testBusinessDurationSubstractionOutsideBusinessHoursOverWeekend() throws Exception { + public void testBusinessDurationSubtractionOutsideBusinessHoursOverWeekend() throws Exception { Calendar calendar = BusinessCalendar.getCalendar(); calendar.set(2005, Calendar.APRIL, 11, 12, 15, 0); calendar.set(Calendar.MILLISECOND, 0); Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2010-08-27 06:48:53 UTC (rev 6628) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2010-08-27 06:54:23 UTC (rev 6629) @@ -691,7 +691,7 @@ catch (JbpmException je) { Throwable cause = je.getCause(); assertSame(IllegalArgumentException.class, cause.getClass()); - assert cause.getMessage().indexOf("1 demo") != -1 : cause; + assert cause.getMessage().indexOf("demo") != -1 : cause; } finally { jbpmContext.close();