Author: chatellier Date: 2010-11-25 14:51:55 +0000 (Thu, 25 Nov 2010) New Revision: 278 Log: La cr?\195?\169ation de selection requiere un controle valid?\195?\169 (modification des tests en cons?\195?\169quences) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ChartServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) @@ -61,7 +61,7 @@ @Test public void testCatchChart() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Map<String, JFreeChart> charts = chartService.getCompareCatchLengthGraph(project, project.getControl(), null); JFreeChart chart = charts.get("COSER_SPECIES1"); JDialog f = new JDialog(); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2010-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CommandServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) @@ -63,7 +63,7 @@ */ @Test public void testDeleteLine() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertEquals(30, project.getControl().getLength().size()); DeleteLineCommand command = new DeleteLineCommand(); @@ -81,7 +81,7 @@ */ @Test(expected=CoserBusinessException.class) public void testDeleteLineWrong() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); DeleteLineCommand command = new DeleteLineCommand(); command.setLineNumber("2"); command.setCategory(Category.LENGTH); @@ -97,7 +97,7 @@ */ @Test public void testDeleteLineUndo() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertEquals("4", project.getControl().getLength().get(4)[Length.INDEX_LINE]); DeleteLineCommand command = new DeleteLineCommand(); @@ -118,7 +118,7 @@ */ @Test(expected=CoserBusinessException.class) public void testDeleteLineUndoAlreadyExists() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); DeleteLineCommand command = new DeleteLineCommand(); command.setLineNumber("3"); command.setCategory(Category.LENGTH); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-25 14:51:55 UTC (rev 278) @@ -82,11 +82,12 @@ * * Project is filled with control data (not selections). * - * @param projectService + * @param projectService project service + * @param controlValidated if {@code true} mark loaded control as {@code validated} * @return * @throws CoserBusinessException */ - protected Project createTestProject(ProjectService projectService) throws CoserBusinessException { + protected Project createTestProject(ProjectService projectService, boolean controlValidated) throws CoserBusinessException { Project project = new Project(); project.setName("Project-" + System.nanoTime()); @@ -112,6 +113,8 @@ // sans la sauvegarde des données de control, on ne pas creer de // selection projectService.saveProjectControl(project); + + project.getControl().setValidated(controlValidated); if (log.isDebugEnabled()) { log.debug("Created project : " + project.getName()); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-25 14:38:57 UTC (rev 277) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-25 14:51:55 UTC (rev 278) @@ -90,7 +90,7 @@ */ @Test public void testCreateProject() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "original" + File.separator + "catch.csv").exists()); @@ -112,13 +112,13 @@ */ @Test public void testSaveProject() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); projectService.saveProjectControl(project); Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "control" + File.separator + "catch_co.csv").exists()); } - + /** * Test que les selections sont bien creer. * @@ -126,7 +126,7 @@ */ @Test public void testCreateSelection() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("titi"); projectService.createProjectSelection(project, selection); @@ -143,7 +143,7 @@ */ @Test public void testSelectionReloading() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Assert.assertEquals(25, project.getControl().getCatch().size()); Selection selection = projectService.initProjectSelection(project); @@ -163,7 +163,7 @@ */ @Test(expected=CoserBusinessException.class) public void testCreateSelectionError() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("titi"); projectService.createProjectSelection(project, selection); @@ -177,7 +177,7 @@ */ @Test public void testSpeciesExistence() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); Assert.assertFalse(projectService.isSpecyNameExist(project, "Coser_invalid")); Assert.assertTrue(projectService.isSpecyNameExist(project, "COSER_SPECIES1")); Assert.assertTrue(projectService.isSpecyNameExist(project, "COSER_SPECIES2")); @@ -190,7 +190,7 @@ */ @Test public void testProjectYear() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); List<String> years = projectService.getProjectYears(selection); @@ -206,7 +206,7 @@ */ @Test public void testProjectZone() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); List<String> years = new ArrayList<String>(); @@ -236,7 +236,7 @@ */ @Test public void testProjectSpecies() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); List<String> allStrata = new ArrayList<String>(); @@ -272,7 +272,7 @@ */ @Test public void testMergeSpecies() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); @@ -297,7 +297,7 @@ */ @Test public void testCommandStoreAndReloading() throws CoserBusinessException, IOException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, false); DeleteLineCommand command = new DeleteLineCommand(); command.setLineNumber("2"); @@ -373,7 +373,7 @@ */ @Test public void testSamplingEffort() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); MatrixND matrix = projectService.getSamplingEffort(project, selection); @@ -387,7 +387,7 @@ */ @Test public void getOccurence() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); MatrixND matrix = projectService.getOccurrence(project, selection); @@ -401,7 +401,7 @@ */ @Test public void getDensity() throws CoserBusinessException { - Project project = createTestProject(projectService); + Project project = createTestProject(projectService, true); Selection selection = projectService.initProjectSelection(project); selection.setName("test"); MatrixND matrix = projectService.getDensity(project, selection);