r2844 - in branches/1.4.0-ttalgo/src: main/java/org/chorem/jtimer/entities test/java/org/chorem/jtimer/data test/java/org/chorem/jtimer/io - Jtimer-commits

27 Mar 2012

Author: echatellier
Date: 2012-03-27 12:59:05 +0200 (Tue, 27 Mar 2012)
New Revision: 2844

Url: http://chorem.org/repositories/revision/jtimer/2844

Log:
Fix unit tests

Modified:
   branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java
   branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java
   branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java

Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java
===================================================================

--- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java	2012-03-27 10:47:23 UTC (rev 2843)
+++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java	2012-03-27 10:59:05 UTC (rev 2844)
@@ -66,7 +66,7 @@
      * Constructor.
      * 
      * @param type type
-     * @param duration duration
+     * @param duration duration (ms)
      */
     public TimerAlert(Type type, long duration) {
         this();

Modified: branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java
===================================================================
--- branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java	2012-03-27 10:47:23 UTC (rev 2843)
+++ branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java	2012-03-27 10:59:05 UTC (rev 2844)
@@ -423,8 +423,8 @@
         Assert.assertEquals(task2.getSubTasks().size(), 2);
         Assert.assertEquals(getRecursiveAnnotationsCount(Collections.singleton(task2)), 2);
         Assert.assertEquals(task3.getSubTasks().size(), 4);
-        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035);
-        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602);
+        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035000);
+        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602000);
 
         // merge tasks
         dataManager.mergeTasks(task1, Collections.singletonList(task2));
@@ -445,7 +445,7 @@
         Assert.assertEquals(task1a.getSubTasks().size(), 4);
         Assert.assertEquals(getRecursiveAnnotationsCount(Collections.singleton(task1a)), 5 + 2);
         Assert.assertEquals(task3a.getSubTasks().size(), 3);
-        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035 + 65602);
+        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035000 + 65602000);
     }
 
     /**
@@ -468,15 +468,15 @@
         // add THE conflict task name
         TimerTask tTreeTests = new TimerTask("Tree tests");
         tTreeTests.setCreationDate(new Date());
-        tTreeTests.setTime(new Date(), 200l);
+        tTreeTests.setTime(new Date(), Long.valueOf(200000));
         dataManager.addTask(task1, tTreeTests);
 
         Assert.assertEquals(task1.getSubTasks().size(), 3);
-        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035 + 200);
+        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035000 + 200000);
 
         TimerTask task2 = findTask(projectsBefore, "jTimer/Unit tests/UI tests");
         Assert.assertEquals(task2.getSubTasks().size(), 2);
-        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602);
+        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602000);
 
         // merge tasks
         dataManager.mergeTasks(task1, Collections.singletonList(task2));
@@ -495,7 +495,7 @@
         // 4 = conflict resolved
         Assert.assertEquals(task1a.getSubTasks().size(), 4);
         Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a),
-                55035 + 65602 + 200);
+                55035000 + 65602000 + 200000);
     }
 
     /**
@@ -521,9 +521,9 @@
                 .singleton(task1)), 0);
 
         // add new project
-        TimerAlert alert1 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 3600);
-        TimerAlert alert2 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 7200);
-        TimerAlert alert3 = new TimerAlert(TimerAlert.Type.REACH_TOTAL_TIME, 10800);
+        TimerAlert alert1 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 3600000);
+        TimerAlert alert2 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 7200000);
+        TimerAlert alert3 = new TimerAlert(TimerAlert.Type.REACH_TOTAL_TIME, 10800000);
         task1.addAlert(alert1);
         task1.addAlert(alert2);
         task1.addAlert(alert3);
@@ -546,13 +546,13 @@
         boolean alert2found = false;
         boolean alert3found = false;
         for (TimerAlert alert : task1a.getAlerts()) {
-            if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600) {
+            if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600000) {
                 alert1found = true;
             }
-            if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200) {
+            if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200000) {
                 alert2found = true;
             }
-            if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800) {
+            if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800000) {
                 alert3found = true;
             }
         }

Modified: branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java
===================================================================
--- branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java	2012-03-27 10:47:23 UTC (rev 2843)
+++ branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java	2012-03-27 10:59:05 UTC (rev 2844)
@@ -195,7 +195,7 @@
         for (Long time : task.getAllDaysAndTimes().values()) {
             totalTime += time.longValue();
         }
-        Assert.assertEquals(11391, totalTime);
+        Assert.assertEquals(totalTime, 11391000);
 
         // test 20080909 9000
 
@@ -203,25 +203,25 @@
         calendar.set(Calendar.YEAR, 2008);
         calendar.set(Calendar.MONTH, 8);
         calendar.set(Calendar.DAY_OF_MONTH, 9);
-        Assert.assertEquals(task.getTime(calendar.getTime()), 9000);
+        Assert.assertEquals(task.getTime(calendar.getTime()), 9000000);
 
         // 20080922 13
         calendar.set(Calendar.YEAR, 2008);
         calendar.set(Calendar.MONTH, 8);
         calendar.set(Calendar.DAY_OF_MONTH, 22);
-        Assert.assertEquals(task.getTime(calendar.getTime()), 13);
+        Assert.assertEquals(task.getTime(calendar.getTime()), 13000);
 
         // 20080930 2332
         calendar.set(Calendar.YEAR, 2008);
         calendar.set(Calendar.MONTH, 8);
         calendar.set(Calendar.DAY_OF_MONTH, 30);
-        Assert.assertEquals(2332, task.getTime(calendar.getTime()));
+        Assert.assertEquals(task.getTime(calendar.getTime()), 2332000);
 
         // 20081011 46
         calendar.set(Calendar.YEAR, 2008);
         calendar.set(Calendar.MONTH, 9);
         calendar.set(Calendar.DAY_OF_MONTH, 11);
-        Assert.assertEquals(46, task.getTime(calendar.getTime()));
+        Assert.assertEquals(task.getTime(calendar.getTime()), 46000);
 
         /*FIXME saver.unlock();
         } catch (DataLockingException e) {
@@ -303,11 +303,11 @@
 
         // first alert
         Assert.assertEquals(task.getAlerts().get(0).getType(), TimerAlert.Type.REACH_DAILY_TIME);
-        Assert.assertEquals(task.getAlerts().get(0).getDuration(), 3600);
+        Assert.assertEquals(task.getAlerts().get(0).getDuration(), 3600000);
 
         // second alert
         Assert.assertEquals(task.getAlerts().get(1).getType(), TimerAlert.Type.REACH_TOTAL_TIME);
-        Assert.assertEquals(task.getAlerts().get(1).getDuration(), 25000);
+        Assert.assertEquals(task.getAlerts().get(1).getDuration(), 25000000);
 
         /*FIXME saver.unlock();
         } catch (DataLockingException e) {
@@ -339,7 +339,7 @@
         
         TimerTask task1 = findTask(projects, "No project/Test no parent project");
         Assert.assertNotNull(task1);
-        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644);
+        Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644000);
 
         /*FIXME testSaver.unlock();
         } catch (DataLockingException e) {

    

r2844 - in branches/1.4.0-ttalgo/src: main/java/org/chorem/jtimer/entities test/java/org/chorem/jtimer/data test/java/org/chorem/jtimer/io

echatellier＠users.chorem.org

tags

participants (1)