This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 25823e4455aab5be221d42fd652ac5adea584f13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 19:13:48 2015 +0100 improve how to lanche generic format import test --- .../GenericFormatExportServiceTest.java | 3 +- .../GenericFormatImportServiceTest.java | 47 +++++++++++++++++- .../GenericFormatImportServiceTestSupport.java | 57 +++++++++------------- .../genericFormat/empty/accidentalCatch.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 1 + .../genericFormat/empty/gearCaracteristics.csv | 1 + .../genericFormat/empty/individualObservation.csv | 1 + .../resources/genericFormat/empty/marineLitter.csv | 1 + .../resources/genericFormat/empty/operation.csv | 1 + .../resources/genericFormat/empty/parameter.csv | 1 + .../test/resources/genericFormat/empty/survey.csv | 1 + .../{empty => protocol}/protocol.tuttiProtocol | 0 .../{default => technical}/sampleCategory.csv | 0 .../{empty => technical}/temporaryPersons.csv | 0 .../{empty => technical}/temporarySpecies.csv | 0 .../{empty => technical}/temporaryVessels.csv | 0 16 files changed, 78 insertions(+), 37 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java index 538e8fe..791d855 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java @@ -48,8 +48,7 @@ import java.util.Map; public class GenericFormatExportServiceTest { @ClassRule - public static final ServiceDbResource dbResource = - ServiceDbResource.readDb("dbCGFS"); + public static final ServiceDbResource dbResource = ServiceDbResource.readDb("dbCGFS"); public static final String PROGRAM_ID = "CAM-CGFS"; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTest.java index 0d4f7d9..0e3ef0e 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTest.java @@ -1,7 +1,11 @@ package fr.ifremer.tutti.service.genericformat; +import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.service.ServiceDbResource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Rule; +import org.junit.Test; import java.io.File; import java.io.IOException; @@ -17,22 +21,63 @@ public class GenericFormatImportServiceTest extends GenericFormatImportServiceTe /** Logger. */ private static final Log log = LogFactory.getLog(GenericFormatImportServiceTest.class); + @Rule + public final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbGenericFormatImport"); + @Override + protected ServiceDbResource getServiceDbResource() { + return dbResource; + } + + @Test public void testImport() throws IOException { - File archiveFile = createArchive("empty", "empty.zip"); + ServiceDbResource.DataContext dataContext = getServiceDbResource().loadContext(PROGRAM_ID); + + File archiveFile = createArchive("empty.zip", "technical", "protocol", "default"); + + GenericFormatImportConfiguration importConfiguration = new GenericFormatImportConfiguration(); + importConfiguration.setImportFile(archiveFile); + importConfiguration.setProgramId(dataContext.program.getId()); + + int nbSteps = service.getImportProgramNbSteps(importConfiguration); + + ProgressionModel progressionModel = new ProgressionModel(); + progressionModel.adaptTotal(nbSteps); + + if (log.isInfoEnabled()) { + log.info("Will do import in " + nbSteps + " steps"); + } + + service.importProgram(importConfiguration, progressionModel); + + } + + @Test + public void testImportOnlyReferentials() throws IOException { + + dbResource.setDestroyResources(true); + + ServiceDbResource.DataContext dataContext = getServiceDbResource().loadContext(PROGRAM_ID); + + File archiveFile = createArchive("empty.zip", "technical", "empty"); GenericFormatImportConfiguration importConfiguration = new GenericFormatImportConfiguration(); importConfiguration.setImportFile(archiveFile); importConfiguration.setProgramId(dataContext.program.getId()); int nbSteps = service.getImportProgramNbSteps(importConfiguration); + + ProgressionModel progressionModel = new ProgressionModel(); progressionModel.adaptTotal(nbSteps); + if (log.isInfoEnabled()) { log.info("Will do import in " + nbSteps + " steps"); } service.importProgram(importConfiguration, progressionModel); + service.importProgram(importConfiguration, progressionModel); + } } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTestSupport.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTestSupport.java index 5c5b29f..30f5cb2 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTestSupport.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTestSupport.java @@ -1,6 +1,6 @@ package fr.ifremer.tutti.service.genericformat; -import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.test.TuttiTestSupport; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; @@ -8,8 +8,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; import org.nuiton.util.FileUtil; import java.io.File; @@ -21,66 +19,60 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public abstract class GenericFormatImportServiceTestSupport { +public abstract class GenericFormatImportServiceTestSupport extends TuttiTestSupport { /** Logger. */ private static final Log log = LogFactory.getLog(GenericFormatImportServiceTestSupport.class); - @ClassRule - public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbGenericFormatImport"); - public static final String PROGRAM_ID = "CAM-EVHOE"; protected GenericFormatImportService service; protected PersistenceService persistenceService; - protected ServiceDbResource.DataContext dataContext; - - protected ProgressionModel progressionModel; + protected abstract ServiceDbResource getServiceDbResource(); @Before public void setUp() throws Exception { - TuttiServiceContext serviceContext = dbResource.getServiceContext(); + ServiceDbResource serviceDbResource = getServiceDbResource(); + + TuttiServiceContext serviceContext = serviceDbResource.getServiceContext(); persistenceService = serviceContext.getService(PersistenceService.class); - dbResource.setCountryInConfig("12"); - dbResource.openDataContext(); + serviceDbResource.setCountryInConfig("12"); + serviceDbResource.openDataContext(); service = serviceContext.getService(GenericFormatImportService.class); - dataContext = dbResource.loadContext(PROGRAM_ID); - - progressionModel = new ProgressionModel(); - } - protected File createArchive(String directoryName, String archiveFileName) throws IOException { + protected File createArchive(String archiveFileName, String... directoryNames) throws IOException { - File tmpDirectory = dbResource.getConfig().getTmpDirectory(); + File tmpDirectory = getServiceDbResource().getConfig().getTmpDirectory(); - File explodedDirectory = new File(tmpDirectory, directoryName); + File explodedDirectory = new File(tmpDirectory, archiveFileName); if (log.isInfoEnabled()) { log.info("Exploded directory of archive: " + explodedDirectory); } - File defaultDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "genericFormat", "default"); - if (log.isInfoEnabled()) { - log.info("Copy default archive files from " + defaultDirectory); - } - FileUtils.copyDirectory(defaultDirectory, explodedDirectory); + for (String directoryName : directoryNames) { + + File directory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "genericFormat", directoryName); + + if (directory.exists()) { + + if (log.isInfoEnabled()) { + log.info("Copy into archive files from " + directory); + } + FileUtils.copyDirectory(directory, explodedDirectory); - File overrideDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "genericFormat", directoryName); - if (overrideDirectory.exists()) { - if (log.isInfoEnabled()) { - log.info("Copy overriden archive files from " + overrideDirectory); } - FileUtils.copyDirectory(overrideDirectory, explodedDirectory); + } - File dataDirectory = dbResource.getConfig().getDataDirectory(); + File dataDirectory = getServiceDbResource().getConfig().getDataDirectory(); File archiveFile = new File(dataDirectory, archiveFileName); if (log.isInfoEnabled()) { log.info("Build import archive: " + archiveFile); @@ -94,7 +86,4 @@ public abstract class GenericFormatImportServiceTestSupport { } - @Test - public abstract void testImport() throws IOException; - } diff --git a/tutti-service/src/test/resources/genericFormat/empty/accidentalCatch.csv b/tutti-service/src/test/resources/genericFormat/empty/accidentalCatch.csv new file mode 100644 index 0000000..d013e00 --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/accidentalCatch.csv @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Id_Lot;Code_Taxon;Nom_Scientifique;Commentaire;Code_PMFM;Libelle_PMFM;Valeur;Serie_Id;Valeur_Id diff --git a/tutti-service/src/test/resources/genericFormat/empty/catch.csv b/tutti-service/src/test/resources/genericFormat/empty/catch.csv new file mode 100644 index 0000000..0a20be7 --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/catch.csv @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Code_Taxon;Code_Espece_Campagne;Nom_Scientifique;Benthos;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_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;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Matu [...] diff --git a/tutti-service/src/test/resources/genericFormat/empty/gearCaracteristics.csv b/tutti-service/src/test/resources/genericFormat/empty/gearCaracteristics.csv new file mode 100644 index 0000000..3256fe9 --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/gearCaracteristics.csv @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Engin;Rang_Engin;Code_PMFM;Libelle_PMFM;Valeur;Serie_Id;Engin_Id;Valeur_Id diff --git a/tutti-service/src/test/resources/genericFormat/empty/individualObservation.csv b/tutti-service/src/test/resources/genericFormat/empty/individualObservation.csv new file mode 100644 index 0000000..d013e00 --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/individualObservation.csv @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Id_Lot;Code_Taxon;Nom_Scientifique;Commentaire;Code_PMFM;Libelle_PMFM;Valeur;Serie_Id;Valeur_Id diff --git a/tutti-service/src/test/resources/genericFormat/empty/marineLitter.csv b/tutti-service/src/test/resources/genericFormat/empty/marineLitter.csv new file mode 100644 index 0000000..e39c419 --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/marineLitter.csv @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Categorie;Categorie_Taille;Nombre;Poids;Commentaire;Serie_Id;Categorie_Id;Categorie_Taille_Id diff --git a/tutti-service/src/test/resources/genericFormat/empty/operation.csv b/tutti-service/src/test/resources/genericFormat/empty/operation.csv new file mode 100644 index 0000000..1f909ab --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/operation.csv @@ -0,0 +1 @@ +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 [...] diff --git a/tutti-service/src/test/resources/genericFormat/empty/parameter.csv b/tutti-service/src/test/resources/genericFormat/empty/parameter.csv new file mode 100644 index 0000000..32c61e5 --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/parameter.csv @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_PMFM;Libelle_PMFM;Valeur;Type;Serie_Id;Valeur_Id diff --git a/tutti-service/src/test/resources/genericFormat/empty/survey.csv b/tutti-service/src/test/resources/genericFormat/empty/survey.csv new file mode 100644 index 0000000..4537d3b --- /dev/null +++ b/tutti-service/src/test/resources/genericFormat/empty/survey.csv @@ -0,0 +1 @@ +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;Navire_Id;Engin_Id;Port_Deb_Campagne_Id;Port_Fin_Campagne_Id;Chef_Mission_Id;Resp_Salle_Tri_Id diff --git a/tutti-service/src/test/resources/genericFormat/empty/protocol.tuttiProtocol b/tutti-service/src/test/resources/genericFormat/protocol/protocol.tuttiProtocol similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/protocol.tuttiProtocol rename to tutti-service/src/test/resources/genericFormat/protocol/protocol.tuttiProtocol diff --git a/tutti-service/src/test/resources/genericFormat/default/sampleCategory.csv b/tutti-service/src/test/resources/genericFormat/technical/sampleCategory.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/default/sampleCategory.csv rename to tutti-service/src/test/resources/genericFormat/technical/sampleCategory.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/temporaryPersons.csv b/tutti-service/src/test/resources/genericFormat/technical/temporaryPersons.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/temporaryPersons.csv rename to tutti-service/src/test/resources/genericFormat/technical/temporaryPersons.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/temporarySpecies.csv b/tutti-service/src/test/resources/genericFormat/technical/temporarySpecies.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/temporarySpecies.csv rename to tutti-service/src/test/resources/genericFormat/technical/temporarySpecies.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/temporaryVessels.csv b/tutti-service/src/test/resources/genericFormat/technical/temporaryVessels.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/temporaryVessels.csv rename to tutti-service/src/test/resources/genericFormat/technical/temporaryVessels.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.