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 bccde3544d77cdd632f309a1bd16e13fe8afb0c1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 17 13:21:28 2016 +0100 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) --- .../GenericFormatImportServiceValidTest.java | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 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 12a8ff2..809e133 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 @@ -52,7 +52,7 @@ public class GenericFormatImportServiceValidTest extends GenericFormatImportServ private static final Log log = LogFactory.getLog(GenericFormatImportServiceTest.class); @ClassRule - public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbGenericFormatImport"); + public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbEmpty"); private final static Set<String> builder = new HashSet<>(); @@ -64,7 +64,7 @@ public class GenericFormatImportServiceValidTest extends GenericFormatImportServ @AfterClass public static void afterClass() throws Exception { - dbResource.setDestroyResources(false); + dbResource.setDestroyResources(true); if (log.isInfoEnabled()) { log.info("Report files:\n" + Joiner.on("\n").join(builder)); @@ -75,14 +75,34 @@ public class GenericFormatImportServiceValidTest extends GenericFormatImportServ @Test public void testValidate() throws IOException { - dbResource.setDestroyResources(false); - doValidate("testImport", PROGRAM_ID, "referentials", "sampleCategory", "protocol", "default"); - if (log.isInfoEnabled()) { - log.info("Report files:" + builder.toString()); - } + } + + @Test + public void testImportWithObsoletes() throws IOException { + + GenericFormatValidateFileResult result = doValidate("testImportWithObsoletes", PROGRAM_ID, "empty", "withObsoletes"); + + Assert.assertTrue(result.isArchiveLayoutValid()); + Assert.assertTrue(result.getSampleCategoryFileResult().isImported()); + Assert.assertTrue(result.getSampleCategoryFileResult().isValid()); + + Assert.assertTrue(result.getReferentialTemporaryGearFileResult().isImported()); + Assert.assertTrue(result.getReferentialTemporaryGearFileResult().isValid()); + Assert.assertTrue(result.getReferentialTemporaryPersonFileResult().isImported()); + Assert.assertTrue(result.getReferentialTemporaryPersonFileResult().isValid()); + Assert.assertTrue(result.getReferentialTemporarySpeciesFileResult().isImported()); + Assert.assertTrue(result.getReferentialTemporarySpeciesFileResult().isValid()); + Assert.assertTrue(result.getReferentialTemporaryVesselFileResult().isImported()); + Assert.assertTrue(result.getReferentialTemporaryVesselFileResult().isValid()); + Assert.assertTrue(result.getProtocolFileResult().isImported()); + Assert.assertTrue(result.getProtocolFileResult().isValid()); + Assert.assertTrue(result.getSurveyFileResult().isValid()); + Assert.assertTrue(result.getSurveyFileResult().isImported()); + + Assert.assertTrue(result.isValid()); } @Test @@ -1063,6 +1083,7 @@ public class GenericFormatImportServiceValidTest extends GenericFormatImportServ importConfiguration.setImportAttachments(true); importConfiguration.setUpdateCruises(true); importConfiguration.setUpdateOperations(true); + importConfiguration.setAuthorizeObsoleteReferentials(true); File reportFile = getServiceDbResource().getConfig().newTempFile(archivName, ".pdf"); importConfiguration.setReportFile(reportFile); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.