This is an automated email from the git hooks/post-receive script. New commit to branch feature/7909_import_generique_id_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git commit 9b20e278c057a618adcd50eb1a6ea437c457d274 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 17 14:08:02 2016 +0100 Test d'import de données obsolètes pour les engins, strates --- .../GenericFormatImportServiceValidTest.java | 9 ++++++--- .../resources/genericFormat/withObsoletes/catch.csv | 17 ++++++++++++++++- .../resources/genericFormat/withObsoletes/operation.csv | 2 ++ .../resources/genericFormat/withObsoletes/survey.csv | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceValidTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceValidTest.java index 809e133..9de613f 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceValidTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceValidTest.java @@ -64,11 +64,10 @@ public class GenericFormatImportServiceValidTest extends GenericFormatImportServ @AfterClass public static void afterClass() throws Exception { - dbResource.setDestroyResources(true); - if (log.isInfoEnabled()) { log.info("Report files:\n" + Joiner.on("\n").join(builder)); } + dbResource.setDestroyResources(true); } @@ -99,8 +98,12 @@ public class GenericFormatImportServiceValidTest extends GenericFormatImportServ Assert.assertTrue(result.getProtocolFileResult().isImported()); Assert.assertTrue(result.getProtocolFileResult().isValid()); - Assert.assertTrue(result.getSurveyFileResult().isValid()); Assert.assertTrue(result.getSurveyFileResult().isImported()); + Assert.assertTrue(result.getSurveyFileResult().isValid()); + Assert.assertTrue(result.getOperationFileResult().isImported()); + Assert.assertTrue(result.getOperationFileResult().isValid()); + Assert.assertTrue(result.getCatchFileResult().isImported()); + Assert.assertTrue(result.getCatchFileResult().isValid()); Assert.assertTrue(result.isValid()); } diff --git a/tutti-service/src/test/resources/genericFormat/withObsoletes/catch.csv b/tutti-service/src/test/resources/genericFormat/withObsoletes/catch.csv index 5194113..2bcde06 100644 --- a/tutti-service/src/test/resources/genericFormat/withObsoletes/catch.csv +++ b/tutti-service/src/test/resources/genericFormat/withObsoletes/catch.csv @@ -1 +1,16 @@ -Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_Scientifique;Benthos;Lot_A_Confirmer;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Commentaire_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Commentaire_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Commentaire_Sexe;Etat;Num_ [...] \ No newline at end of file +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_Scientifique;Benthos;Lot_A_Confirmer;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Commentaire_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Commentaire_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Commentaire_Sexe;Etat;Num_ [...] +2015;Campagne EVHOE;1;A;1;1;1540;MERL-MCC;Merluccius merluccius;N;N;Vrac;1;100.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;100.0;1.0;1.0;CAM-EVHOE;311;136540;NA;;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1662;TRAC-TRU;Trachurus trachurus;N;N;Vrac;2;25.0;;Poids;kg;;P - Petit;1;6.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;6.0;4.1666665;2.2727273;CAM-EVHOE;311;136541;307;136542;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1662;TRAC-TRU;Trachurus trachurus;N;N;Vrac;2;25.0;;Poids;kg;;G - Gros;2;5.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;5.0;5.0;2.2727273;CAM-EVHOE;311;136541;305;136543;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1732;ACANPAL;Acantholabrus palloni;N;N;Vrac;3;25.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;25.0;1.0;1.0;CAM-EVHOE;311;136544;NA;;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1362;ENGR-ENC;Engraulis encrasicolus;N;N;Hors Vrac;1;75.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;75.0;1.0;1.0;CAM-EVHOE;310;136545;NA;;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1540;MERL-MCC;Merluccius merluccius;N;N;Hors Vrac;2;;;Poids;kg;;NA;;;;;kg;;Male;1;6.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;6.0;30.333334;1.0;CAM-EVHOE;310;136546;NA;;300;136547;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1540;MERL-MCC;Merluccius merluccius;N;N;Hors Vrac;2;;;Poids;kg;;NA;;;;;kg;;Femelle;2;100.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;100.0;1.82;1.0;CAM-EVHOE;310;136546;NA;;301;136548;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1540;MERL-MCC;Merluccius merluccius;N;N;Hors Vrac;2;;;Poids;kg;;NA;;;;;kg;;UNK - Indetermine;3;76.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;76.0;2.3947368;1.0;CAM-EVHOE;310;136546;NA;;299;136549;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1662;TRAC-TRU;Trachurus trachurus;N;N;Hors Vrac;3;;;Poids;kg;;P - Petit;1;5.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;5.0;6.0;1.0;CAM-EVHOE;310;136550;307;136551;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1662;TRAC-TRU;Trachurus trachurus;N;N;Hors Vrac;3;;;Poids;kg;;G - Gros;2;25.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;25.0;1.2;1.0;CAM-EVHOE;310;136550;305;136552;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1732;ACANPAL;Acantholabrus palloni;N;N;Hors Vrac;4;;;Poids;kg;;NA;;;;;kg;;Male;1;25.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;25.0;5.8;1.0;CAM-EVHOE;310;136553;NA;;300;136554;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1732;ACANPAL;Acantholabrus palloni;N;N;Hors Vrac;4;;;Poids;kg;;NA;;;;;kg;;Femelle;2;65.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;65.0;2.2307692;1.0;CAM-EVHOE;310;136553;NA;;301;136555;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;1732;ACANPAL;Acantholabrus palloni;N;N;Hors Vrac;4;;;Poids;kg;;NA;;;;;kg;;UNK - Indetermine;3;55.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;55.0;2.6363637;1.0;CAM-EVHOE;310;136553;NA;;299;136556;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;11182;;Abra longicallus;Y;N;Vrac;1;0.1;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;0.1;1.0;1.0;CAM-EVHOE;311;136557;NA;;NA;;NA;;NA;;NA;;NA;;NA; +2015;Campagne EVHOE;1;A;1;1;11242;;Aaptos;Y;N;Hors Vrac;1;0.007;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;0.007;1.0;1.0;CAM-EVHOE;310;136561;NA;;NA;;NA;;NA;;NA;;NA;;NA; diff --git a/tutti-service/src/test/resources/genericFormat/withObsoletes/operation.csv b/tutti-service/src/test/resources/genericFormat/withObsoletes/operation.csv new file mode 100644 index 0000000..349dc91 --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/withObsoletes/operation.csv @@ -0,0 +1,2 @@ +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Navire;DateDeb;LatDeb;LongDeb;DateFin;LatFin;LongFin;Duree;Strate;Sous_Strate;Localite;Validite_OP;Rectiligne;Distance;Saisisseur;Navire_Associe;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Car [...] +2015;Campagne EVHOE;1;A;1;1;GOV 36/47;1;868095;27/11/2013 00:00:00;12.0;23.0;27/11/2013 01:00:00;12.0;23.1;60;Strate Cc4;NA;NA;Y;Y;10888;Angelique JADAUD;278970;;582.107;Y;150.1;Y;432.007;Y;0.0;Y;1412.1;N;150.0;N;582.0;Y;-9.0;?;150.0;Y;432.0;Y;0.0;Y;-9.0;?;0.107;Y;0.1;Y;0.1;Y;0.007;Y;0.0;Y;0.0;Y;3.0;Y;CAM-EVHOE;379;100158;136495;868095;63353;;;2158;278970 \ No newline at end of file diff --git a/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv b/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv index c77bdef..9883e35 100644 --- a/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv +++ b/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv @@ -1,2 +1,2 @@ Annee;Serie;Serie_Partielle;Navire;Nombre_Poches;Pays;Zone_Etude;Campagne;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire;Serie_Id;Campagne_Id;Navire_Id;Engin_Id;Port_Deb_Campagne_Id;Port_Fin_Campagne_Id;Chef_Mission_Id;Resp_Salle_Tri_Id -2015;Campagne EVHOE;1;868095;1;FRA;EVHOE - Golfe de Gascogne / Mer Celtique;EVHOE 2015;;17/10/2015 07:00:00;Brest;30/11/2015 20:00:00;Brest;Jean Claude MAHE|Jean-Pierre LEAUTE|Lionel PAWLOWSKI;Erwan DUHAMEL|Francois GARREN|Ludovic BOUCHE;;CAM-EVHOE;100000;267465;379|67;530;530;133;128 +2015;Campagne EVHOE;1;868095;1;FRA;EVHOE - Golfe de Gascogne / Mer Celtique;EVHOE 2015;;17/10/2015 07:00:00;Brest;30/11/2015 20:00:00;Brest;Jean Claude MAHE|Jean-Pierre LEAUTE|Lionel PAWLOWSKI;Erwan DUHAMEL|Francois GARREN|Ludovic BOUCHE;;CAM-EVHOE;100000;267465;379|67|22;515;530;133;128 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.