diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 339a466..70bc908 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -35,7 +35,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java index 963ae57..d0203d8 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java @@ -1,6 +1,7 @@ package org.gcube.application.geoportal.service; import org.gcube.application.geoportal.common.rest.InterfaceConstants; +import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.profiledDocuments.AbstractProfiledDocumentsTests; import org.junit.Test; @@ -8,6 +9,7 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeTrue; public class InexistentUseCaseDescriptorTests extends AbstractProfiledDocumentsTests { @@ -20,6 +22,7 @@ public class InexistentUseCaseDescriptorTests extends AbstractProfiledDocumentsT // GET @Test public void testMissingProfile(){ + assumeTrue(GCubeTest.isTestInfrastructureEnabled()); Response resp = target(InterfaceConstants.Methods.PROJECTS) .path("non-existent-useCaseDescriptor").request().get(); assertEquals(404,resp.getStatus()); diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java index 9f62777..52104b0 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java @@ -41,6 +41,7 @@ public class LockTests extends BasicServiceTestUnit { @Test public void testLocking() throws StepException, EventException, IOException, ProjectLockedException, ProjectNotFoundException, InvalidLockException { + assumeTrue(GCubeTest.isTestInfrastructureEnabled()); Project p = manager.registerNew(new Document("dummyField","dummyValue")); // lock p= manager.lock(p.getId(),"Testing"); @@ -77,6 +78,7 @@ public class LockTests extends BasicServiceTestUnit { @Test public void testUnlock() throws StepException, EventException, IOException, ProjectNotFoundException, ProjectLockedException, InvalidLockException, DeletionException, ConfigurationException, StorageHubException, StorageException { + assumeTrue(GCubeTest.isTestInfrastructureEnabled()); MongoManagerI managerInterface = manager; // create Project p = managerInterface.registerNew(new Document("dummyField","dummyValue")); diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java index 205aab7..cd2fff0 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java @@ -37,7 +37,7 @@ public class DummyProjectTest extends AbstractProfiledDocumentsTests{ @Test public void registerNew() throws Exception { - + assumeTrue(GCubeTest.isTestInfrastructureEnabled()); Project doc = createNew(new Document("field","value")); assertTrue(doc.getTheDocument().containsKey("field")); @@ -47,6 +47,7 @@ public class DummyProjectTest extends AbstractProfiledDocumentsTests{ @Test public void edit() throws Exception { + assumeTrue(GCubeTest.isTestInfrastructureEnabled()); Project doc=createNew(new Document()); String beforeJson=doc.getTheDocument().toJson(); doc.getTheDocument().put("someStrangeField","someOtherRandomValue"); @@ -59,7 +60,7 @@ public class DummyProjectTest extends AbstractProfiledDocumentsTests{ @Test public void testUploadFileSet() throws Exception { - + assumeTrue(GCubeTest.isTestInfrastructureEnabled()); Document baseDoc=new Document(); baseDoc.put("relazioneScavo",new Document("title","My Title")); diff --git a/pom.xml b/pom.xml index 05724bf..9ec03f0 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,20 @@ 3.0.1 distro https://code-repo.d4science.org/gCubeSystem + + + + + + 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT + 3.7.0-SNAPSHOT + [2.0.0,3.0.0-SNAPSHOT) + @@ -71,7 +85,7 @@ org.gcube.distribution gcube-bom - 2.0.2 + ${gcube-bom-version} pom import @@ -79,7 +93,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + ${gcube-smartgears-bom-version} pom import @@ -206,7 +220,7 @@ org.gcube.common storagehub-client-library - [1.0.0,2.0.0-SNAPSHOT) + ${storagehub-version-range}