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

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

Revision: 86
          http://svn.sourceforge.net/objectlabkit/?rev=86&view=rev
Author:   marchy
Date:     2006-09-03 11:07:42 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
pulled the holidays methods up into common.

Modified Paths:
--------------
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,10 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
-import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractBackwardDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.LocalDate;
@@ -45,40 +44,12 @@
         return DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
     }
 
-    @Override
-    protected Set<LocalDate> newHolidaysSet() {
-        final Set<LocalDate> holidays = new HashSet<LocalDate>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
+    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
+        return new JodaWorkingWeek(ww);
     }
 
     @Override
-    protected Set<LocalDate> createUKHolidays() {
-        final Set<LocalDate> uk = new HashSet<LocalDate>();
-        uk.add(new LocalDate("2006-01-01"));
-        uk.add(new LocalDate("2006-08-28"));
-        uk.add(new LocalDate("2006-12-25"));
-        uk.add(new LocalDate("2006-12-26"));
-        return uk;
+    protected DateCalculatorFactory<LocalDate> getDateCalculatorFactory() {
+        return DefaultLocalDateCalculatorFactory.getDefaultInstance();
     }
-
-    @Override
-    protected Set<LocalDate> createUSHolidays() {
-        final Set<LocalDate> us = new HashSet<LocalDate>();
-        us.add(new LocalDate("2006-07-04"));
-        us.add(new LocalDate("2006-11-28"));
-        us.add(new LocalDate("2006-12-25"));
-        return us;
-    }
-
-    @Override
-    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
-    }
-
-    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
-        return new JodaWorkingWeek(ww);
-    }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,10 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
-import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractDateCalculatorCombinationTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.LocalDate;
@@ -45,40 +44,12 @@
         return DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
     }
 
-    @Override
-    protected Set<LocalDate> newHolidaysSet() {
-        final Set<LocalDate> holidays = new HashSet<LocalDate>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
+    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
+        return new JodaWorkingWeek(ww);
     }
 
     @Override
-    protected Set<LocalDate> createUKHolidays() {
-        final Set<LocalDate> uk = new HashSet<LocalDate>();
-        uk.add(new LocalDate("2006-01-01"));
-        uk.add(new LocalDate("2006-08-28"));
-        uk.add(new LocalDate("2006-12-25"));
-        uk.add(new LocalDate("2006-12-26"));
-        return uk;
+    protected DateCalculatorFactory<LocalDate> getDateCalculatorFactory() {
+        return DefaultLocalDateCalculatorFactory.getDefaultInstance();
     }
-
-    @Override
-    protected Set<LocalDate> createUSHolidays() {
-        final Set<LocalDate> us = new HashSet<LocalDate>();
-        us.add(new LocalDate("2006-07-04"));
-        us.add(new LocalDate("2006-11-28"));
-        us.add(new LocalDate("2006-12-25"));
-        return us;
-    }
-
-    @Override
-    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
-    }
-    
-    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
-        return new JodaWorkingWeek(ww);
-    }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,10 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
-import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractForwardDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.LocalDate;
@@ -45,40 +44,12 @@
         return DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
     }
 
-    @Override
-    protected Set<LocalDate> newHolidaysSet() {
-        final Set<LocalDate> holidays = new HashSet<LocalDate>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
+    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
+        return new JodaWorkingWeek(ww);
     }
 
     @Override
-    protected Set<LocalDate> createUKHolidays() {
-        final Set<LocalDate> uk = new HashSet<LocalDate>();
-        uk.add(new LocalDate("2006-01-01"));
-        uk.add(new LocalDate("2006-08-28"));
-        uk.add(new LocalDate("2006-12-25"));
-        uk.add(new LocalDate("2006-12-26"));
-        return uk;
+    protected DateCalculatorFactory<LocalDate> getDateCalculatorFactory() {
+        return DefaultLocalDateCalculatorFactory.getDefaultInstance();
     }
-
-    @Override
-    protected Set<LocalDate> createUSHolidays() {
-        final Set<LocalDate> us = new HashSet<LocalDate>();
-        us.add(new LocalDate("2006-07-04"));
-        us.add(new LocalDate("2006-11-28"));
-        us.add(new LocalDate("2006-12-25"));
-        return us;
-    }
-
-    @Override
-    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
-    }
-    
-    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
-        return new JodaWorkingWeek(ww);
-    }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,10 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
-import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractModifiedFollowingDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.LocalDate;
@@ -45,40 +44,12 @@
         return DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
     }
 
-    @Override
-    protected Set<LocalDate> newHolidaysSet() {
-        final Set<LocalDate> holidays = new HashSet<LocalDate>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
+    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
+        return new JodaWorkingWeek(ww);
     }
 
     @Override
-    protected Set<LocalDate> createUKHolidays() {
-        final Set<LocalDate> uk = new HashSet<LocalDate>();
-        uk.add(new LocalDate("2006-01-01"));
-        uk.add(new LocalDate("2006-08-28"));
-        uk.add(new LocalDate("2006-12-25"));
-        uk.add(new LocalDate("2006-12-26"));
-        return uk;
+    protected DateCalculatorFactory<LocalDate> getDateCalculatorFactory() {
+        return DefaultLocalDateCalculatorFactory.getDefaultInstance();    
     }
-
-    @Override
-    protected Set<LocalDate> createUSHolidays() {
-        final Set<LocalDate> us = new HashSet<LocalDate>();
-        us.add(new LocalDate("2006-07-04"));
-        us.add(new LocalDate("2006-11-28"));
-        us.add(new LocalDate("2006-12-25"));
-        return us;
-    }
-
-    @Override
-    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
-    }
-    
-    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
-        return new JodaWorkingWeek(ww);
-    }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,10 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
-import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractModifiedPreceedingDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.LocalDate;
@@ -45,40 +44,12 @@
         return DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
     }
 
-    @Override
-    protected Set<LocalDate> newHolidaysSet() {
-        final Set<LocalDate> holidays = new HashSet<LocalDate>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
+    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
+        return new JodaWorkingWeek(ww);
     }
 
     @Override
-    protected Set<LocalDate> createUKHolidays() {
-        final Set<LocalDate> uk = new HashSet<LocalDate>();
-        uk.add(new LocalDate("2006-01-01"));
-        uk.add(new LocalDate("2006-08-28"));
-        uk.add(new LocalDate("2006-12-25"));
-        uk.add(new LocalDate("2006-12-26"));
-        return uk;
+    protected DateCalculatorFactory<LocalDate> getDateCalculatorFactory() {
+        return DefaultLocalDateCalculatorFactory.getDefaultInstance();
     }
-
-    @Override
-    protected Set<LocalDate> createUSHolidays() {
-        final Set<LocalDate> us = new HashSet<LocalDate>();
-        us.add(new LocalDate("2006-07-04"));
-        us.add(new LocalDate("2006-11-28"));
-        us.add(new LocalDate("2006-12-25"));
-        return us;
-    }
-
-    @Override
-    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
-    }
-    
-    protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
-        return new JodaWorkingWeek(ww);
-    }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,11 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractBackwardDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.YearMonthDay;
@@ -46,34 +46,6 @@
     }
 
     @Override
-    protected Set<YearMonthDay> newHolidaysSet() {
-        final Set<YearMonthDay> holidays = new HashSet<YearMonthDay>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUKHolidays() {
-        final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
-        uk.add(new YearMonthDay("2006-01-01"));
-        uk.add(new YearMonthDay("2006-08-28"));
-        uk.add(new YearMonthDay("2006-12-25"));
-        uk.add(new YearMonthDay("2006-12-26"));
-        return uk;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUSHolidays() {
-        final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
-        us.add(new YearMonthDay("2006-07-04"));
-        us.add(new YearMonthDay("2006-11-28"));
-        us.add(new YearMonthDay("2006-12-25"));
-        return us;
-    }
-
-    @Override
     protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
         DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
     }
@@ -83,4 +55,9 @@
         return new JodaWorkingWeek(ww);
     }
 
+    @Override
+    protected DateCalculatorFactory<YearMonthDay> getDateCalculatorFactory() {
+        return DefaultYearMonthDayCalculatorFactory.getDefaultInstance();
+    }
+
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,11 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractDateCalculatorCombinationTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.YearMonthDay;
@@ -46,34 +46,6 @@
     }
 
     @Override
-    protected Set<YearMonthDay> newHolidaysSet() {
-        final Set<YearMonthDay> holidays = new HashSet<YearMonthDay>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUKHolidays() {
-        final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
-        uk.add(new YearMonthDay("2006-01-01"));
-        uk.add(new YearMonthDay("2006-08-28"));
-        uk.add(new YearMonthDay("2006-12-25"));
-        uk.add(new YearMonthDay("2006-12-26"));
-        return uk;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUSHolidays() {
-        final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
-        us.add(new YearMonthDay("2006-07-04"));
-        us.add(new YearMonthDay("2006-11-28"));
-        us.add(new YearMonthDay("2006-12-25"));
-        return us;
-    }
-
-    @Override
     protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
         DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
     }
@@ -81,4 +53,9 @@
     protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
         return new JodaWorkingWeek(ww);
     }
+
+    @Override
+    protected DateCalculatorFactory<YearMonthDay> getDateCalculatorFactory() {
+        return DefaultYearMonthDayCalculatorFactory.getDefaultInstance();
+    }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,11 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractForwardDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.YearMonthDay;
@@ -46,34 +46,6 @@
     }
 
     @Override
-    protected Set<YearMonthDay> newHolidaysSet() {
-        final Set<YearMonthDay> holidays = new HashSet<YearMonthDay>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUKHolidays() {
-        final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
-        uk.add(new YearMonthDay("2006-01-01"));
-        uk.add(new YearMonthDay("2006-08-28"));
-        uk.add(new YearMonthDay("2006-12-25"));
-        uk.add(new YearMonthDay("2006-12-26"));
-        return uk;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUSHolidays() {
-        final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
-        us.add(new YearMonthDay("2006-07-04"));
-        us.add(new YearMonthDay("2006-11-28"));
-        us.add(new YearMonthDay("2006-12-25"));
-        return us;
-    }
-
-    @Override
     protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
         DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
     }
@@ -81,4 +53,9 @@
     protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
         return new JodaWorkingWeek(ww);
     }
+
+    @Override
+    protected DateCalculatorFactory<YearMonthDay> getDateCalculatorFactory() {
+        return DefaultYearMonthDayCalculatorFactory.getDefaultInstance();
+    }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,11 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractModifiedPreceedingDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.YearMonthDay;
@@ -46,34 +46,6 @@
     }
 
     @Override
-    protected Set<YearMonthDay> newHolidaysSet() {
-        final Set<YearMonthDay> holidays = new HashSet<YearMonthDay>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUKHolidays() {
-        final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
-        uk.add(new YearMonthDay("2006-01-01"));
-        uk.add(new YearMonthDay("2006-08-28"));
-        uk.add(new YearMonthDay("2006-12-25"));
-        uk.add(new YearMonthDay("2006-12-26"));
-        return uk;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUSHolidays() {
-        final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
-        us.add(new YearMonthDay("2006-07-04"));
-        us.add(new YearMonthDay("2006-11-28"));
-        us.add(new YearMonthDay("2006-12-25"));
-        return us;
-    }
-
-    @Override
     protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
         DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
     }
@@ -81,4 +53,10 @@
     protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
         return new JodaWorkingWeek(ww);
     }
+
+    @Override
+    protected DateCalculatorFactory<YearMonthDay> getDateCalculatorFactory() {
+        return DefaultYearMonthDayCalculatorFactory.getDefaultInstance();
+    }
+    
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java	2006-09-03 18:06:46 UTC (rev 85)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java	2006-09-03 18:07:42 UTC (rev 86)
@@ -17,11 +17,11 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import net.objectlab.kit.datecalc.common.AbstractModifiedFollowingDateCalculatorTest;
 import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
 import net.objectlab.kit.datecalc.common.WorkingWeek;
 
 import org.joda.time.YearMonthDay;
@@ -46,34 +46,6 @@
     }
 
     @Override
-    protected Set<YearMonthDay> newHolidaysSet() {
-        final Set<YearMonthDay> holidays = new HashSet<YearMonthDay>();
-        holidays.add(newDate("2006-08-28"));
-        holidays.add(newDate("2006-12-25"));
-        holidays.add(newDate("2006-12-26"));
-        return holidays;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUKHolidays() {
-        final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
-        uk.add(new YearMonthDay("2006-01-01"));
-        uk.add(new YearMonthDay("2006-08-28"));
-        uk.add(new YearMonthDay("2006-12-25"));
-        uk.add(new YearMonthDay("2006-12-26"));
-        return uk;
-    }
-
-    @Override
-    protected Set<YearMonthDay> createUSHolidays() {
-        final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
-        us.add(new YearMonthDay("2006-07-04"));
-        us.add(new YearMonthDay("2006-11-28"));
-        us.add(new YearMonthDay("2006-12-25"));
-        return us;
-    }
-
-    @Override
     protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
         DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
     }
@@ -81,4 +53,9 @@
     protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
         return new JodaWorkingWeek(ww);
     }
+
+    @Override
+    protected DateCalculatorFactory<YearMonthDay> getDateCalculatorFactory() {
+        return DefaultYearMonthDayCalculatorFactory.getDefaultInstance();
+    }
 }


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