Author: echatellier Date: 2009-10-26 10:23:18 +0100 (Mon, 26 Oct 2009) New Revision: 2680 Added: trunk/src/test/resources/testdata/40.task Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java Log: Ajout d'un test sur les t?\195?\162ches sans projets parents (permit pas gtimer). Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-10-26 09:04:48 UTC (rev 2679) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-10-26 09:23:18 UTC (rev 2680) @@ -59,7 +59,7 @@ TimerProject project1 = findProject(projectsBefore, "Test project"); Assert.assertNull(project1); - Assert.assertEquals(projectsBefore.size(), 5); + Assert.assertEquals(projectsBefore.size(), 6); // add new project TimerProject project = new TimerProject("Test project"); @@ -75,7 +75,7 @@ TimerProject project1a = findProject(projectsAfter, "Test project"); Assert.assertNotNull(project1a); - Assert.assertEquals(projectsBefore.size(), 6); + Assert.assertEquals(projectsBefore.size(), 7); } /** @@ -128,7 +128,7 @@ TimerProject project1 = findProject(projectsBefore, "jTimer"); Assert.assertNotNull(project1); - Assert.assertEquals(projectsBefore.size(), 5); + Assert.assertEquals(projectsBefore.size(), 6); // delete project dataManager.deleteProject(project1); @@ -141,7 +141,7 @@ List<TimerProject> projectsAfter = dataManager.getProjectsList(); Assert.assertNull(findProject(projectsAfter, "jTimer")); - Assert.assertEquals(projectsAfter.size(), 4); + Assert.assertEquals(projectsAfter.size(), 5); } /** Modified: trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2009-10-26 09:04:48 UTC (rev 2679) +++ trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2009-10-26 09:23:18 UTC (rev 2680) @@ -34,6 +34,7 @@ import org.chorem.jtimer.entities.TimerAlert; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.entities.TimerTaskHelper; import org.testng.Assert; import org.testng.annotations.Test; @@ -91,8 +92,8 @@ Collection<TimerProject> projects = testSaver.load(); Assert.assertNotNull(projects); - Assert.assertEquals(getProjectsCount(projects), 5); - Assert.assertEquals(getTasksCount(projects), 39); + Assert.assertEquals(getProjectsCount(projects), 6); + Assert.assertEquals(getTasksCount(projects), 40); Assert.assertEquals(getAnnotationsCount(projects), 9); Assert.assertEquals(getAlertsCount(projects), 6); @@ -281,6 +282,7 @@ * * @throws IOException */ + @Test public void parseAlertsTest() throws IOException { /*try { @@ -313,4 +315,36 @@ } }*/ } + + /** + * Test que les taches sans projets parent (autorisé par gtimer) sont bien + * chargé par jtimer dans un projet nommé "No project". + * + * @throws IOException + */ + @Test + public void defaultProjectTest() throws IOException { + /*try { + //FIXME testSaver.lock();*/ + + GTimerIncrementalSaver gsaver = (GTimerIncrementalSaver) testSaver; + + // task to get annotation + Collection<TimerProject> projects = gsaver.load(); + + TimerProject project1 = findProject(projects, "No project"); + Assert.assertNotNull(project1); + + TimerTask task1 = findTask(projects, "No project/Test no parent project"); + Assert.assertNotNull(task1); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644); + + /*FIXME testSaver.unlock(); + } catch (DataLockingException e) { + if(log.isErrorEnabled()) { + log.error("parseAnnotations error", e); + Assert.fail(); + } + }*/ + } } Added: trunk/src/test/resources/testdata/40.task =================================================================== --- trunk/src/test/resources/testdata/40.task (rev 0) +++ trunk/src/test/resources/testdata/40.task 2009-10-26 09:23:18 UTC (rev 2680) @@ -0,0 +1,7 @@ +Format: 1.2 +Name: Test no parent project +Created: 1243600123 +Options: 0 +Project: -1 +Data: +20090131 9644