Author: tchemit Date: 2012-02-17 00:50:49 +0100 (Fri, 17 Feb 2012) New Revision: 320 Url: http://forge.codelutin.com/repositories/revision/echobase/320 Log: use new api Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-02-16 23:50:12 UTC (rev 319) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-02-16 23:50:49 UTC (rev 320) @@ -24,12 +24,13 @@ package fr.ifremer.echobase.tools; import fr.ifremer.echobase.EchoBaseConfiguration; +import fr.ifremer.echobase.EchoBaseConfigurationOption; import fr.ifremer.echobase.EchoBaseTopiaRootContextFactory; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.meta.DbMeta; +import fr.ifremer.echobase.services.DefaultEchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseService; import fr.ifremer.echobase.services.EchoBaseServiceContext; -import fr.ifremer.echobase.services.DefaultEchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseServiceFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,6 +46,7 @@ import java.io.File; import java.util.Locale; +import java.util.Properties; /** * Abstract csv file generator test @@ -67,7 +69,7 @@ protected File testdir; - protected static EchoBaseConfiguration configuration; + protected EchoBaseConfiguration configuration; @BeforeClass public static void beforeClass() { @@ -75,7 +77,6 @@ // check /csv dir is available in test resources TestHelper.assertCsvResourceDirectoryExists(); - configuration = new EchoBaseConfiguration("echobase-test.properties"); } @Before @@ -87,6 +88,11 @@ log.debug("Test directory = " + testdir); } + Properties defaultProps = new Properties(); + defaultProps.put(EchoBaseConfigurationOption.DATA_DIRECTORY.getKey(), testdir); + + configuration = new EchoBaseConfiguration(defaultProps); + EchoBaseTopiaRootContextFactory factory = new EchoBaseTopiaRootContextFactory();