[Objectlabkit-svn] SF.net SVN: objectlabkit:[268] trunk

[<ma...@us...>]

Revision: 268
          http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=268&view=rev
Author:   marchy
Date:     2009-02-25 21:00:30 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Fix for bug 2389053

Modified Paths:
--------------
    trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
    trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java
    trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java
    trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java

Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java	2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java	2009-02-25 21:00:30 UTC (rev 268)
@@ -41,8 +41,13 @@
 
 public abstract class AbstractForwardUnlessNegativeCalculatorTest<E> extends AbstractDateTestCase<E> {
 
+    public void testType() {
+        final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
+        assertEquals(HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK, cal.getHolidayHandlerType());
+    }
+
     public void testSimpleForwardWithWeekend() {
-        final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+        final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
         Assert.assertEquals("Name", "bla", cal.getName());
         Assert.assertEquals("Holidays size", 0, cal.getHolidayCalendar().getHolidays().size());
 
@@ -236,6 +241,15 @@
         checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31");
         cal.setStartDate(newDate("2006-08-24"));
         checkDate("Move by 1W with 1 bank holiday", cal.moveByBusinessDays(7), "2006-09-05");
+        
+        cal.setStartDate(newDate("2006-08-17"));
+        checkDate("Negative move by 1 day", cal.moveByBusinessDays(-1), "2006-08-16");
+        
+        cal.setStartDate(newDate("2006-08-25"));
+        checkDate("Negative move by 4 days", cal.moveByBusinessDays(-4), "2006-08-21");
+
+        cal.setStartDate(newDate("2006-08-29"));
+        checkDate("Negative move by x days, across weekend, and bank holiday", cal.moveByBusinessDays(-5), "2006-08-21");
     }
 
     public void testMoveByTenorDays() {

Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java	2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java	2009-02-25 21:00:30 UTC (rev 268)
@@ -89,7 +89,7 @@
      * @return algorithm name.
      */
     public String getType() {
-        return HolidayHandlerType.FORWARD;
+        return HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
     }
 }
 

Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java	2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java	2009-02-25 21:00:30 UTC (rev 268)
@@ -92,7 +92,7 @@
      * @return algorithm name.
      */
     public String getType() {
-        return HolidayHandlerType.FORWARD;
+        return HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
     }
 }
 

Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java	2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java	2009-02-25 21:00:30 UTC (rev 268)
@@ -89,7 +89,7 @@
      * @return algorithm name.
      */
     public String getType() {
-        return HolidayHandlerType.FORWARD;
+        return HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
     }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.