branch feature/8013 updated (9381a60 -> 413cb53)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git from 9381a60 modif du nom par défaut des fichiers d'export (refs #8013) new 413cb53 - correction de l'import / export - correction des tests (fixes #8013) 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 413cb534b158869b169a5d97368be8d582b818d8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 17:42:27 2016 +0100 - correction de l'import / export - correction des tests (fixes #8013) Summary of changes: .../entities/protocol/TuttiProtocolsTest.java | 6 ------ .../service/ProtocolPersistenceServiceWriteTest.java | 6 ------ .../tutti/service/protocol/SpeciesRowModel.java | 6 ++---- .../protocol/ProtocolImportExportServiceTest.java | 18 ++++++------------ 4 files changed, 8 insertions(+), 28 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 feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit 413cb534b158869b169a5d97368be8d582b818d8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 17:42:27 2016 +0100 - correction de l'import / export - correction des tests (fixes #8013) --- .../entities/protocol/TuttiProtocolsTest.java | 6 ------ .../service/ProtocolPersistenceServiceWriteTest.java | 6 ------ .../tutti/service/protocol/SpeciesRowModel.java | 6 ++---- .../protocol/ProtocolImportExportServiceTest.java | 18 ++++++------------ 4 files changed, 8 insertions(+), 28 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 172113d..2731b3a 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 @@ -50,7 +50,6 @@ public class TuttiProtocolsTest { "benthos: \n" + "- !SpeciesProtocol\n" + " id: 1\n" + - " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " mandatorySampleCategoryId: \n" + " - 174\n" + @@ -60,8 +59,6 @@ public class TuttiProtocolsTest { " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 2\n" + - " calcifySampleEnabled: true\n" + - " countIfNoFrequencyEnabled: true\n" + " lengthStepPmfmId: 323\n" + " mandatorySampleCategoryId: \n" + " - 1430\n" + @@ -94,7 +91,6 @@ public class TuttiProtocolsTest { "species: \n" + "- !SpeciesProtocol\n" + " id: 1\n" + - " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " mandatorySampleCategoryId: \n" + " - 174\n" + @@ -104,8 +100,6 @@ public class TuttiProtocolsTest { " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 2\n" + - " calcifySampleEnabled: true\n" + - " countIfNoFrequencyEnabled: true\n" + " lengthStepPmfmId: 323\n" + " mandatorySampleCategoryId: \n" + " - 1430\n" + diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java index f45ae2d..2464ab5 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java @@ -48,7 +48,6 @@ public class ProtocolPersistenceServiceWriteTest { "benthos: \n" + "- !SpeciesProtocol\n" + " id: 1\n" + - " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " mandatorySampleCategoryId: \n" + " - 174\n" + @@ -58,8 +57,6 @@ public class ProtocolPersistenceServiceWriteTest { " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 2\n" + - " calcifySampleEnabled: true\n" + - " countIfNoFrequencyEnabled: true\n" + " lengthStepPmfmId: 323\n" + " mandatorySampleCategoryId: \n" + " - 1430\n" + @@ -79,7 +76,6 @@ public class ProtocolPersistenceServiceWriteTest { "species: \n" + "- !SpeciesProtocol\n" + " id: 1\n" + - " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " mandatorySampleCategoryId: \n" + " - 174\n" + @@ -89,8 +85,6 @@ public class ProtocolPersistenceServiceWriteTest { " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 2\n" + - " calcifySampleEnabled: true\n" + - " countIfNoFrequencyEnabled: true\n" + " lengthStepPmfmId: 323\n" + " mandatorySampleCategoryId: \n" + " - 1430\n" + diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java index 42b7937..603d8b8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java @@ -61,8 +61,6 @@ public class SpeciesRowModel extends AbstractTuttiImportExportModel<SpeciesRow> result.newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME); result.newColumnForExport(SpeciesRow.PROPERTY_MANDATORY_SAMPLE_CATEGORY_ID, TuttiCsvUtil.INTEGER_LIST_PARSER_FORMATTER); result.newColumnForExport(SpeciesRow.PROPERTY_WEIGHT_ENABLED, Common.PRIMITIVE_BOOLEAN); - result.newColumnForExport(SpeciesRow.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, Common.PRIMITIVE_BOOLEAN); - result.newColumnForExport(SpeciesRow.PROPERTY_CALCIFY_SAMPLE_ENABLED, Common.PRIMITIVE_BOOLEAN); result.newColumnForExport(SpeciesRow.PROPERTY_RTP_MALE_A, Common.DOUBLE); result.newColumnForExport(SpeciesRow.PROPERTY_RTP_MALE_B, Common.FLOAT); result.newColumnForExport(SpeciesRow.PROPERTY_RTP_FEMALE_A, Common.DOUBLE); @@ -111,14 +109,14 @@ public class SpeciesRowModel extends AbstractTuttiImportExportModel<SpeciesRow> result.newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME); result.newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME); result.newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME); + result.newIgnoredColumn(SpeciesRow.PROPERTY_CALCIFY_SAMPLE_ENABLED); + result.newIgnoredColumn(SpeciesRow.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED); //FIXME See if really needed, otherwise just use the default String parser // result.newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE); result.newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE, new StringParserFormatter(null, true)); result.newMandatoryColumn(SpeciesRow.PROPERTY_MANDATORY_SAMPLE_CATEGORY_ID, TuttiCsvUtil.INTEGER_LIST_PARSER_FORMATTER); result.newMandatoryColumn(SpeciesRow.PROPERTY_WEIGHT_ENABLED, Common.PRIMITIVE_BOOLEAN); - result.newMandatoryColumn(SpeciesRow.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, Common.PRIMITIVE_BOOLEAN); - result.newMandatoryColumn(SpeciesRow.PROPERTY_CALCIFY_SAMPLE_ENABLED, Common.PRIMITIVE_BOOLEAN); result.newOptionalColumn(SpeciesRow.PROPERTY_RTP_MALE_A, Common.DOUBLE); result.newOptionalColumn(SpeciesRow.PROPERTY_RTP_MALE_B, Common.FLOAT); result.newOptionalColumn(SpeciesRow.PROPERTY_RTP_FEMALE_A, Common.DOUBLE); 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 4c7d6bc..1462283 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 @@ -72,7 +72,6 @@ public class ProtocolImportExportServiceTest { "benthos: \n" + "- !SpeciesProtocol\n" + " id: 21\n" + - " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " mandatorySampleCategoryId: \n" + " - 174\n" + @@ -82,8 +81,6 @@ public class ProtocolImportExportServiceTest { " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 22\n" + - " calcifySampleEnabled: true\n" + - " countIfNoFrequencyEnabled: true\n" + " lengthStepPmfmId: 323\n" + " mandatorySampleCategoryId: \n" + " - 1430\n" + @@ -121,7 +118,6 @@ public class ProtocolImportExportServiceTest { "species: \n" + "- !SpeciesProtocol\n" + " id: 1\n" + - " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " mandatorySampleCategoryId: \n" + " - 174\n" + @@ -140,8 +136,6 @@ public class ProtocolImportExportServiceTest { " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 2\n" + - " calcifySampleEnabled: true\n" + - " countIfNoFrequencyEnabled: true\n" + " lengthStepPmfmId: 323\n" + " mandatorySampleCategoryId: \n" + " - 1430\n" + @@ -174,14 +168,14 @@ public class ProtocolImportExportServiceTest { "5;;parameterName5;matrixName5;fractionName5;methodName5"; public static final String PROTOCOL_SPECIES_FILE_CONTENT = - "speciesReferenceTaxonId;speciesRefTaxCode;speciesName;speciesSurveyCode;lengthStepPmfmId;lengthStepPmfmParameterName;lengthStepPmfmMatrixName;lengthStepPmfmFractionName;lengthStepPmfmMethodName;mandatorySampleCategoryId;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled;rtpMaleA;rtpMaleB;rtpFemaleA;rtpFemaleB;rtpUndefinedA;rtpUndefinedB\n" + - "1;speciesRefTaxCode1;speciesName1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;1430|198|174|196;Y;Y;Y;1.0;2.0;2.0;3.0;3.0;4.0\n" + - "2;speciesRefTaxCode2;speciesName2;;;;;;;1430|196;Y;Y;Y;;;;;;"; + "speciesReferenceTaxonId;speciesRefTaxCode;speciesName;speciesSurveyCode;lengthStepPmfmId;lengthStepPmfmParameterName;lengthStepPmfmMatrixName;lengthStepPmfmFractionName;lengthStepPmfmMethodName;mandatorySampleCategoryId;weightEnabled;rtpMaleA;rtpMaleB;rtpFemaleA;rtpFemaleB;rtpUndefinedA;rtpUndefinedB\n" + + "1;speciesRefTaxCode1;speciesName1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;1430|198|174|196;Y;1.0;2.0;2.0;3.0;3.0;4.0\n" + + "2;speciesRefTaxCode2;speciesName2;;;;;;;1430|196;Y;;;;;;"; public static final String PROTOCOL_BENTHOS_FILE_CONTENT = - "speciesReferenceTaxonId;speciesRefTaxCode;speciesName;speciesSurveyCode;lengthStepPmfmId;lengthStepPmfmParameterName;lengthStepPmfmMatrixName;lengthStepPmfmFractionName;lengthStepPmfmMethodName;mandatorySampleCategoryId;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled;rtpMaleA;rtpMaleB;rtpFemaleA;rtpFemaleB;rtpUndefinedA;rtpUndefinedB\n" + - "1;speciesRefTaxCode1;speciesName1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;1430|198|174|196;Y;Y;Y;;;;;;\n" + - "2;speciesRefTaxCode2;speciesName2;;;;;;;1430|196;Y;Y;Y;;;22.0;33.0;;"; + "speciesReferenceTaxonId;speciesRefTaxCode;speciesName;speciesSurveyCode;lengthStepPmfmId;lengthStepPmfmParameterName;lengthStepPmfmMatrixName;lengthStepPmfmFractionName;lengthStepPmfmMethodName;mandatorySampleCategoryId;weightEnabled;rtpMaleA;rtpMaleB;rtpFemaleA;rtpFemaleB;rtpUndefinedA;rtpUndefinedB\n" + + "1;speciesRefTaxCode1;speciesName1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;1430|198|174|196;Y;;;;;;\n" + + "2;speciesRefTaxCode2;speciesName2;;;;;;;1430|196;Y;;;22.0;33.0;;"; File datadirectory; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm