Author: tchemit Date: 2014-04-05 15:02:18 +0200 (Sat, 05 Apr 2014) New Revision: 1004 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1004 Log: fix api test Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java 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:09:47 UTC (rev 1003) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java 2014-04-05 13:02:18 UTC (rev 1004) @@ -21,21 +21,18 @@ * #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; import org.apache.commons.collections4.MapUtils; import org.junit.Assert; import org.junit.Assume; -import org.junit.BeforeClass; import org.junit.Test; import javax.inject.Inject; import java.io.IOException; import java.net.URL; import java.util.Map; -import java.util.Properties; import java.util.Set; /** @@ -49,27 +46,29 @@ @Inject private CoserApiService service; - @BeforeClass - public static void setupClass() { - FakeEchoBaseServiceContext fakeEchoBaseServiceContext = new FakeEchoBaseServiceContext(null); - fakeEchoBaseServiceContext.setConfiguration(new EchoBaseConfiguration("echobase-services-test.properties", new Properties())); - URL coserApiURL = fakeEchoBaseServiceContext.getCoserApiURL(); + @Test + public void testGetFacades() throws Exception { + + URL coserApiURL = serviceContext.getCoserApiURL(); try { coserApiURL.openStream(); } catch (IOException e) { Assume.assumeTrue("Could not find coser server: " + coserApiURL, false); } - } - @Test - public void testGetFacades() throws Exception { - Map<String, String> facades = service.getFacades(); Assert.assertTrue(MapUtils.isNotEmpty(facades)); } @Test public void testGetZonesForFacade() throws Exception { + URL coserApiURL = serviceContext.getCoserApiURL(); + try { + coserApiURL.openStream(); + } catch (IOException e) { + Assume.assumeTrue("Could not find coser server: " + coserApiURL, false); + } + Map<String, String> zones = service.getZonesForFacade("atlantique"); Assert.assertTrue(MapUtils.isNotEmpty(zones)); @@ -80,6 +79,13 @@ @Test public void testGetIndicators() throws Exception { + URL coserApiURL = serviceContext.getCoserApiURL(); + try { + coserApiURL.openStream(); + } catch (IOException e) { + Assume.assumeTrue("Could not find coser server: " + coserApiURL, false); + } + Set<String> indicators = service.getIndicators(); Assert.assertTrue(CollectionUtils.isNotEmpty(indicators)); }