Author: tchemit Date: 2014-04-05 13:09:47 +0200 (Sat, 05 Apr 2014) New Revision: 1003 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1003 Log: fix tests Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2014-04-05 11:00:41 UTC (rev 1002) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2014-04-05 11:09:47 UTC (rev 1003) @@ -272,4 +272,8 @@ public File getTestDir() { return testDir; } + + public void setConfiguration(EchoBaseConfiguration configuration) { + this.configuration = configuration; + } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java 2014-04-05 11:00:41 UTC (rev 1002) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java 2014-04-05 11:09:47 UTC (rev 1003) @@ -21,6 +21,7 @@ * #L% */ +import fr.ifremer.echobase.config.EchoBaseConfiguration; import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.apache.commons.collections4.CollectionUtils; @@ -34,6 +35,7 @@ import java.io.IOException; import java.net.URL; import java.util.Map; +import java.util.Properties; import java.util.Set; /** @@ -49,13 +51,16 @@ @BeforeClass public static void setupClass() { - URL coserApiURL = new FakeEchoBaseServiceContext(null).getCoserApiURL(); + FakeEchoBaseServiceContext fakeEchoBaseServiceContext = new FakeEchoBaseServiceContext(null); + fakeEchoBaseServiceContext.setConfiguration(new EchoBaseConfiguration("echobase-services-test.properties", new Properties())); + URL coserApiURL = fakeEchoBaseServiceContext.getCoserApiURL(); try { coserApiURL.openStream(); } catch (IOException e) { - Assume.assumeTrue("Could not find coser server: "+coserApiURL, false); + Assume.assumeTrue("Could not find coser server: " + coserApiURL, false); } } + @Test public void testGetFacades() throws Exception {