[Tutti-commits] 02/02: fix pupitri tests

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit a03c2d82130b2d76d232e0dc35ffc50df46b5858 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 2 14:01:11 2015 +0100 fix pupitri tests --- .../ifremer/tutti/service/ServiceDbResource.java | 27 ++++++++++++++++++---- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +----- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +----- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +----- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +----- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +----- .../pupitri/PupitriImportServiceEvo6149Test.java | 7 +----- .../test/resources/pupitri/ano-5079.tuttiProtocol | 1 + 8 files changed, 30 insertions(+), 40 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java index 03608ee..a1d8c00 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java @@ -204,15 +204,34 @@ public class ServiceDbResource extends DatabaseResource { return serviceContext; } - public void loadInternalProtocolFile() { + public void loadInternalProtocolFile() throws IOException { - File protocolFile = FileUtil.getFileFromPaths(new File("src"), "test", "data", getDbName(), "protocol.tuttiProtocol"); + loadInternalProtocolFile(null,"protocol"); - getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocolFile.getParentFile().getAbsolutePath()); - serviceContext.getDataContext().setProtocolId("protocol"); +// File protocolFile = FileUtil.getFileFromPaths(new File("src"), "test", "data", getDbName(), "protocol.tuttiProtocol"); +// +// getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocolFile.getParentFile().getAbsolutePath()); +// serviceContext.getDataContext().setProtocolId("protocol"); } + public void loadInternalProtocolFile(String path, String protocolName) throws IOException { + + String protocolFilename = protocolName + ".tuttiProtocol"; + String classPath = ""; + if (path != null) { + classPath = path; + if (!path.endsWith("/")) { + classPath += "/"; + } + } + classPath += protocolFilename; + + File protocol = copyClassPathResource(classPath, protocolFilename); + getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath()); + getServiceContext().getDataContext().setProtocolId(protocolName); + } + public TuttiProtocol loadProtocol(File protocolFile) { Assert.assertTrue(protocolFile.exists()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java index ae0d0aa..2653b3c 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java @@ -22,12 +22,10 @@ package fr.ifremer.tutti.service.pupitri; * #L% */ -import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.junit.Assert; import org.junit.Test; @@ -48,10 +46,7 @@ public class PupitriImportServiceAno3898Test extends PupitryImportServiceTestSup File trunk = dbResource.copyClassPathResource("pupitri/ano-3898.tnk", "pupitri.tnk"); File carroussel = dbResource.copyClassPathResource("pupitri/ano-3898.car", "pupitri.car"); - File protocol = dbResource.copyClassPathResource("pupitri/ano-3898.tuttiProtocol", "ano-3898.tuttiProtocol"); - dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath()); - TuttiProtocol protocol1 = persistenceService.getProtocol("ano-3898"); - persistenceService.setProtocol(protocol1); + dbResource.loadInternalProtocolFile("pupitri/", "ano-3898"); FishingOperation operation = dataContext.operations.get(1); CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java index 8b197d3..72b83b9 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java @@ -23,12 +23,10 @@ package fr.ifremer.tutti.service.pupitri; */ import com.google.common.collect.Sets; -import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -54,10 +52,7 @@ public class PupitriImportServiceAno5032Test extends PupitryImportServiceTestSup File trunk = dbResource.copyClassPathResource("pupitri/ano-5032.tnk", "pupitri.tnk"); File carroussel = dbResource.copyClassPathResource("pupitri/ano-5032.car", "pupitri.car"); - File protocol = dbResource.copyClassPathResource("pupitri/ano-5032.tuttiProtocol", "ano-5032.tuttiProtocol"); - dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath()); - TuttiProtocol protocol1 = persistenceService.getProtocol("ano-5032"); - persistenceService.setProtocol(protocol1); + dbResource.loadInternalProtocolFile("pupitri/", "ano-5032"); FishingOperation operation = dataContext.operations.get(1); CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java index 60b411c..e041cd3 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java @@ -25,12 +25,10 @@ package fr.ifremer.tutti.service.pupitri; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.SpeciesBean; import org.apache.commons.logging.Log; @@ -64,10 +62,7 @@ public class PupitriImportServiceAno5079Test extends PupitryImportServiceTestSup File trunk = dbResource.copyClassPathResource("pupitri/ano-5079.tnk", "pupitri.tnk"); File carroussel = dbResource.copyClassPathResource("pupitri/ano-5079.car", "pupitri.car"); - File protocol = dbResource.copyClassPathResource("pupitri/ano-5079.tuttiProtocol", "ano-5079.tuttiProtocol"); - dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath()); - TuttiProtocol protocol1 = persistenceService.getProtocol("ano-5079"); - persistenceService.setProtocol(protocol1); + dbResource.loadInternalProtocolFile("pupitri/", "ano-5079"); FishingOperation operation = dataContext.operations.get(1); CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java index 1f41c30..3b53544 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java @@ -23,12 +23,10 @@ package fr.ifremer.tutti.service.pupitri; */ import com.google.common.collect.Sets; -import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,10 +54,7 @@ public class PupitriImportServiceEvo5060Test extends PupitryImportServiceTestSup File trunk = dbResource.copyClassPathResource("pupitri/evo-5060.tnk", "pupitri.tnk"); File carroussel = dbResource.copyClassPathResource("pupitri/evo-5060.car", "pupitri.car"); - File protocol = dbResource.copyClassPathResource("pupitri/evo-5060.tuttiProtocol", "evo-5060.tuttiProtocol"); - dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath()); - TuttiProtocol protocol1 = persistenceService.getProtocol("evo-5060"); - persistenceService.setProtocol(protocol1); + dbResource.loadInternalProtocolFile("pupitri/", "evo-5060"); FishingOperation operation = dataContext.operations.get(1); CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java index 4f29abe..68d3fe7 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java @@ -23,12 +23,10 @@ package fr.ifremer.tutti.service.pupitri; */ import com.google.common.collect.Sets; -import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,10 +55,7 @@ public class PupitriImportServiceEvo5062Test extends PupitryImportServiceTestSup File trunk = dbResource.copyClassPathResource("pupitri/evo-5062.tnk", "pupitri.tnk"); File carroussel = dbResource.copyClassPathResource("pupitri/evo-5062.car", "pupitri.car"); - File protocol = dbResource.copyClassPathResource("pupitri/evo-5062.tuttiProtocol", "evo-5062.tuttiProtocol"); - dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath()); - TuttiProtocol protocol1 = persistenceService.getProtocol("evo-5062"); - persistenceService.setProtocol(protocol1); + dbResource.loadInternalProtocolFile("pupitri/", "evo-5062"); FishingOperation operation = dataContext.operations.get(1); CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java index 1daae43..4a969e6 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java @@ -28,14 +28,12 @@ import com.google.common.base.Predicate; import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatchs; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; @@ -64,10 +62,7 @@ public class PupitriImportServiceEvo6149Test extends PupitryImportServiceTestSup File trunk = dbResource.copyClassPathResource("pupitri/evo-6149.tnk", "pupitri.tnk"); File carroussel = dbResource.copyClassPathResource("pupitri/evo-6149.car", "pupitri.car"); - File protocol = dbResource.copyClassPathResource("pupitri/evo-6149.tuttiProtocol", "evo-6149.tuttiProtocol"); - dbResource.getConfig().getApplicationConfig().setOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY.getKey(), protocol.getParentFile().getAbsolutePath()); - TuttiProtocol protocol1 = persistenceService.getProtocol("evo-6149"); - persistenceService.setProtocol(protocol1); + dbResource.loadInternalProtocolFile("pupitri/", "evo-6149"); FishingOperation operation = dataContext.operations.get(1); CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); diff --git a/tutti-service/src/test/resources/pupitri/ano-5079.tuttiProtocol b/tutti-service/src/test/resources/pupitri/ano-5079.tuttiProtocol index 2d76dc7..c3ac498 100644 --- a/tutti-service/src/test/resources/pupitri/ano-5079.tuttiProtocol +++ b/tutti-service/src/test/resources/pupitri/ano-5079.tuttiProtocol @@ -2659,6 +2659,7 @@ species: speciesSurveyCode: DICO-CUN weightEnabled: true - !SpeciesProtocol + id: 06b8aab8-6f8e-4e92-8f72-21be1838cdRfr calcifySampleEnabled: true countIfNoFrequencyEnabled: true mandatorySampleCategoryId: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.