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 dd1800d2ae1a7b612b4552df763e1cc123c9addc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 2 11:51:19 2015 +0100 fix some test (but still one is broken --- .../tutti/service/protocol/ProtocolImportExportServiceTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 a221cf0..296a1b7 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 @@ -107,7 +107,7 @@ public class ProtocolImportExportServiceTest { " pmfmId: 21\n" + " tab: GEAR_USE_FEATURE\n" + "- !CaracteristicMappingRow\n" + - " pmfmId: 22\n" + + " pmfmId: 262\n" + " tab: GEAR_USE_FEATURE\n" + "comment: Commentaire\n" + "individualObservationPmfmId: \n" + @@ -139,7 +139,7 @@ public class ProtocolImportExportServiceTest { " - 198\n" + " speciesReferenceTaxonId: 3835\n" + " weightEnabled: true\n" + - "version: " + TuttiProtocols.CURRENT_PROTOCOL_VERSION; + "version: 3"; public static final String PROTOCOL_CARACTERISTIC_FILE_CONTENT = "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + @@ -282,7 +282,7 @@ public class ProtocolImportExportServiceTest { Assert.assertNotNull(protocol); Assert.assertEquals("1", protocol.getId()); - Assert.assertEquals(2, protocol.getVersion(), 0); + Assert.assertEquals(3, protocol.getVersion(), 0); Assert.assertEquals("protocolName", protocol.getName()); Assert.assertEquals("Commentaire", protocol.getComment()); Assert.assertEquals(Lists.newArrayList("14", "18"), protocol.getLengthClassesPmfmId()); @@ -355,6 +355,7 @@ public class ProtocolImportExportServiceTest { Assert.assertTrue(b2.isWeightEnabled()); } + //FIXME @Test public void importProtocolCaracteristic() throws Exception { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.