Author: tchemit Date: 2013-01-30 14:31:37 +0100 (Wed, 30 Jan 2013) New Revision: 270 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/270 Log: fix import / export of protocol Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java 2013-01-30 13:17:23 UTC (rev 269) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java 2013-01-30 13:31:37 UTC (rev 270) @@ -31,7 +31,6 @@ import com.google.common.base.Charsets; import com.google.common.io.Closeables; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import org.apache.commons.logging.Log; @@ -79,9 +78,6 @@ protected YamlConfig createConfig() { YamlConfig config = new YamlConfig(); - config.setPropertyElementType(TuttiProtocol.class, - "sampleCategoryOrder", - SampleCategoryEnum.class); config.setClassTag(SpeciesProtocol.class.getSimpleName(), SpeciesProtocol.class); config.writeConfig.setAlwaysWriteClassname(false); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java 2013-01-30 13:17:23 UTC (rev 269) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java 2013-01-30 13:31:37 UTC (rev 270) @@ -27,7 +27,6 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import org.apache.commons.lang3.StringUtils; @@ -73,8 +72,6 @@ "- 21\n" + "- 22\n" + "hydrologyPmfmId: []\n" + - "sampleCategoryOrder: \n" + - "- age\n" + "species: \n" + "- !SpeciesProtocol\n" + " calcifySampleEnabled: true\n" + @@ -115,7 +112,6 @@ protocol.setId("1"); protocol.setName("protocolName"); protocol.setComment("Commentaire"); - protocol.setSampleCategoryOrder(Lists.newArrayList(SampleCategoryEnum.age)); protocol.setEnvironmentPmfmId(Lists.newArrayList("114", "228", "821")); protocol.setGearPmfmId(Lists.newArrayList("21", "22")); protocol.setHydrologyPmfmId(Lists.<String>newArrayList()); @@ -164,9 +160,6 @@ Assert.assertEquals("1", protocol.getId()); Assert.assertEquals("protocolName", protocol.getName()); Assert.assertEquals("Commentaire", protocol.getComment()); - Assert.assertNotNull(protocol.getSampleCategoryOrder()); - Assert.assertEquals(1, protocol.getSampleCategoryOrder().size()); - Assert.assertEquals(SampleCategoryEnum.age, protocol.getSampleCategoryOrder().get(0)); Assert.assertEquals(Lists.newArrayList("114", "228", "821"), protocol.getEnvironmentPmfmId()); Assert.assertEquals(Lists.newArrayList("21", "22"), protocol.getGearPmfmId()); Assert.assertEquals(Lists.<String>newArrayList(), protocol.getHydrologyPmfmId());