objectlabkit-svn

[Objectlabkit-svn] SF.net SVN: objectlabkit: [87] trunk/datecalc-common/src/test/java/net/ objectlab/kit/datecalc/common

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

Revision: 87
          http://svn.sourceforge.net/objectlabkit/?rev=87&view=rev
Author:   marchy
Date:     2006-09-03 18:08:15 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
generic tests for jdk. some failures :/

Modified Paths:
--------------
    trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
    trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java

Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java	2006-09-03 18:07:42 UTC (rev 86)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java	2006-09-04 01:08:15 UTC (rev 87)
@@ -9,10 +9,6 @@
 public abstract class AbstractDateTestCase<E> extends TestCase {
     protected abstract E newDate(final String date);
 
-    protected abstract DateCalculator<E> newDateCalculator(String name, String type);
-
-    protected abstract WorkingWeek getWorkingWeek(WorkingWeek ww);
-    
     protected abstract DateCalculatorFactory<E> getDateCalculatorFactory();
     
     protected void checkDate(final String string, final DateCalculator<E> calendar, final String string2) {
@@ -47,4 +43,12 @@
     protected void registerHolidays(final String name, final Set<E> holidays) {
         getDateCalculatorFactory().registerHolidays(name, holidays);
     }
+
+    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
+        return ww;
+    }
+
+    protected DateCalculator<E> newDateCalculator(String name, String type) {
+        return getDateCalculatorFactory().getDateCalculator(name, type);
+    }
 }

Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java	2006-09-04 01:08:15 UTC (rev 87)
@@ -4,11 +4,6 @@
 import java.util.Set;
 
 import junit.framework.Assert;
-import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
-import net.objectlab.kit.datecalc.common.StandardTenor;
-import net.objectlab.kit.datecalc.common.Tenor;
-import net.objectlab.kit.datecalc.common.TenorCode;
 
 public abstract class AbstractModifiedPreceedingDateCalculatorTest<E> extends AbstractDateTestCase<E> {
 
@@ -276,5 +271,4 @@
         checkDate("do NOT move to next month", cal, "2006-08-02");
     }
     
-    protected abstract WorkingWeek getWorkingWeek(WorkingWeek ww); 
 }


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

[Objectlabkit-svn] SF.net SVN: objectlabkit: [239] trunk/datecalc-common/src/test/java/net/ objectlab/kit/datecalc/common

[<be...@us...>]

Revision: 239
          http://svn.sourceforge.net/objectlabkit/?rev=239&view=rev
Author:   benoitx
Date:     2007-01-05 13:16:25 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
more tests.

Modified Paths:
--------------
    trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
    trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.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	2007-01-05 20:45:33 UTC (rev 238)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java	2007-01-05 21:16:25 UTC (rev 239)
@@ -32,7 +32,10 @@
  */
 package net.objectlab.kit.datecalc.common;
 
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
 
 import junit.framework.Assert;
 
@@ -373,6 +376,87 @@
         checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 2, "2006-09-01", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
         checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 2, "2006-08-30", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
     }
+
+
+    public void testCalculateTenorsZeroDaysToSpot() {
+        List<Tenor> list = new ArrayList<Tenor>();
+        list.add(StandardTenor.OVERNIGHT);
+        list.add(StandardTenor.SPOT);
+        list.add(StandardTenor.T_1D);
+        list.add(StandardTenor.T_2D);
+        list.add(StandardTenor.T_1W);
+        list.add(StandardTenor.T_1M);
+        list.add(StandardTenor.T_2M);
+        list.add(StandardTenor.T_3M);
+        list.add(StandardTenor.T_6M);
+        list.add(StandardTenor.T_9M);
+        list.add(StandardTenor.T_1Y);
+
+        final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
+        cal.setHolidayCalendar(createUKHolidayCalendar());
+        String startDate = "2006-08-24";
+        cal.setStartDate(newDate(startDate));
+        List<E> expectedResults = new ArrayList<E>();
+        expectedResults.add(newDate("2006-08-25")); // ON
+        expectedResults.add(newDate("2006-08-24")); // SPOT
+        expectedResults.add(newDate("2006-08-25")); // 1D
+        expectedResults.add(newDate("2006-08-29")); // 2D
+        expectedResults.add(newDate("2006-08-31")); // 1W
+        expectedResults.add(newDate("2006-09-25")); // 1M
+        expectedResults.add(newDate("2006-10-24")); // 2M
+        expectedResults.add(newDate("2006-11-24")); // 3M
+        expectedResults.add(newDate("2007-02-26")); // 6M
+        expectedResults.add(newDate("2007-05-24")); // 9M
+        expectedResults.add(newDate("2007-08-24")); // 1Y
+
+        List<E> results = cal.calculateTenorDates(list);
+        assertEquals("Same size as tenor", list.size(), results.size());
+        Iterator<E> it = results.iterator();
+        Iterator<E> expected = expectedResults.iterator();
+        for (Tenor tenor : list) {
+            assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+        }
+    }
+
+    public void testCalculateTenorsTwoDaysToSpot() {
+        List<Tenor> list = new ArrayList<Tenor>();
+        list.add(StandardTenor.OVERNIGHT);
+        list.add(StandardTenor.SPOT);
+        list.add(StandardTenor.T_1D);
+        list.add(StandardTenor.T_2D);
+        list.add(StandardTenor.T_1W);
+        list.add(StandardTenor.T_1M);
+        list.add(StandardTenor.T_2M);
+        list.add(StandardTenor.T_3M);
+        list.add(StandardTenor.T_6M);
+        list.add(StandardTenor.T_9M);
+        list.add(StandardTenor.T_1Y);
+
+        final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
+        cal.setHolidayCalendar(createUKHolidayCalendar());
+        String startDate = "2006-08-24";
+        cal.setStartDate(newDate(startDate));
+        List<E> expectedResults = new ArrayList<E>();
+        expectedResults.add(newDate("2006-08-25")); // ON
+        expectedResults.add(newDate("2006-08-29")); // SPOT
+        expectedResults.add(newDate("2006-08-30")); // 1D
+        expectedResults.add(newDate("2006-08-31")); // 2D
+        expectedResults.add(newDate("2006-09-05")); // 1W
+        expectedResults.add(newDate("2006-09-29")); // 1M
+        expectedResults.add(newDate("2006-10-30")); // 2M
+        expectedResults.add(newDate("2006-11-29")); // 3M
+        expectedResults.add(newDate("2007-02-28")); // 6M - is this correct?
+        expectedResults.add(newDate("2007-05-29")); // 9M
+        expectedResults.add(newDate("2007-08-29")); // 1Y
+
+        List<E> results = cal.calculateTenorDates(list, 2);
+        assertEquals("Same size as tenor", list.size(), results.size());
+        Iterator<E> it = results.iterator();
+        Iterator<E> expected = expectedResults.iterator();
+        for (Tenor tenor : list) {
+            assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+        }
+    }
 }
 
 /*

Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java	2007-01-05 20:45:33 UTC (rev 238)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java	2007-01-05 21:16:25 UTC (rev 239)
@@ -32,7 +32,10 @@
  */
 package net.objectlab.kit.datecalc.common;
 
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 import junit.framework.Assert;
@@ -392,6 +395,86 @@
         checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 2, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLOWING);
         checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 2, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLOWING);
     }
+
+    public void testCalculateTenorsZeroDaysToSpot() {
+        List<Tenor> list = new ArrayList<Tenor>();
+        list.add(StandardTenor.OVERNIGHT);
+        list.add(StandardTenor.SPOT);
+        list.add(StandardTenor.T_1D);
+        list.add(StandardTenor.T_2D);
+        list.add(StandardTenor.T_1W);
+        list.add(StandardTenor.T_1M);
+        list.add(StandardTenor.T_2M);
+        list.add(StandardTenor.T_3M);
+        list.add(StandardTenor.T_6M);
+        list.add(StandardTenor.T_9M);
+        list.add(StandardTenor.T_1Y);
+
+        final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
+        cal.setHolidayCalendar(createUKHolidayCalendar());
+        String startDate = "2006-08-24";
+        cal.setStartDate(newDate(startDate));
+        List<E> expectedResults = new ArrayList<E>();
+        expectedResults.add(newDate("2006-08-25")); // ON
+        expectedResults.add(newDate("2006-08-24")); // SPOT
+        expectedResults.add(newDate("2006-08-25")); // 1D
+        expectedResults.add(newDate("2006-08-29")); // 2D
+        expectedResults.add(newDate("2006-08-31")); // 1W
+        expectedResults.add(newDate("2006-09-25")); // 1M
+        expectedResults.add(newDate("2006-10-24")); // 2M
+        expectedResults.add(newDate("2006-11-24")); // 3M
+        expectedResults.add(newDate("2007-02-26")); // 6M
+        expectedResults.add(newDate("2007-05-24")); // 9M
+        expectedResults.add(newDate("2007-08-24")); // 1Y
+
+        List<E> results = cal.calculateTenorDates(list);
+        assertEquals("Same size as tenor", list.size(), results.size());
+        Iterator<E> it = results.iterator();
+        Iterator<E> expected = expectedResults.iterator();
+        for (Tenor tenor : list) {
+            assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+        }
+    }
+
+    public void testCalculateTenorsTwoDaysToSpot() {
+        List<Tenor> list = new ArrayList<Tenor>();
+        list.add(StandardTenor.OVERNIGHT);
+        list.add(StandardTenor.SPOT);
+        list.add(StandardTenor.T_1D);
+        list.add(StandardTenor.T_2D);
+        list.add(StandardTenor.T_1W);
+        list.add(StandardTenor.T_1M);
+        list.add(StandardTenor.T_2M);
+        list.add(StandardTenor.T_3M);
+        list.add(StandardTenor.T_6M);
+        list.add(StandardTenor.T_9M);
+        list.add(StandardTenor.T_1Y);
+
+        final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
+        cal.setHolidayCalendar(createUKHolidayCalendar());
+        String startDate = "2006-08-24";
+        cal.setStartDate(newDate(startDate));
+        List<E> expectedResults = new ArrayList<E>();
+        expectedResults.add(newDate("2006-08-25")); // ON
+        expectedResults.add(newDate("2006-08-29")); // SPOT
+        expectedResults.add(newDate("2006-08-30")); // 1D
+        expectedResults.add(newDate("2006-08-31")); // 2D
+        expectedResults.add(newDate("2006-09-05")); // 1W
+        expectedResults.add(newDate("2006-09-29")); // 1M
+        expectedResults.add(newDate("2006-10-30")); // 2M
+        expectedResults.add(newDate("2006-11-29")); // 3M
+        expectedResults.add(newDate("2007-02-28")); // 6M - is this correct?
+        expectedResults.add(newDate("2007-05-29")); // 9M
+        expectedResults.add(newDate("2007-08-29")); // 1Y
+
+        List<E> results = cal.calculateTenorDates(list, 2);
+        assertEquals("Same size as tenor", list.size(), results.size());
+        Iterator<E> it = results.iterator();
+        Iterator<E> expected = expectedResults.iterator();
+        for (Tenor tenor : list) {
+            assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+        }
+    }
 }
 
 /*


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