This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 0f8b763a8072717d81708cf1ab52ec921997a07e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:39 2015 +0200 revue des configuration de test (j'ai remis les valeurs par defaut --- .../src/test/java/fr/ird/observe/services/TestClassResource.java | 5 ++--- .../src/test/java/fr/ird/observe/services/TestMethodResource.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java index a7f4de9..ad79060 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java @@ -1,6 +1,5 @@ package fr.ird.observe.services; -import com.google.common.base.Optional; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -131,7 +130,7 @@ public class TestClassResource implements TestRule { configurationRest.setServerUrl(serverUrl); configurationRest.setLogin(login); configurationRest.setPassword(password); - configurationRest.setOptionalDatabaseName(Optional.fromNullable(databaseName)); + configurationRest.setOptionalDatabaseName(databaseName); return configurationRest; @@ -146,7 +145,7 @@ public class TestClassResource implements TestRule { configurationRest.setServerUrl(serverUrl); configurationRest.setLogin(login); configurationRest.setPassword(password); - configurationRest.setOptionalDatabaseName(Optional.<String>absent()); + configurationRest.setOptionalDatabaseName(null); return configurationRest; diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java index e53eed9..45ded1f 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java @@ -39,7 +39,7 @@ public class TestMethodResource implements TestRule { } public TestMethodResource(TestClassResource testClassResource, String databaseName) { - this(testClassResource, databaseName, "userTest", "password3".toCharArray()); + this(testClassResource, databaseName, "admin", 'a'); } public TestMethodResource(TestClassResource testClassResource, String databaseName, String login, char... password) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.