This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d37d12f1bd42244b157873778a480b01f0a4aa20 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 25 18:20:56 2016 +0100 Fix tests --- .../configuration/ObserveWebApplicationConfig.java | 2 +- .../db/ObserveWebDatabasesHelperTest.java | 50 +++++++++++----------- .../user/ObserveWebUsersHelperTest.java | 2 + 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java index 8c75a26..3268b4d 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java @@ -100,7 +100,7 @@ public class ObserveWebApplicationConfig extends GeneratedObserveWebApplicationC if (log.isInfoEnabled()) { log.info("Dev mode detected, use temporary basedir: " + baseDirectory); } - get().setOption(ObserveWebApplicationConfigOption.BASE_DIRECTORY.getKey(), baseDirectory.getAbsolutePath()); + setBaseDirectory(baseDirectory); } if (log.isInfoEnabled()) { diff --git a/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java index da9608e..6399f2f 100644 --- a/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java +++ b/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java @@ -51,29 +51,29 @@ import java.util.Set; public class ObserveWebDatabasesHelperTest { public static final String FILE_CONTENT = "databases: \n" + - "- name: production\n" + - " defaultDatabase: true\n" + - " roles: \n" + - " - login: admin\n" + - " password: passwordAdmin\n" + - " - login: technicien\n" + - " password: passwordTechnicien\n" + - " - login: utilisateur\n" + - " password: passwordUtilisateur\n" + - " - login: referentiel\n" + - " password: passwordReferentiel\n" + - " url: jdbc:postgresql://localhost:5432/production\n" + - "- name: test\n" + - " roles: \n" + - " - login: admin\n" + - " password: passwordAdmin\n" + - " - login: technicien\n" + - " password: passwordTechnicien\n" + - " - login: utilisateur\n" + - " password: passwordUtilisateur\n" + - " - login: referentiel\n" + - " password: passwordReferentiel\n" + - " url: jdbc:postgresql://localhost:5432/test\n"; + "- name: production\n" + + " defaultDatabase: true\n" + + " roles: \n" + + " - login: admin\n" + + " password: passwordAdmin\n" + + " - login: technicien\n" + + " password: passwordTechnicien\n" + + " - login: utilisateur\n" + + " password: passwordUtilisateur\n" + + " - login: referentiel\n" + + " password: passwordReferentiel\n" + + " url: jdbc:postgresql://localhost:5432/production\n" + + "- name: test\n" + + " roles: \n" + + " - login: admin\n" + + " password: passwordAdmin\n" + + " - login: technicien\n" + + " password: passwordTechnicien\n" + + " - login: utilisateur\n" + + " password: passwordUtilisateur\n" + + " - login: referentiel\n" + + " password: passwordReferentiel\n" + + " url: jdbc:postgresql://localhost:5432/test\n"; protected ObserveWebApplicationConfig configuration; @@ -88,7 +88,9 @@ public class ObserveWebDatabasesHelperTest { } @Before - public void setUp() { + public void setUp() throws IOException { + + java.nio.file.Files.createDirectories(new File(System.getProperty("java.io.tmpdir")).toPath()); configuration = new ObserveWebApplicationConfig("observeweb-test.conf"); configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); diff --git a/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java index c6cc285..686664c 100644 --- a/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java +++ b/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java @@ -74,6 +74,8 @@ public class ObserveWebUsersHelperTest { @Before public void setUp() throws Exception { + java.nio.file.Files.createDirectories(new File(System.getProperty("java.io.tmpdir")).toPath()); + configuration = new ObserveWebApplicationConfig("observeweb-test.conf"); configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.