branch develop updated (60987ff -> ddad190)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 60987ff [jgitflow-maven-plugin]updating poms for 3.11-SNAPSHOT development new ddad190 fix test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ddad190895aac2cedef2125ad412427a1774d26a Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 11 16:54:09 2014 +0100 fix test Summary of changes: .../entities/protocol/TuttiProtocolsTest.java | 27 ++++++++++++++-------- .../ProtocolPersistenceServiceReadTest.java | 2 +- .../protocol/ProtocolImportExportServiceTest.java | 27 ++++++++++++++-------- 3 files changed, 37 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 ddad190895aac2cedef2125ad412427a1774d26a Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 11 16:54:09 2014 +0100 fix test --- .../entities/protocol/TuttiProtocolsTest.java | 27 ++++++++++++++-------- .../ProtocolPersistenceServiceReadTest.java | 2 +- .../protocol/ProtocolImportExportServiceTest.java | 27 ++++++++++++++-------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java index 622ee61..e101c29 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java @@ -70,10 +70,23 @@ public class TuttiProtocolsTest { " speciesReferenceTaxonId: 3835\n" + " speciesSurveyCode: CHIN\n" + " weightEnabled: true\n" + + "caracteristicMapping: \n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 114\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 228\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 821\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 21\n" + + " tab: GEAR_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 22\n" + + " tab: GEAR_USE_FEATURE\n" + "comment: Commentaire\n" + - "gearUseFeaturePmfmId: \n" + - "- 21\n" + - "- 22\n" + "lengthClassesPmfmId: \n" + "- 14\n" + "- 18\n" + @@ -101,11 +114,7 @@ public class TuttiProtocolsTest { " speciesReferenceTaxonId: 3835\n" + " speciesSurveyCode: CHIN\n" + " weightEnabled: true\n" + - "version: 2\n" + - "vesselUseFeaturePmfmId: \n" + - "- 114\n" + - "- 228\n" + - "- 821"; + "version: " + TuttiProtocols.CURRENT_PROTOCOL_VERSION; public static final int VRAC_HORS_VRAC = 1428; @@ -251,7 +260,7 @@ public class TuttiProtocolsTest { private TuttiProtocol createProtocolFixture() { TuttiProtocol protocol = TuttiProtocols.newTuttiProtocol(); - protocol.setVersion(2); + protocol.setVersion(TuttiProtocols.CURRENT_PROTOCOL_VERSION); protocol.setId("1"); protocol.setName("protocolName"); protocol.setComment("Commentaire"); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java index 1cb0ed8..3d6bc2b 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java @@ -89,7 +89,7 @@ public class ProtocolPersistenceServiceReadTest { protected static TuttiProtocol createProtocolFixture() { TuttiProtocol protocol = TuttiProtocols.newTuttiProtocol(); - protocol.setVersion(2); + protocol.setVersion(TuttiProtocols.CURRENT_PROTOCOL_VERSION); protocol.setId("1"); protocol.setName("protocolName"); protocol.setComment("Commentaire"); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java index b137692..a221cf0 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java @@ -93,10 +93,23 @@ public class ProtocolImportExportServiceTest { " - 198\n" + " speciesReferenceTaxonId: 3835\n" + " weightEnabled: true\n" + + "caracteristicMapping: \n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 114\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 228\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 821\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 21\n" + + " tab: GEAR_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 22\n" + + " tab: GEAR_USE_FEATURE\n" + "comment: Commentaire\n" + - "gearUseFeaturePmfmId: \n" + - "- 21\n" + - "- 22\n" + "individualObservationPmfmId: \n" + "- 25\n" + "- 26\n" + @@ -126,11 +139,7 @@ public class ProtocolImportExportServiceTest { " - 198\n" + " speciesReferenceTaxonId: 3835\n" + " weightEnabled: true\n" + - "version: 2\n" + - "vesselUseFeaturePmfmId: \n" + - "- 114\n" + - "- 228\n" + - "- 821"; + "version: " + TuttiProtocols.CURRENT_PROTOCOL_VERSION; public static final String PROTOCOL_CARACTERISTIC_FILE_CONTENT = "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + @@ -185,7 +194,7 @@ public class ProtocolImportExportServiceTest { Assert.assertFalse(exportFile.exists()); TuttiProtocol protocol = TuttiProtocols.newTuttiProtocol(); - protocol.setVersion(2); + protocol.setVersion(TuttiProtocols.CURRENT_PROTOCOL_VERSION); protocol.setId("1"); protocol.setName("protocolName"); protocol.setComment("Commentaire"); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm