Author: tchemit Date: 2013-02-04 09:39:17 +0100 (Mon, 04 Feb 2013) New Revision: 325 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/325 Log: fix species and speciesProtocol api Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-04 01:48:10 UTC (rev 324) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-04 08:39:17 UTC (rev 325) @@ -70,7 +70,6 @@ " id: 1\n" + " calcifySampleEnabled: true\n" + " cruiseCode: BAR\n" + - " genusSpecies: bar\n" + " lengthStepPmfmId: 1394\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + @@ -82,7 +81,6 @@ " calcifySampleEnabled: true\n" + " countIfNoFrequencyEnabled: true\n" + " cruiseCode: CHIN\n" + - " genusSpecies: chinchard\n" + " lengthStepPmfmId: 323\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + @@ -149,7 +147,6 @@ Assert.assertEquals("1", sp1.getId()); Assert.assertEquals("11242", sp1.getSpeciesId()); Assert.assertEquals("BAR", sp1.getCruiseCode()); - Assert.assertEquals("bar", sp1.getGenusSpecies()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.isAgeEnabled()); Assert.assertTrue(sp1.isCalcifySampleEnabled()); @@ -164,7 +161,6 @@ Assert.assertEquals("2", sp2.getId()); Assert.assertEquals("3835", sp2.getSpeciesId()); Assert.assertEquals("CHIN", sp2.getCruiseCode()); - Assert.assertEquals("chinchard", sp2.getGenusSpecies()); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.isAgeEnabled()); Assert.assertTrue(sp2.isCalcifySampleEnabled()); @@ -190,7 +186,6 @@ sp1.setId("1"); sp1.setSpeciesId("11242"); sp1.setCruiseCode("BAR"); - sp1.setGenusSpecies("bar"); sp1.setLengthStepPmfmId("1394"); sp1.setCalcifySampleEnabled(true); sp1.setMaturityEnabled(true); @@ -202,7 +197,6 @@ sp2.setId("2"); sp2.setSpeciesId("3835"); sp2.setCruiseCode("CHIN"); - sp2.setGenusSpecies("chinchard"); sp2.setLengthStepPmfmId("323"); sp2.setAgeEnabled(true); sp2.setCalcifySampleEnabled(true);