Author: chatellier Date: 2010-11-26 10:31:48 +0000 (Fri, 26 Nov 2010) New Revision: 286 Log: Conservation et utilisation des noms originaux des fichiers utilisateur Modified: 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/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-26 10:28:18 UTC (rev 285) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-26 10:31:48 UTC (rev 286) @@ -108,6 +108,11 @@ categoriesAndFile.put(Category.REFTAX_SPECIES, testReftax); categoriesAndFile.put(Category.TYPE_ESPECES, testTypeEspeces); + project.setCatchFileName(testCatch.getName()); + project.setLengthFileName(testLength.getName()); + project.setHaulFileName(testHaul.getName()); + project.setStrataFileName(testStrata.getName()); + project = projectService.createProject(project, categoriesAndFile); project = projectService.loadControlData(project); 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-26 10:28:18 UTC (rev 285) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-26 10:31:48 UTC (rev 286) @@ -93,13 +93,13 @@ Project project = createTestProject(projectService, false); Assert.assertTrue(new File(config.getProjectsDirectory(), - project.getName() + File.separator + "original" + File.separator + "catch.csv").exists()); + project.getName() + File.separator + "original" + File.separator + "testcatch.csv").exists()); Assert.assertTrue(new File(config.getProjectsDirectory(), - project.getName() + File.separator + "original" + File.separator + "haul.csv").exists()); + project.getName() + File.separator + "original" + File.separator + "testhaul.csv").exists()); Assert.assertTrue(new File(config.getProjectsDirectory(), - project.getName() + File.separator + "original" + File.separator + "strata.csv").exists()); + project.getName() + File.separator + "original" + File.separator + "teststrata.csv").exists()); Assert.assertTrue(new File(config.getProjectsDirectory(), - project.getName() + File.separator + "original" + File.separator + "length.csv").exists()); + project.getName() + File.separator + "original" + File.separator + "testlength.csv").exists()); Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "reftaxSpecies.csv").exists()); } @@ -116,7 +116,7 @@ projectService.saveProjectControl(project); Assert.assertTrue(new File(config.getProjectsDirectory(), - project.getName() + File.separator + "control" + File.separator + "catch_co.csv").exists()); + project.getName() + File.separator + "control" + File.separator + "testcatch_co.csv").exists()); } /** @@ -133,7 +133,7 @@ Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "selections" + File.separator + - "titi" + File.separator + "catch_se.csv").exists()); + "titi" + File.separator + "testcatch_se.csv").exists()); } /**