branch develop updated (b4f49fa -> d09ff41)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from b4f49fa Retour sur develop Merge branch 'feature/7458-topiaServices' into develop new d09ff41 correction du nom repetoire des bases de test. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d09ff41b9f233311a823166d4767113b57714b1d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 16:26:03 2015 +0200 correction du nom repetoire des bases de test. Summary of changes: .../java/fr/ird/observe/services/ApplicationContextResource.java | 6 +++--- .../src/test/java/fr/ird/observe/services/DataSourceResource.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 d09ff41b9f233311a823166d4767113b57714b1d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 16:26:03 2015 +0200 correction du nom repetoire des bases de test. --- .../java/fr/ird/observe/services/ApplicationContextResource.java | 6 +++--- .../src/test/java/fr/ird/observe/services/DataSourceResource.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index 2dc55a7..4f357dd 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -131,16 +131,16 @@ public class ApplicationContextResource implements TestRule { this.testDirectory = testDirectory; } - public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(Class<?> testClass, String methodName) { + public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(Class<?> testClass, String dbName) { ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); - File localDbFile = new File(getTestDirectory(), methodName); + File localDbFile = new File(getTestDirectory(), dbName); if (log.isInfoEnabled()) { log.info("db directory: " + localDbFile); } - configurationTopiaH2.setLabel(testClass.getSimpleName() + "#" + methodName); + configurationTopiaH2.setLabel(testClass.getSimpleName() + "#" + dbName); configurationTopiaH2.setUsername(TestHelper.TEST_H2_LOGIN); configurationTopiaH2.setPassword(TestHelper.TEST_H2_PASSWORD); configurationTopiaH2.setDirectory(localDbFile); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index f3ec450..54a2662 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -145,7 +145,7 @@ public class DataSourceResource implements TestRule { } - dataSourceConfiguration = applicationContextResource.createDataSourceConfigurationH2(testClass, methodName); + dataSourceConfiguration = applicationContextResource.createDataSourceConfigurationH2(testClass, "localdb"); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm