This is an automated email from the git hooks/post-receive script. New commit to branch feature/5997 in repository tutti. See http://git.codelutin.com/tutti.git commit a55bae9625ed925970cc1e01fec21d273c71df20 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 28 10:28:17 2014 +0100 fixes #5997 [IMPORT] Améliorer la gestion des référentiels temporaires --- .../referential/ReferentialImportServiceTest.java | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportServiceTest.java index 6c8c4ce..e598395 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportServiceTest.java @@ -56,8 +56,7 @@ import java.util.List; public class ReferentialImportServiceTest { @ClassRule - public static final ServiceDbResource dbResource = - ServiceDbResource.writeDb("dbCGFS"); + public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbCGFS"); protected File dataDirectory; @@ -213,20 +212,18 @@ public class ReferentialImportServiceTest { Assert.assertNull(persistenceService.getSpeciesByReferenceTaxonId(-2)); // try to delete used species -// SpeciesBatch batch = SpeciesBatchs.newSpeciesBatch(); -// batch.setSampleCategoryId(PmfmId.SORTED_UNSORTED.getValue()); -// batch.setSampleCategoryValue(persistenceService.getSortedUnsortedCaracteristic().getQualitativeValue(0)); -// batch.setFishingOperation(persistenceService.getFishingOperation(OPERATION_1_ID)); -// batch.setSpecies(persistenceService.getSpeciesByReferenceTaxonId(-1)); -// persistenceService.createSpeciesBatch(batch, null); -// -// Files.write(SPECIES_DELETE_USED_FILE_CONTENT, file, Charsets.UTF_8); -// try { -// service.importTemporarySpecies(file); -// Assert.fail(); -// } catch (IllegalArgumentException | ApplicationTechnicalException e) { -// Assert.assertTrue(true); -// } + SpeciesBatch batch = persistenceService.getRootSpeciesBatch(OPERATION_1_ID, false).getChildren().get(0); + batch.setFishingOperation(persistenceService.getFishingOperation(OPERATION_1_ID)); + batch.setSpecies(persistenceService.getSpeciesByReferenceTaxonId(-1)); + persistenceService.saveSpeciesBatch(batch); + + Files.write(SPECIES_DELETE_USED_FILE_CONTENT, file, Charsets.UTF_8); + try { + service.importTemporarySpecies(file); + Assert.fail(); + } catch (IllegalArgumentException | ApplicationTechnicalException e) { + Assert.assertTrue(true); + } } @@ -315,6 +312,8 @@ public class ReferentialImportServiceTest { } catch (IllegalArgumentException | ApplicationTechnicalException e) { Assert.assertTrue(true); } + + // TODO test to replace a used vessel } @Test @@ -353,6 +352,8 @@ public class ReferentialImportServiceTest { Assert.assertEquals("First name " + i, actual.getFirstName()); Assert.assertEquals("Last name " + i, actual.getLastName()); } + + // TODO test to replace a used person } @Test @@ -400,6 +401,8 @@ public class ReferentialImportServiceTest { Assert.assertEquals("Gear scientific label " + i, actual.getLabel()); Assert.assertTrue(actual.isScientificGear()); } + + // TODO test to replace a used gear } @Test -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.