objectlabkit-svn

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

Revision: 140
          http://svn.sourceforge.net/objectlabkit/?rev=140&view=rev
Author:   marchy
Date:     2006-09-10 05:53:39 -0700 (Sun, 10 Sep 2006)

Log Message:
-----------
added a null ACT_ACT - failing, and modularised the code repetition stuff

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

Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculator.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculator.java	2006-09-10 12:31:34 UTC (rev 139)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculator.java	2006-09-10 12:53:39 UTC (rev 140)
@@ -297,6 +297,9 @@
     // end of set
     };
 
+    //TODO fill with values
+    private static final String[][] ACT_ACT = null;
+
     private PeriodCountCalculator<E> cal;
 
     public void setUp() {
@@ -309,46 +312,35 @@
 
     public abstract E getDate();
 
-    public void testConv30EvIsma() {
+    public void testSanity() {
         Assert.assertNotNull(cal);
-
-        for (final String[] test : CONV_360E_ISMA) {
-            runtest(cal, test);
-        }
     }
+    
+    public void testConv30EvIsma() {
+        runtests(CONV_360E_ISMA);
+    }
 
     public void testConv30Ev360() {
-        Assert.assertNotNull(cal);
-
-        for (final String[] test : CONV_360E_ISDA) {
-            runtest(cal, test);
-        }
+        runtests(CONV_360E_ISDA);
     }
 
     public void testConv30v360() {
-        Assert.assertNotNull(cal);
-
-        for (final String[] test : CONV_30_360) {
-            runtest(cal, test);
-        }
+        runtests(CONV_30_360);
     }
 
     public void testAct365() {
-        Assert.assertNotNull(cal);
-
-        for (final String[] test : ACT_365) {
-            runtest(cal, test);
-        }
+        runtests(ACT_365);
     }
 
     public void testAct360() {
-        Assert.assertNotNull(cal);
+        runtests(ACT_360);
+    }
 
-        for (final String[] test : ACT_360) {
-            runtest(cal, test);
-        }
+    public void testActAct() {
+        runtests(ACT_ACT);
     }
 
+    
     public void testUnsupportedType() {
         Assert.assertNotNull(cal);
 
@@ -370,7 +362,13 @@
             // ok
         }
     }
-
+    
+    private void runtests(String[][] tests) {
+        for (final String[] test : tests) {
+            runtest(cal, test);
+        }
+    }
+    
     private void runtest(final PeriodCountCalculator<E> cal, final String[] test) {
         final String name = test[0];
         final E start = parseDate(test[1]);


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