[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.