Fix for testcases

[jabaws.git] / testsrc / compbio / stat / collector / StatDBTester.java

diff --git a/testsrc/compbio/stat/collector/StatDBTester.java b/testsrc/compbio/stat/collector/StatDBTester.java
index 010b6ea..4b135dd 100644 (file)
--- a/testsrc/compbio/stat/collector/StatDBTester.java
+++ b/testsrc/compbio/stat/collector/StatDBTester.java
@@ -19,11 +19,21 @@ import compbio.ws.client.Services;
 \r
 public class StatDBTester {\r
        StatDB statdb;\r
-\r
-       @BeforeClass\r
+       Timestamp from;\r
+       Timestamp to;\r
+       \r
+       @BeforeClass(alwaysRun=true)\r
        public void init() {\r
                try {\r
                        statdb = new StatDB(true);\r
+                       Calendar fromCal = Calendar.getInstance();\r
+                       fromCal.set(2011, 4, 1);\r
+                                               \r
+                       Calendar toCal = Calendar.getInstance();\r
+                       toCal.set(2011, 5, 1);\r
+                       from = new Timestamp(fromCal.getTimeInMillis());\r
+                       to = new Timestamp(toCal.getTimeInMillis());\r
+                       \r
                } catch (SQLException e) {\r
                        e.printStackTrace();\r
                        Assert.fail(e.getLocalizedMessage());\r
@@ -33,11 +43,10 @@ public class StatDBTester {
        @Test\r
        public void testReadYearDataAndShutdown() {\r
                Calendar cal = Calendar.getInstance();\r
-               cal.roll(Calendar.YEAR, false);\r
+               cal.set(2010, 4, 1);\r
                try {\r
                        List<JobStat> jobs = statdb.readData(\r
-                                       new Timestamp(cal.getTimeInMillis()), new Timestamp(\r
-                                                       new Date().getTime()), Services.MuscleWS, false);\r
+                                       new Timestamp(cal.getTimeInMillis()), to, Services.MuscleWS, false);\r
                        assertNotNull(jobs);\r
                        assertEquals(jobs.size(), 1294);\r
                        // statdb.shutdownDBServer();\r
@@ -47,43 +56,28 @@ public class StatDBTester {
                }\r
 \r
        }\r
+\r
        @Test\r
        public void testReadOneMonthData() {\r
-               Calendar fromCal = Calendar.getInstance();\r
-               fromCal.set(2011, 4, 1);\r
-               \r
-               Calendar toCal = Calendar.getInstance();\r
-               toCal.set(2011, 5, 1);\r
-               \r
                try {\r
-                       List<JobStat> jobs = statdb.readData(\r
-                                       new Timestamp(fromCal.getTimeInMillis()), \r
-                                       new Timestamp(toCal.getTimeInMillis()), Services.TcoffeeWS, false);\r
+                       List<JobStat> jobs = statdb.readData(from, to, Services.TcoffeeWS, false);\r
                        assertNotNull(jobs);\r
                        assertEquals(jobs.size(), 36);\r
 \r
-                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
-                                       new Timestamp(toCal.getTimeInMillis()), Services.ClustalWS,\r
-                                       false);\r
+                       jobs = statdb.readData(from,to, Services.ClustalWS,false);\r
 \r
                        assertNotNull(jobs);\r
                        assertEquals(jobs.size(), 137);\r
 \r
-                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
-                                       new Timestamp(toCal.getTimeInMillis()), Services.MafftWS,\r
-                                       false);\r
+                       jobs = statdb.readData(from, to, Services.MafftWS,false);\r
                        assertNotNull(jobs);\r
                        assertEquals(jobs.size(), 126);\r
 \r
-                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
-                                       new Timestamp(toCal.getTimeInMillis()), Services.ProbconsWS,\r
-                                       false);\r
+                       jobs = statdb.readData(from,to, Services.ProbconsWS,false);\r
                        assertNotNull(jobs);\r
                        assertEquals(jobs.size(), 9);\r
 \r
-                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
-                                       new Timestamp(toCal.getTimeInMillis()), Services.MuscleWS,\r
-                                       false);\r
+                       jobs = statdb.readData(from,to, Services.MuscleWS,false);\r
                        assertNotNull(jobs);\r
                        assertEquals(jobs.size(), 63);\r
 \r