diff --git a/sdi-library/pom.xml b/sdi-library/pom.xml
index ea281af..3e152d5 100644
--- a/sdi-library/pom.xml
+++ b/sdi-library/pom.xml
@@ -67,12 +67,6 @@
-
- junit
- junit
- 4.10
- test
-
gcube-geoserver-client
@@ -80,8 +74,11 @@
test
-
-
+
+ sdi-test-commons
+ org.gcube.spatial.data
+ test
+
diff --git a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java
deleted file mode 100644
index ccb9a28..0000000
--- a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.gcube.spatial.data.sdi;
-
-import org.junit.BeforeClass;
-
-public class BasicScopedTests {
-
-// static String sdiHostname="sdi-t.pre.d4science.org";
-// static String scope ="/pred4s/preprod/preVRE";
-//
-// String sdiHostname="sdi-d-d4s.d4science.org";
- static String scope = "/gcube/devsec/devVRE";
-
- @BeforeClass
- public static void setScope(){
- TokenSetter.set(scope);
- }
-
-
-
-
-}
diff --git a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/MetadataTests.java b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/MetadataTests.java
index 3c649c0..7640013 100644
--- a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/MetadataTests.java
+++ b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/MetadataTests.java
@@ -1,22 +1,25 @@
package org.gcube.spatial.data.sdi;
+import static org.junit.Assume.assumeTrue;
+
import java.io.File;
import java.net.URISyntaxException;
import java.nio.file.Paths;
+import org.gcube.sdi.test.GCubeSDITest;
import org.gcube.spatial.data.sdi.interfaces.Metadata;
import org.gcube.spatial.data.sdi.model.metadata.MetadataPublishOptions;
import org.gcube.spatial.data.sdi.model.metadata.TemplateInvocationBuilder;
import org.gcube.spatial.data.sdi.plugins.SDIAbstractPlugin;
import org.junit.Test;
-public class MetadataTests extends BasicScopedTests{
+public class MetadataTests implements GCubeSDITest{
@Test
public void getAvailableTemplatesTest() throws IllegalArgumentException, URISyntaxException{
-
+ assumeTrue(isTestInfrastructureEnabled());
// Metadata meta=SDIAbstractPlugin.metadata().at(new URI("http://"+sdiHostname+"/sdi-service/gcube/service")).build();
Metadata meta=SDIAbstractPlugin.metadata().build();
System.out.println(meta.getAvailableTemplates());
@@ -25,6 +28,7 @@ public class MetadataTests extends BasicScopedTests{
@Test
public void pushMetadata() throws IllegalArgumentException, URISyntaxException{
+ assumeTrue(isTestInfrastructureEnabled());
File toPubilsh=Paths.get("src/test/resources/toEnrichMeta.xml").toFile();
// Metadata meta=SDIAbstractPlugin.metadata().at(new URI("http://"+sdiHostname+"/sdi-service/gcube/service")).build();
diff --git a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java
index cb308a5..79ab315 100644
--- a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java
+++ b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java
@@ -1,10 +1,10 @@
package org.gcube.spatial.data.sdi;
+import static org.junit.Assume.assumeTrue;
+
import java.net.MalformedURLException;
-import static org.gcube.spatial.data.sdi.plugins.SDIAbstractPlugin.management;
-
-
+import org.gcube.sdi.test.GCubeSDITest;
import org.gcube.spatial.data.clients.geoserver.GSRESTClient;
import org.gcube.spatial.data.clients.model.engine.Engine;
import org.gcube.spatial.data.sdi.interfaces.SDIManagement;
@@ -12,10 +12,11 @@ import org.gcube.spatial.data.sdi.model.faults.RemoteException;
import org.gcube.spatial.data.sdi.plugins.SDIAbstractPlugin;
import org.junit.Test;
-public class SDITests extends BasicScopedTests{
+public class SDITests implements GCubeSDITest{
@Test
public void getScopeConfiguration() throws RemoteException, IllegalArgumentException, MalformedURLException {
+ assumeTrue(isTestInfrastructureEnabled());
SDIManagement sdi=SDIAbstractPlugin.management().build();
System.out.println(sdi.getConfiguration());
}
@@ -23,6 +24,7 @@ public class SDITests extends BasicScopedTests{
@Test
public void getScopeHealth() throws RemoteException {
+ assumeTrue(isTestInfrastructureEnabled());
SDIManagement sdi=SDIAbstractPlugin.management().build();
System.out.println(sdi.getReport());
}
@@ -30,6 +32,7 @@ public class SDITests extends BasicScopedTests{
@Test
public void getGS() throws Exception {
+ assumeTrue(isTestInfrastructureEnabled());
System.out.println(
SDIAbstractPlugin.management().build().getClientByEngineId(Engine.GS_ENGINE).getInfo());
diff --git a/sdi-service/pom.xml b/sdi-service/pom.xml
index 3566321..34c73f9 100644
--- a/sdi-service/pom.xml
+++ b/sdi-service/pom.xml
@@ -6,7 +6,7 @@
1.0.0-SNAPSHOT
sdi-service
- 1.5.0-SNPASHOT
+ 1.5.0-SNAPSHOT
SDI Service
REST Interface towards SDI facilities
war
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/LocalConfiguration.java b/sdi-service/src/main/java/org/gcube/spatial/data/sdi/LocalConfiguration.java
index 07f3dad..3a79e99 100644
--- a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/LocalConfiguration.java
+++ b/sdi-service/src/main/java/org/gcube/spatial/data/sdi/LocalConfiguration.java
@@ -3,7 +3,6 @@ package org.gcube.spatial.data.sdi;
import java.net.URL;
import java.util.Properties;
-import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@@ -78,19 +77,20 @@ public class LocalConfiguration {
static LocalConfiguration instance=null;
- @Synchronized
- public static LocalConfiguration init(URL propertiesURL){
- if(instance==null)
- instance=new LocalConfiguration(propertiesURL);
- return instance;
- }
+// @Synchronized
+// public static LocalConfiguration init(URL propertiesURL){
+// if(instance==null)
+// instance=new LocalConfiguration(propertiesURL);
+// return instance;
+// }
private Properties props=new Properties();
- private LocalConfiguration(URL propertiesURL) {
+ private LocalConfiguration() {
try{
+ String propertiesURL="/config.properties";
log.debug("Loading {} ",propertiesURL);
- props.load(propertiesURL.openStream());
+ props.load(new URL(propertiesURL).openStream());
}catch(Exception e){
throw new RuntimeException(e);
}
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/SDIService.java b/sdi-service/src/main/java/org/gcube/spatial/data/sdi/SDIService.java
index 006b600..2562148 100644
--- a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/SDIService.java
+++ b/sdi-service/src/main/java/org/gcube/spatial/data/sdi/SDIService.java
@@ -48,8 +48,8 @@ public class SDIService extends ResourceConfig{
ContainerConfiguration configuration=context.container().configuration();
try{
URL resourceUrl = context.application().getResource("/WEB-INF/config.properties");
- LocalConfiguration.init(resourceUrl).
- setTemplateConfigurationObject(ContextProvider.get());
+// LocalConfiguration.init(resourceUrl).
+ LocalConfiguration.setTemplateConfigurationObject(ContextProvider.get());
}catch(Throwable t){
log.debug("Listing available paths");
diff --git a/sdi-service/src/main/webapp/WEB-INF/config.properties b/sdi-service/src/main/resources/config.properties
similarity index 100%
rename from sdi-service/src/main/webapp/WEB-INF/config.properties
rename to sdi-service/src/main/resources/config.properties
diff --git a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/ConfigurationTest.java b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/ConfigurationTest.java
index 667307c..59bf80b 100644
--- a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/ConfigurationTest.java
+++ b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/ConfigurationTest.java
@@ -11,7 +11,7 @@ public class ConfigurationTest {
TokenSetter.set("/d4science.research-infrastructures.eu/gCubeApps/BiodiversityLab");
// TokenSetter.set("/gcube/devNext/NextNext");
- LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
+// LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
// SDIManagerImpl sdi=new SDIManagerImpl(new GeoNetworkManagerImpl(new RoleManagerImpl()),
// new ThreddsManagerFactory().provide(), new GISManagerImpl());
diff --git a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MainTest.java b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MainTest.java
index 6cf9b1d..6e80e09 100644
--- a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MainTest.java
+++ b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MainTest.java
@@ -21,10 +21,10 @@ import org.junit.Test;
public class MainTest extends JerseyTest implements GCubeSDITest{
- @BeforeClass
- public static void init() throws MalformedURLException {
- LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
- }
+// @BeforeClass
+// public static void init() throws MalformedURLException {
+// LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
+// }
@Override
diff --git a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MetadataApplicationTest.java b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MetadataApplicationTest.java
index 70537f1..0af4578 100644
--- a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MetadataApplicationTest.java
+++ b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/MetadataApplicationTest.java
@@ -1,21 +1,23 @@
package org.gcube.spatial.data.sdi.test;
+import static org.junit.Assume.assumeTrue;
+
import java.io.IOException;
import java.nio.file.Paths;
import javax.xml.transform.TransformerException;
-import org.gcube.spatial.data.sdi.LocalConfiguration;
-import org.gcube.spatial.data.sdi.engine.TemplateManager;
+import org.gcube.sdi.test.GCubeSDITest;
import org.gcube.spatial.data.sdi.engine.impl.metadata.MetadataTemplateManagerImpl;
import org.gcube.spatial.data.sdi.engine.impl.metadata.TemplateApplicationReport;
import org.gcube.spatial.data.sdi.model.metadata.TemplateInvocationBuilder;
import org.junit.Test;
-public class MetadataApplicationTest {
+public class MetadataApplicationTest implements GCubeSDITest{
@Test
public void apply() throws IOException, TransformerException{
+ assumeTrue(isTestInfrastructureEnabled());
TokenSetter.set("/gcube/devNext/NextNext");
MetadataTemplateManagerImpl manager=new MetadataTemplateManagerImpl();
// LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL())
diff --git a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/RegisterServiceTest.java b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/RegisterServiceTest.java
index dddb9ce..34a33af 100644
--- a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/RegisterServiceTest.java
+++ b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/RegisterServiceTest.java
@@ -21,7 +21,7 @@ public class RegisterServiceTest {
public static void main(String[] args) throws MalformedURLException, ServiceRegistrationException {
TokenSetter.set("/d4science.research-infrastructures.eu/gCubeApps/AlienAndInvasiveSpecies");
- LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
+// LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
// SDIManagerImpl sdi=new SDIManagerImpl(new GeoNetworkManagerImpl(new RoleManagerImpl()), new ThreddsManagerFactory().provide(), new GISManagerImpl());
//
diff --git a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestCreateCatalog.java b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestCreateCatalog.java
index 869f7fb..cdf4de4 100644
--- a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestCreateCatalog.java
+++ b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestCreateCatalog.java
@@ -14,7 +14,7 @@ public class TestCreateCatalog {
TokenSetter.set("/gcube/devNext");
- LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
+// LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
// ThreddsManager mng=new ThreddsManagerFactory().provide();
diff --git a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestIS.java b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestIS.java
index 8af76cd..096a7b5 100644
--- a/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestIS.java
+++ b/sdi-service/src/test/java/org/gcube/spatial/data/sdi/test/TestIS.java
@@ -12,7 +12,7 @@ public class TestIS {
public static void main(String[] args) throws MalformedURLException {
TokenSetter.set("/gcube/devNext/NextNext");
- LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
+// LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
ServiceEndpoint e=ISUtils.querySEById("8e1962e9-05a7-40d4-a56f-574431f4c907");
e.profile().description(e.profile().description()+"_modified");