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 b040b4302b7f7265f74d292b153de9aa53d0bc71 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 09:32:20 2015 +0100 prepare test mecanism --- .../GenericFormatImportServiceTest.java | 68 ++++------------------ ... => GenericFormatImportServiceTestSupport.java} | 48 ++++++++++----- .../{empty => default}/accidentalCatch.csv | 0 .../genericFormat/{empty => default}/catch.csv | 0 .../{empty => default}/gearCaracteristics.csv | 0 .../{empty => default}/individualObservation.csv | 0 .../{empty => default}/marineLitter.csv | 0 .../genericFormat/{empty => default}/operation.csv | 0 .../genericFormat/{empty => default}/parameter.csv | 0 .../{empty => default}/sampleCategory.csv | 0 .../genericFormat/{empty => default}/survey.csv | 0 11 files changed, 45 insertions(+), 71 deletions(-) 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 c499247..7261a4e 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,15 +1,10 @@ package fr.ifremer.tutti.service.genericformat; -import fr.ifremer.tutti.persistence.ProgressionModel; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.ServiceDbResource; -import fr.ifremer.tutti.service.TuttiServiceContext; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.nuiton.util.FileUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.File; +import java.io.IOException; /** * Created on 2/15/15. @@ -17,64 +12,23 @@ import java.io.File; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class GenericFormatImportServiceTest { +public class GenericFormatImportServiceTest extends GenericFormatImportServiceTestSupport { - @ClassRule - public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbGenericFormatImport"); + /** Logger. */ + private static final Log log = LogFactory.getLog(GenericFormatImportServiceTest.class); - public static final String PROGRAM_ID = "CAM-EVHOE"; - - protected GenericFormatImportService service; - - protected PersistenceService persistenceService; - - protected ServiceDbResource.DataContext dataContext; - - protected ProgressionModel progressionModel; - - @Before - public void setUp() throws Exception { - - TuttiServiceContext serviceContext = dbResource.getServiceContext(); - - persistenceService = serviceContext.getService(PersistenceService.class); - - dbResource.setCountryInConfig("12"); - dbResource.openDataContext(); - - service = serviceContext.getService(GenericFormatImportService.class); - - dataContext = dbResource.loadContext(PROGRAM_ID); - - progressionModel = new ProgressionModel(); - - } - - protected File createArchive(String directoryName, String archiveFileName) { - - File explodedDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "genericFormat", directoryName); - - File dataDirectory = dbResource.getConfig().getDataDirectory(); - File archiveFile = new File(dataDirectory, archiveFileName); - - GenericFormatArchive archiveToExport = GenericFormatArchive.forExportFromWorkingDirectory(archiveFile, explodedDirectory); - - archiveToExport.createZip(null); - - return archiveFile; - - } - - @Test - public void loadEmptyImport() { + @Override + public void testImport() throws IOException { File archiveFile = createArchive("empty", "empty.zip"); int nbSteps = service.getImportProgramNbSteps(archiveFile); progressionModel.adaptTotal(nbSteps); + if (log.isInfoEnabled()) { + log.info("Will do import in " + nbSteps + " steps"); + } service.importProgram(dataContext.program.getId(), archiveFile, progressionModel); - } } 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/GenericFormatImportServiceTestSupport.java similarity index 55% copy from tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTest.java copy to tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceTestSupport.java index c499247..5c5b29f 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/GenericFormatImportServiceTestSupport.java @@ -4,20 +4,27 @@ import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; +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; +import java.io.IOException; /** - * Created on 2/15/15. + * Created on 2/23/15. * * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class GenericFormatImportServiceTest { +public abstract class GenericFormatImportServiceTestSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(GenericFormatImportServiceTestSupport.class); @ClassRule public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbGenericFormatImport"); @@ -50,12 +57,34 @@ public class GenericFormatImportServiceTest { } - protected File createArchive(String directoryName, String archiveFileName) { + protected File createArchive(String directoryName, String archiveFileName) throws IOException { + + File tmpDirectory = dbResource.getConfig().getTmpDirectory(); + + File explodedDirectory = new File(tmpDirectory, directoryName); + if (log.isInfoEnabled()) { + log.info("Exploded directory of archive: " + explodedDirectory); + } - File explodedDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "genericFormat", directoryName); + 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); + + 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 archiveFile = new File(dataDirectory, archiveFileName); + if (log.isInfoEnabled()) { + log.info("Build import archive: " + archiveFile); + } GenericFormatArchive archiveToExport = GenericFormatArchive.forExportFromWorkingDirectory(archiveFile, explodedDirectory); @@ -66,15 +95,6 @@ public class GenericFormatImportServiceTest { } @Test - public void loadEmptyImport() { - - File archiveFile = createArchive("empty", "empty.zip"); + public abstract void testImport() throws IOException; - int nbSteps = service.getImportProgramNbSteps(archiveFile); - progressionModel.adaptTotal(nbSteps); - - service.importProgram(dataContext.program.getId(), archiveFile, progressionModel); - - - } } diff --git a/tutti-service/src/test/resources/genericFormat/empty/accidentalCatch.csv b/tutti-service/src/test/resources/genericFormat/default/accidentalCatch.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/accidentalCatch.csv rename to tutti-service/src/test/resources/genericFormat/default/accidentalCatch.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/catch.csv b/tutti-service/src/test/resources/genericFormat/default/catch.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/catch.csv rename to tutti-service/src/test/resources/genericFormat/default/catch.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/gearCaracteristics.csv b/tutti-service/src/test/resources/genericFormat/default/gearCaracteristics.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/gearCaracteristics.csv rename to tutti-service/src/test/resources/genericFormat/default/gearCaracteristics.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/individualObservation.csv b/tutti-service/src/test/resources/genericFormat/default/individualObservation.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/individualObservation.csv rename to tutti-service/src/test/resources/genericFormat/default/individualObservation.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/marineLitter.csv b/tutti-service/src/test/resources/genericFormat/default/marineLitter.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/marineLitter.csv rename to tutti-service/src/test/resources/genericFormat/default/marineLitter.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/operation.csv b/tutti-service/src/test/resources/genericFormat/default/operation.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/operation.csv rename to tutti-service/src/test/resources/genericFormat/default/operation.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/parameter.csv b/tutti-service/src/test/resources/genericFormat/default/parameter.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/parameter.csv rename to tutti-service/src/test/resources/genericFormat/default/parameter.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/sampleCategory.csv b/tutti-service/src/test/resources/genericFormat/default/sampleCategory.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/sampleCategory.csv rename to tutti-service/src/test/resources/genericFormat/default/sampleCategory.csv diff --git a/tutti-service/src/test/resources/genericFormat/empty/survey.csv b/tutti-service/src/test/resources/genericFormat/default/survey.csv similarity index 100% rename from tutti-service/src/test/resources/genericFormat/empty/survey.csv rename to tutti-service/src/test/resources/genericFormat/default/survey.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.