From 580108932576495fd7f7f275b9eb645431c42969 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 8 Mar 2021 09:38:37 +0100 Subject: [PATCH] Reorganizing tests --- .../contexts/ContextManagementTest.java | 2 +- .../model/entity/ResourceManagementTest.java | 1 + .../multicontext/AnotherEnhancedTest.java | 78 ------------------- .../instances/multicontext/RuleTest.java | 1 - .../tobereviewed/AnotherEnhancedTest.java | 61 +++++++++++++++ .../FacetManagementTest.java | 2 +- 6 files changed, 64 insertions(+), 81 deletions(-) delete mode 100644 src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AnotherEnhancedTest.java create mode 100644 src/test/java/org/gcube/informationsystem/resourceregistry/tobereviewed/AnotherEnhancedTest.java rename src/test/java/org/gcube/informationsystem/resourceregistry/{instances/model/entity => tobereviewed}/FacetManagementTest.java (99%) diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java index c39f341..d810092 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java @@ -21,7 +21,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.security.ContextSec import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.SecurityType; -import org.gcube.informationsystem.resourceregistry.instances.model.entity.FacetManagementTest; +import org.gcube.informationsystem.resourceregistry.tobereviewed.FacetManagementTest; import org.gcube.informationsystem.utils.ElementMapper; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java index 6352562..0e319e4 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java @@ -21,6 +21,7 @@ import org.gcube.informationsystem.resourceregistry.api.utils.Utility; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; +import org.gcube.informationsystem.resourceregistry.tobereviewed.FacetManagementTest; import org.gcube.informationsystem.utils.ElementMapper; import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AnotherEnhancedTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AnotherEnhancedTest.java deleted file mode 100644 index fb0089d..0000000 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AnotherEnhancedTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * - */ -package org.gcube.informationsystem.resourceregistry.instances.multicontext; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import org.gcube.com.fasterxml.jackson.databind.JsonNode; -import org.gcube.informationsystem.model.reference.entities.Facet; -import org.gcube.informationsystem.resourceregistry.ContextTest; -import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; -import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; -import org.gcube.informationsystem.resourceregistry.instances.ERManagementTest; -import org.gcube.informationsystem.resourceregistry.instances.model.ERManagementUtility; -import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; -import org.gcube.informationsystem.utils.ElementMapper; -import org.gcube.resourcemanagement.model.reference.entities.resources.EService; -import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public class AnotherEnhancedTest extends MultiContextTest { - - private static Logger logger = LoggerFactory - .getLogger(AnotherEnhancedTest.class); - - @Test - public void testNoFollows() throws Exception { - ContextTest.setContextByName(DEFAULT_TEST_SCOPE); - - EService eService = ERManagementTest.instantiateValidEService(); - - ResourceManagement resourceManagement = new ResourceManagement(); - resourceManagement.setElementType(EService.NAME); - resourceManagement.setJson(ElementMapper.marshal(eService)); - - String json = resourceManagement.create(); - logger.debug("Created : {}", json); - eService = ElementMapper.unmarshal(EService.class, json); - logger.debug("Unmarshalled {} {}", EService.NAME, eService); - - JsonNode jsonNode = ElementMapper.getObjectMapper().readTree(json); - - Map expectedInstances = new HashMap<>(); - expectedInstances.put(eService.getHeader().getUUID(), jsonNode); - - UUID contextUUID = ContextUtility.getInstance().getSecurityContextByFullName(ALTERNATIVE_TEST_SCOPE).getUUID(); - - try { - ERManagementUtility.addToContextNoPropagationConstraint(expectedInstances, contextUUID, true); - }catch (ResourceRegistryException e) { - logger.debug("As expected {}", e.getMessage()); - } - - @SuppressWarnings("unchecked") - IsIdentifiedBy gotIsIdentifiedBy = (IsIdentifiedBy) eService.getConsistsOf(IsIdentifiedBy.class).get(0); - - JsonNode gotIsIdentifiedByJsonNode = ElementMapper.getObjectMapper().readTree(ElementMapper.marshal(gotIsIdentifiedBy)); - expectedInstances.put(gotIsIdentifiedBy.getHeader().getUUID(), gotIsIdentifiedByJsonNode); - - try { - ERManagementUtility.addToContextNoPropagationConstraint(expectedInstances, contextUUID, true); - }catch (ResourceRegistryException e) { - // as expected - logger.debug("As expected {}", e.getMessage()); - }finally { - resourceManagement.delete(); - } - - } - -} diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java index 65a5b6d..d60e059 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java @@ -3,7 +3,6 @@ package org.gcube.informationsystem.resourceregistry.instances.multicontext; import java.util.UUID; import org.gcube.informationsystem.resourceregistry.ContextTest; -import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.instances.ERManagementTest; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/tobereviewed/AnotherEnhancedTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/tobereviewed/AnotherEnhancedTest.java new file mode 100644 index 0000000..47a4c00 --- /dev/null +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/tobereviewed/AnotherEnhancedTest.java @@ -0,0 +1,61 @@ +/** + * + */ +package org.gcube.informationsystem.resourceregistry.tobereviewed; + +import org.gcube.informationsystem.resourceregistry.instances.multicontext.MultiContextTest; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public class AnotherEnhancedTest extends MultiContextTest { + +// private static Logger logger = LoggerFactory +// .getLogger(AnotherEnhancedTest.class); +// +// @Test +// public void testNoFollows() throws Exception { +// ContextTest.setContextByName(DEFAULT_TEST_SCOPE); +// +// EService eService = ERManagementTest.instantiateValidEService(); +// +// ResourceManagement resourceManagement = new ResourceManagement(); +// resourceManagement.setElementType(EService.NAME); +// resourceManagement.setJson(ElementMapper.marshal(eService)); +// +// String json = resourceManagement.create(); +// logger.debug("Created : {}", json); +// eService = ElementMapper.unmarshal(EService.class, json); +// logger.debug("Unmarshalled {} {}", EService.NAME, eService); +// +// JsonNode jsonNode = ElementMapper.getObjectMapper().readTree(json); +// +// Map expectedInstances = new HashMap<>(); +// expectedInstances.put(eService.getHeader().getUUID(), jsonNode); +// +// UUID contextUUID = ContextUtility.getInstance().getSecurityContextByFullName(ALTERNATIVE_TEST_SCOPE).getUUID(); +// +// try { +// ERManagementUtility.addToContextNoPropagationConstraint(expectedInstances, contextUUID, true); +// }catch (ResourceRegistryException e) { +// logger.debug("As expected {}", e.getMessage()); +// } +// +// @SuppressWarnings("unchecked") +// IsIdentifiedBy gotIsIdentifiedBy = (IsIdentifiedBy) eService.getConsistsOf(IsIdentifiedBy.class).get(0); +// +// JsonNode gotIsIdentifiedByJsonNode = ElementMapper.getObjectMapper().readTree(ElementMapper.marshal(gotIsIdentifiedBy)); +// expectedInstances.put(gotIsIdentifiedBy.getHeader().getUUID(), gotIsIdentifiedByJsonNode); +// +// try { +// ERManagementUtility.addToContextNoPropagationConstraint(expectedInstances, contextUUID, true); +// }catch (ResourceRegistryException e) { +// // as expected +// logger.debug("As expected {}", e.getMessage()); +// }finally { +// resourceManagement.delete(); +// } +// +// } + +} diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/FacetManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/tobereviewed/FacetManagementTest.java similarity index 99% rename from src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/FacetManagementTest.java rename to src/test/java/org/gcube/informationsystem/resourceregistry/tobereviewed/FacetManagementTest.java index 7f43f91..8ede4e5 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/FacetManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/tobereviewed/FacetManagementTest.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.model.entity; +package org.gcube.informationsystem.resourceregistry.tobereviewed; import java.util.UUID;