This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit 2304c229be25d40a3b77126e299be4b1471bac55 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 6 23:02:10 2015 +0200 On teste si on peut lancer les tests sur le serveur web --- .../ird/observe/services/TestMethodResource.java | 27 ++++++++++++++++++++++ .../service/DataSourceServiceRestTest.java | 15 ------------ .../service/seine/TripSeineServiceTest.java | 2 -- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java index 0f62ca4..97f1c27 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java @@ -1,9 +1,11 @@ package fr.ird.observe.services; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.service.PingService; import fr.ird.observe.test.TestHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assume; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; @@ -80,6 +82,8 @@ public class TestMethodResource implements TestRule { dataSourceConfiguration = testClassResource.createDataSourceConfigurationRest(testClass, "admin", 'a'); + checkServerIsAvailable(testClass, methodName); + } protected void after(Description description) { @@ -94,4 +98,27 @@ public class TestMethodResource implements TestRule { testClassResource.setTemporaryDirectoryRoot(null); } + + public void checkServerIsAvailable(Class<?> testClass, String methodName) { + + boolean serverExist = true; + + PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); + + try { + String ping = service.ping(); + if (!"ping".equals(ping)) { + serverExist = false; + } + } catch (Exception e) { + serverExist = false; + } + + if (!serverExist) { + if (log.isWarnEnabled()) { + log.warn("Skip test [" + testClass.getName() + "#" + methodName + "], server " + dataSourceConfiguration.getServerUrl() + " is not available."); + } + } + Assume.assumeTrue("Server " + dataSourceConfiguration.getServerUrl() + " not found", serverExist); + } } diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java index 79b0e86..68a89c7 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java @@ -8,8 +8,6 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -29,19 +27,6 @@ public class DataSourceServiceRestTest { @Rule public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); - @Before - public void setUp() throws Exception { - - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration(); - - - //TODO Tester si le serveur est accessible sinon on ignore le test - boolean serverExist = true; - - Assume.assumeTrue("Serveur " + dataSourceConfiguration.getServerUrl() + " no found", serverExist); - - } - @Test(expected = DatabaseNotFoundException.class) public void testOpenNotExistingDatabase() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java index 88c0ccd..ba44b1a 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java @@ -18,7 +18,6 @@ import fr.ird.observe.services.dto.seine.TripSeineStubDto; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -29,7 +28,6 @@ import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@Ignore public class TripSeineServiceTest { public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.