This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 2c302db98a36a61bcb5758dbd92195826ee66dec Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 19 11:16:19 2015 +0200 Modification du test d'import BigFin --- .../service/bigfin/BigfinImportService2Test.java | 42 ++++++++++++++++------ 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java index 0eec620..ae3a37d 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java @@ -231,6 +231,8 @@ public class BigfinImportService2Test { Assert.assertNotNull(rajaClaSpecies); Species trigLyrSpecies = persistenceService.getSpeciesByReferenceTaxonId(1910); Assert.assertNotNull(trigLyrSpecies); + Species ACANPALSpecies = persistenceService.getSpeciesByReferenceTaxonId(1732); + Assert.assertNotNull(ACANPALSpecies); Caracteristic sizeCaracteristic = persistenceService.getSizeCategoryCaracteristic(); Assert.assertNotNull(sizeCaracteristic); @@ -285,11 +287,15 @@ public class BigfinImportService2Test { "Test,16,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,rajacla, 215, ,Male, 0,None,\n" + "Test,17,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,rajacla, 216, ,Female, 0,None,\n" + "Test,18,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,rajacla, 217, ,Female, 0,None,\n" + - "Test,18,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 500,1000,None, 0,None,\n" + - "Test,18,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 510, ,None, 0,None,\n" + - "Test,18,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 520, ,None, 0,None,\n" + - "Test,18,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 530, ,None, 0,None,\n" + - "Test,18,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 500, ,None, 0,None,"; + "Test,19,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 500,1000,None, 0,None,\n" + + "Test,20,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 510, ,None, 0,None,\n" + + "Test,21,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 520, ,None, 0,None,\n" + + "Test,22,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 530, ,None, 0,None,\n" + + "Test,23,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,triglyr, 500, ,None, 0,None,\n" + + "Test,24,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,ACAN-PAL,100, ,None, 0,None,\n" + + "Test,25,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,ACAN-PAL,110,1000,None, 0,None,\n" + + "Test,26,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,ACAN-PAL,120, ,None, 0,None,\n" + + "Test,27,09/14/15 09:49:32,,A,,47.24713560992085,-1.5474773011082363,,ACAN-PAL,130,2000,None, 0,None,"; File importFile = dbResource.getConfig().newTempFile("bigFin1"); Files.write(fileContent, importFile, Charsets.UTF_8); @@ -306,22 +312,23 @@ public class BigfinImportService2Test { log.info("Warnings: " + warnings.size()); } - int nbNewFrequencies = 18; + int nbNewFrequencies = 22; Assert.assertEquals(nbNewFrequencies, nbFrequenciesAdded); Assert.assertEquals(0, errors.size()); Assert.assertEquals(0, warnings.size()); BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(fishingOperation.getId(), false); Assert.assertNotNull(rootSpeciesBatch); - Assert.assertEquals(4, rootSpeciesBatch.sizeChildren()); + Assert.assertEquals(5, rootSpeciesBatch.sizeChildren()); Set<Species> speciesSet = new LinkedHashSet<>(); SpeciesAbleBatchs.grabSpeciesChildBatchs(rootSpeciesBatch.getChildren(), speciesSet); - Assert.assertEquals(4, speciesSet.size()); + Assert.assertEquals(5, speciesSet.size()); Assert.assertTrue(speciesSet.contains(rajaClaSpecies)); Assert.assertTrue(speciesSet.contains(tracDraSpecies)); Assert.assertTrue(speciesSet.contains(tracTruSpecies)); Assert.assertTrue(speciesSet.contains(trigLyrSpecies)); + Assert.assertTrue(speciesSet.contains(ACANPALSpecies)); for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { @@ -338,6 +345,7 @@ public class BigfinImportService2Test { Assert.assertTrue(sampleCategories.contains(300)); // M Assert.assertTrue(sampleCategories.contains(301)); // F Assert.assertEquals(0, allSpeciesBatchFrequency.size()); + Assert.assertNull(speciesBatch.getSampleCategoryWeight()); } else if (tracTruSpecies.equals(speciesBatch.getSpecies())) { // 2 categories Gros et Petit @@ -346,6 +354,7 @@ public class BigfinImportService2Test { Assert.assertTrue(sampleCategories.contains(305)); // G Assert.assertTrue(sampleCategories.contains(307)); // P Assert.assertEquals(0, allSpeciesBatchFrequency.size()); + Assert.assertNull(speciesBatch.getSampleCategoryWeight()); } else if (tracDraSpecies.equals(speciesBatch.getSpecies())) { // 4 catégories Non sexe, Male, Femelle et Sexe inconnu + Vrac @@ -357,18 +366,29 @@ public class BigfinImportService2Test { Assert.assertTrue(sampleCategories.contains(301)); // F Assert.assertTrue(sampleCategories.contains(302)); // N Assert.assertEquals(0, allSpeciesBatchFrequency.size()); + Assert.assertNull(speciesBatch.getSampleCategoryWeight()); } else if (trigLyrSpecies.equals(speciesBatch.getSpecies())) { - - //FIXME Changer ce test quand on aura intégrer l'évolution 7637 + // Un seul poids renseigne -> on le met comme poids de sous echantillon // Pas de catégorie Assert.assertEquals(0, speciesBatch.getChildBatchs().size()); Assert.assertEquals(1, sampleCategories.size()); Assert.assertTrue(sampleCategories.contains(311)); // Vrac Assert.assertEquals(4, allSpeciesBatchFrequency.size()); + Assert.assertEquals(1000f, speciesBatch.getSampleCategoryWeight(), 0.0f); + } else if (ACANPALSpecies.equals(speciesBatch.getSpecies())) { + // Plusieurs poids renseignes mais pas tous, on ne met aucun poids + // Pas de catégorie + Assert.assertEquals(0, speciesBatch.getChildBatchs().size()); + Assert.assertEquals(1, sampleCategories.size()); + Assert.assertTrue(sampleCategories.contains(311)); // Vrac + Assert.assertEquals(4, allSpeciesBatchFrequency.size()); + Assert.assertNull(speciesBatch.getSampleCategoryWeight()); + for (SpeciesBatchFrequency speciesBatchFrequency : allSpeciesBatchFrequency) { + Assert.assertNull(speciesBatchFrequency.getWeight()); + } } } - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.