This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git commit 576c7b8786eaa7a3670c6da5c62c363d28bb0656 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 11:20:33 2015 +0200 Meilleure isolation des tests de l'application web --- .../web/configuration/ObserveWebApplicationConfiguration.java | 11 +++++++++++ .../web/configuration/db/ObserveWebDatabasesHelperTest.java | 4 ++-- .../web/configuration/user/ObserveWebUsersHelperTest.java | 2 +- .../src/test/resources/observeweb-test.conf | 4 ++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java index a7c9633..3040049 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java @@ -11,12 +11,15 @@ import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ApplicationConfigHelper; import org.nuiton.config.ApplicationConfigProvider; import org.nuiton.config.ArgumentsParserException; +import sun.security.action.GetPropertyAction; import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.net.URL; import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.nio.file.attribute.FileAttribute; import java.nio.file.attribute.PosixFilePermission; import java.nio.file.attribute.PosixFilePermissions; @@ -24,6 +27,8 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import static java.security.AccessController.doPrivileged; + /** * La configuration de l'application web. * @@ -108,6 +113,12 @@ public class ObserveWebApplicationConfiguration { // on utilise un répertoire temporaire comme basedir try { + // Toujours s'assurer que le répertoire temporarie du système existe + Path tmpdir = Paths.get(doPrivileged(new GetPropertyAction("java.io.tmpdir"))); + if (!Files.exists(tmpdir)) { + Files.createDirectories(tmpdir); + } + Set<PosixFilePermission> posixFilePermissions = PosixFilePermissions.fromString("rwxr-x---"); FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(posixFilePermissions); applicationBaseDirectory = Files.createTempDirectory("observeweb", fileAttribute).toFile(); diff --git a/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java b/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java index ba8749e..bfb9996 100644 --- a/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java +++ b/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java @@ -66,8 +66,8 @@ public class ObserveWebDatabasesHelperTest { } @Before - public void setUp() { - configuration = new ObserveWebApplicationConfiguration(); + public void setUp() throws IOException { + configuration = new ObserveWebApplicationConfiguration("observeweb-test.conf"); configuration.init(); observeWebDatabasesHelper = new ObserveWebDatabasesHelper(); databasesConfigurationFile = configuration.getDatabasesConfigurationFile(); diff --git a/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java b/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java index 6745ec6..e55679e 100644 --- a/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java +++ b/observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java @@ -52,7 +52,7 @@ public class ObserveWebUsersHelperTest { @Before public void setUp() throws Exception { - configuration = new ObserveWebApplicationConfiguration(); + configuration = new ObserveWebApplicationConfiguration("observeweb-test.conf"); configuration.init(); observeWebUsersHelper = new ObserveWebUsersHelper(); usersConfigurationFile = configuration.getUsersConfigurationFile(); diff --git a/observe-application-web/src/test/resources/observeweb-test.conf b/observe-application-web/src/test/resources/observeweb-test.conf new file mode 100644 index 0000000..3caee78 --- /dev/null +++ b/observe-application-web/src/test/resources/observeweb-test.conf @@ -0,0 +1,4 @@ +observeweb.devMode=true +observeweb.build.version=${project.version} +observeweb.build.date=${buildDate} +observeweb.build.number=${buildNumber} \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.