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 912ce8ca1e64f02777599a51b624eeb5e341d946 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 17 13:19:02 2016 +0100 Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs --- .../tutti/persistence/test/DatabaseResource.java | 11 ----------- .../fr/ifremer/tutti/service/ServiceDbResource.java | 20 +++++++++----------- .../service/bigfin/BigfinImportService2Test.java | 1 - 3 files changed, 9 insertions(+), 23 deletions(-) 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 cdad907..28d38f6 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,9 +84,6 @@ 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(""); } @@ -161,14 +158,6 @@ 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 fe078ff..b53a648 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,8 +25,6 @@ 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; @@ -142,15 +140,15 @@ public class ServiceDbResource extends DatabaseResource { ((PersistenceService)service).setSkipShutdownDbWhenClosing(); - if (isUseLegacyPersonDepartement()) { - - if (log.isWarnEnabled()) { - log.warn("Use legacy departement codes..."); - } - DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.setValue(181); - DepartmentCode.INSIDE_PREFIX.setValue("PDG-"); - - } +// if (isUseLegacyPersonDepartement()) { +// +// if (log.isWarnEnabled()) { +// log.warn("Use legacy departement codes..."); +// } +// DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.setValue(181); +// DepartmentCode.INSIDE_PREFIX.setValue("PDG-"); +// +// } } return service; } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java index 51b3606..a6a3326 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java @@ -99,7 +99,6 @@ public class BigfinImportService2Test { @Before public void setUp() throws Exception { - dbResource.setUseLegacyPersonDepartement(false); dataDirectory = dbResource.getConfig().getDataDirectory(); TuttiServiceContext serviceContext = dbResource.getServiceContext(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.