Author: tchemit Date: 2013-02-08 23:15:35 +0100 (Fri, 08 Feb 2013) New Revision: 370 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/370 Log: fix gear import/export Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2013-02-08 22:00:54 UTC (rev 369) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2013-02-08 22:15:35 UTC (rev 370) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.TuttiCsvUtil; +import org.nuiton.util.csv.Common; /** * Model to import / export {@link Gear} in csv format. @@ -42,11 +43,13 @@ newMandatoryColumn(Gear.PROPERTY_NAME); newMandatoryColumn(Gear.PROPERTY_LABEL); + newMandatoryColumn(Gear.PROPERTY_SCIENTIFIC_GEAR, Common.PRIMITIVE_BOOLEAN); // export definition newColumnForExport(Gear.PROPERTY_NAME); newColumnForExport(Gear.PROPERTY_LABEL); + newColumnForExport(Gear.PROPERTY_SCIENTIFIC_GEAR, Common.PRIMITIVE_BOOLEAN); } @Override Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-02-08 22:00:54 UTC (rev 369) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-02-08 22:15:35 UTC (rev 370) @@ -324,20 +324,27 @@ Gear g; g = new Gear(); - g.setName("Gear name 1"); - g.setLabel("Gear label 1"); + g.setName("Gear fishing name 1"); + g.setLabel("Gear fishing label 1"); toExport.add(g); g = new Gear(); - g.setName("Gear name 2"); - g.setLabel("Gear label 2"); + g.setName("Gear fishing name 2"); + g.setLabel("Gear fishing label 2"); toExport.add(g); g = new Gear(); - g.setName("Gear name 3"); - g.setLabel("Gear label 3"); + g.setName("Gear scientific name 3"); + g.setLabel("Gear scientific label 3"); + g.setScientificGear(true); toExport.add(g); + g = new Gear(); + g.setName("Gear scientific name 4"); + g.setLabel("Gear scientific label 4"); + g.setScientificGear(true); + toExport.add(g); + GearModel csvModel = new GearModel(getCsvSeparator()); BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-08 22:00:54 UTC (rev 369) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-08 22:15:35 UTC (rev 370) @@ -74,10 +74,11 @@ "Temporary Species name 3;"; public static final String GEAR_FILE_CONTENT = - "name;label\n" + - "Gear name 1;Gear label 1;\n" + - "Gear name 2;Gear label 2;\n" + - "Gear name 3;Gear label 3;"; + "name;label;scientificGear\n" + + "Gear fishing name 1;Gear fishing label 1;N;\n" + + "Gear fishing name 2;Gear fishing label 2;N;\n" + + "Gear scientific name 3;Gear scientific label 3;Y;\n" + + "Gear scientific name 4;Gear scientific label 4;Y;"; public static final String PERSON_FILE_CONTENT = "firstName;lastName\n" + @@ -175,14 +176,23 @@ List<Gear> result = service.importTemporaryGear(file); Assert.assertNotNull(result); - Assert.assertEquals(3, result.size()); - for (int i = 1; i <= 3; i++) { + Assert.assertEquals(4, result.size()); + for (int i = 1; i <= 2; i++) { Gear actual = result.get(i - 1); Assert.assertNotNull(actual); Assert.assertEquals("" + i, actual.getId()); - Assert.assertEquals("Gear name " + i, actual.getName()); - Assert.assertEquals("Gear label " + i, actual.getLabel()); + Assert.assertEquals("Gear fishing name " + i, actual.getName()); + Assert.assertEquals("Gear fishing label " + i, actual.getLabel()); + Assert.assertFalse(actual.isScientificGear()); } + for (int i = 3; i <= 4; i++) { + Gear actual = result.get(i - 1); + Assert.assertNotNull(actual); + Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("Gear scientific name " + i, actual.getName()); + Assert.assertEquals("Gear scientific label " + i, actual.getLabel()); + Assert.assertTrue(actual.isScientificGear()); + } } @Test