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 d35b1de22067b0a072069fd18538210657b07dfb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 16:12:33 2015 +0100 faire en sorte que les tests continue de fonctionner malgres le reusinage sur les départements --- .../tutti/persistence/test/DatabaseResource.java | 11 +++++++++++ .../fr/ifremer/tutti/service/ServiceDbResource.java | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java index 28d38f6..cdad907 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java @@ -84,6 +84,9 @@ public class DatabaseResource implements TestRule { private boolean destroyResources; + // To use legacy person departement TODO Remove this when all test db will use ng departements (says never!) + private boolean useLegacyPersonDepartement = true; + public static DatabaseResource readDb() { return new DatabaseResource(""); } @@ -158,6 +161,14 @@ public class DatabaseResource implements TestRule { return writeDb; } + public boolean isUseLegacyPersonDepartement() { + return useLegacyPersonDepartement; + } + + public void setUseLegacyPersonDepartement(boolean useLegacyPersonDepartement) { + this.useLegacyPersonDepartement = useLegacyPersonDepartement; + } + @Override public Statement apply(final Statement base, final Description description) { 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 b2f3788..bf9e553 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 @@ -25,6 +25,8 @@ package fr.ifremer.tutti.service; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; +import fr.ifremer.adagio.core.dao.administration.user.DepartmentCode; +import fr.ifremer.adagio.core.dao.administration.user.DepartmentId; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -132,6 +134,21 @@ public class ServiceDbResource extends DatabaseResource { counts.put(type, count); return type.getSimpleName() + "_" + count; } + + @Override + public <S extends TuttiService> S getService(Class<S> serviceType) { + S service = super.getService(serviceType); + if (PersistenceService.class.equals(serviceType) && isUseLegacyPersonDepartement()) { + + if (log.isWarnEnabled()) { + log.warn("Use legacy departement codes..."); + } + DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.setValue(181); + DepartmentCode.INSIDE_PREFIX.setValue("PDG-"); + + } + return service; + } }; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.