Author: echatellier Date: 2009-08-21 19:16:34 +0200 (Fri, 21 Aug 2009) New Revision: 2651 Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java Log: Fix alert type parsing (add test on it). Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2009-08-21 09:41:24 UTC (rev 2650) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2009-08-21 17:16:34 UTC (rev 2651) @@ -645,7 +645,7 @@ } else if ("reachdailytime".equals(alertType)) { Long duration = Long.parseLong(alertDuration); TimerAlert alert = new TimerAlert( - TimerAlert.Type.REACH_TOTAL_TIME, duration); + TimerAlert.Type.REACH_DAILY_TIME, duration); task.addAlert(alert); } else { if (log.isWarnEnabled()) { Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-08-21 09:41:24 UTC (rev 2650) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-08-21 17:16:34 UTC (rev 2651) @@ -28,6 +28,7 @@ import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; +import org.chorem.jtimer.entities.TimerAlert.Type; import org.testng.Assert; import org.testng.annotations.Test; @@ -484,14 +485,13 @@ boolean alert2found = false; boolean alert3found = false; for (TimerAlert alert : task1a.getAlerts()) { - // TODO commenct on fait pour comparer des enum ? - if (/*alert.getType().equals(Type.REACH_DAILY_TIME) && */alert.getDuration() == 3600) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600) { alert1found = true; } - if (/*alert.getType().equals(Type.REACH_DAILY_TIME) && */alert.getDuration() == 7200) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200) { alert2found = true; } - if (/*alert.getType().equals(Type.REACH_TOTAL_TIME) && */alert.getDuration() == 10800) { + if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800) { alert3found = true; } }