Fixes for failed test cases (most was due to the data being used or problems with...

[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 58ec698..010b6ea 100644 (file)
--- a/testsrc/compbio/stat/collector/StatDBTester.java
+++ b/testsrc/compbio/stat/collector/StatDBTester.java
@@ -49,39 +49,43 @@ public class StatDBTester {
        }\r
        @Test\r
        public void testReadOneMonthData() {\r
-               Calendar cal = Calendar.getInstance();\r
-               cal.roll(Calendar.MONTH, false);\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(cal.getTimeInMillis()), new Timestamp(\r
-                                                       new Date().getTime()), Services.TcoffeeWS, false);\r
+                                       new Timestamp(fromCal.getTimeInMillis()), \r
+                                       new Timestamp(toCal.getTimeInMillis()), Services.TcoffeeWS, false);\r
                        assertNotNull(jobs);\r
-                       assertEquals(jobs.size(), 47);\r
+                       assertEquals(jobs.size(), 36);\r
 \r
-                       jobs = statdb.readData(new Timestamp(cal.getTimeInMillis()),\r
-                                       new Timestamp(new Date().getTime()), Services.ClustalWS,\r
+                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
+                                       new Timestamp(toCal.getTimeInMillis()), Services.ClustalWS,\r
                                        false);\r
 \r
                        assertNotNull(jobs);\r
-                       assertEquals(jobs.size(), 144);\r
+                       assertEquals(jobs.size(), 137);\r
 \r
-                       jobs = statdb.readData(new Timestamp(cal.getTimeInMillis()),\r
-                                       new Timestamp(new Date().getTime()), Services.MafftWS,\r
+                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
+                                       new Timestamp(toCal.getTimeInMillis()), Services.MafftWS,\r
                                        false);\r
                        assertNotNull(jobs);\r
-                       assertEquals(jobs.size(), 149);\r
+                       assertEquals(jobs.size(), 126);\r
 \r
-                       jobs = statdb.readData(new Timestamp(cal.getTimeInMillis()),\r
-                                       new Timestamp(new Date().getTime()), Services.ProbconsWS,\r
+                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
+                                       new Timestamp(toCal.getTimeInMillis()), Services.ProbconsWS,\r
                                        false);\r
                        assertNotNull(jobs);\r
-                       assertEquals(jobs.size(), 12);\r
+                       assertEquals(jobs.size(), 9);\r
 \r
-                       jobs = statdb.readData(new Timestamp(cal.getTimeInMillis()),\r
-                                       new Timestamp(new Date().getTime()), Services.MuscleWS,\r
+                       jobs = statdb.readData(new Timestamp(fromCal.getTimeInMillis()),\r
+                                       new Timestamp(toCal.getTimeInMillis()), Services.MuscleWS,\r
                                        false);\r
                        assertNotNull(jobs);\r
-                       assertEquals(jobs.size(), 76);\r
+                       assertEquals(jobs.size(), 63);\r
 \r
                } catch (SQLException e) {\r
                        e.printStackTrace();\r