Author: tchemit Date: 2013-05-29 23:06:38 +0200 (Wed, 29 May 2013) New Revision: 1033 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1033 Log: refs #2523: [ELEVATION] ?\195?\169l?\195?\169vation non effectu?\195?\169e (lors de l'export g?\195?\169n?\195?\169rique) (ajout d'un test + correction (je crois) sur l'?\195?\169l?\195?\169vation des poids) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-29 20:02:11 UTC (rev 1032) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-29 21:06:38 UTC (rev 1033) @@ -171,7 +171,7 @@ weight = row.getSampleCategoryComputedWeight(); } if (weight == null) { - return; + break; } CaracteristicQualitativeValue value = (CaracteristicQualitativeValue) row.getSampleCategoryValue(); @@ -227,7 +227,7 @@ weight = row.getSampleCategoryComputedWeight(); } if (weight == null) { - return; + break; } CaracteristicQualitativeValue value = (CaracteristicQualitativeValue) row.getSampleCategoryValue(); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-29 20:02:11 UTC (rev 1032) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-29 21:06:38 UTC (rev 1033) @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -69,6 +70,8 @@ public static final String CRUISE_ID = "100001"; + public static final String CRUISE_CGFS_ID = "100000"; + public static final String OPERATION_1_ID = "100106"; public static final String OPERATION_2_ID = "100107"; @@ -171,29 +174,11 @@ service = serviceContext.getService(TuttiExportService.class); - - program = persistenceService.getProgram(PROGRAM_ID); - Assert.assertNotNull(program); - - cruise = persistenceService.getCruise(CRUISE_ID); - Assert.assertNotNull(cruise); - - operations = persistenceService.getAllFishingOperation(cruise.getId()); - Assert.assertNotNull(operations); + loadData(PROGRAM_ID, CRUISE_ID); Assert.assertEquals(2, operations.size()); Assert.assertEquals(OPERATION_1_ID, operations.get(0).getId()); Assert.assertEquals(OPERATION_2_ID, operations.get(1).getId()); - // load fully operations - List<FishingOperation> loadedOperations = - Lists.newArrayListWithCapacity(operations.size()); - for (FishingOperation operation : operations) { - FishingOperation loadedOeration = - persistenceService.getFishingOperation(operation.getId()); - loadedOperations.add(loadedOeration); - } - operations = loadedOperations; - progressionModel = new ProgressionModel(); progressionModel.setTotal(8); } @@ -288,6 +273,25 @@ CATCH_CONTENT); } + //FIXME (see http://forge.codelutin.com/issues/2523) + @Test(expected = TuttiTechnicalException.class) + public void exportBadCatches() throws Exception { + + loadData(PROGRAM_ID, CRUISE_CGFS_ID); + + TuttiExportService.ExportContext exportContext = + service.createExportContext(dataDirectory, null); + + try { + service.exportCatches(exportContext, cruise, operations); + } finally { + exportContext.close(); + } + assertFileContent("Catch export:\n", + exportContext.catchFile, + CATCH_CONTENT); + } + @Test public void exportMarineLitters() throws Exception { @@ -336,7 +340,6 @@ ACCIDENTAL_CATCH_CONTENT); } - @Test public void exportSpecies() throws Exception { @@ -363,6 +366,7 @@ SPECIES_CONTENT); } + protected void assertFileContent(String message, File actualFile, String expectedContent) throws IOException { @@ -375,4 +379,25 @@ log.info(message + fileContent); } } + + protected void loadData(String programId, String cruiseId) { + program = persistenceService.getProgram(programId); + Assert.assertNotNull(program); + + cruise = persistenceService.getCruise(cruiseId); + Assert.assertNotNull(cruise); + + operations = persistenceService.getAllFishingOperation(cruise.getId()); + Assert.assertNotNull(operations); + + // load fully operations + List<FishingOperation> loadedOperations = + Lists.newArrayListWithCapacity(operations.size()); + for (FishingOperation operation : operations) { + FishingOperation loadedOeration = + persistenceService.getFishingOperation(operation.getId()); + loadedOperations.add(loadedOeration); + } + operations = loadedOperations; + } }