From 450a131875691a9986dc234e7c0b786c142da10c Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 21 Dec 2020 23:10:21 +0100 Subject: [PATCH] Fixed tests to comply with fixed model --- .../publisher/ERManagementTest.java | 46 +++++++++++-------- .../publisher/MultiContextTest.java | 16 ++++--- .../publisher/SmartgearResourcesTest.java | 26 +++++------ 3 files changed, 51 insertions(+), 37 deletions(-) diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java index a642d30..5953d76 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java @@ -34,10 +34,11 @@ import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.LicenseFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.NetworkingFacetImpl; -import org.gcube.resourcemanagement.model.impl.entities.facets.ServiceStateFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.StateFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.EServiceImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl; +import org.gcube.resourcemanagement.model.impl.properties.ValueSchemaImpl; import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.ActivatesImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; @@ -45,11 +46,12 @@ import org.gcube.resourcemanagement.model.reference.entities.facets.CPUFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.EventFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.LicenseFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.NetworkingFacet; -import org.gcube.resourcemanagement.model.reference.entities.facets.ServiceStateFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.StateFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; import org.gcube.resourcemanagement.model.reference.entities.resources.GCubeResource; import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; +import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Activates; import org.junit.Assert; @@ -139,12 +141,14 @@ public class ERManagementTest extends ContextTest { EventFacet eventFacet = new EventFacetImpl(); eventFacet.setDate(Calendar.getInstance().getTime()); - eventFacet.setValue("Created"); + ValueSchema event = new ValueSchemaImpl(); + event.setValue("Created"); + eventFacet.setEvent(event); eService.addFacet(eventFacet); - ServiceStateFacet serviceStateFacet = new ServiceStateFacetImpl(); - serviceStateFacet.setValue("ready"); - eService.addFacet(serviceStateFacet); + StateFacet stateFacet = new StateFacetImpl(); + stateFacet.setValue("ready"); + eService.addFacet(stateFacet); LicenseFacet licenseFacet = new LicenseFacetImpl(); licenseFacet.setName("EUPL"); @@ -177,12 +181,14 @@ public class ERManagementTest extends ContextTest { EventFacet eventFacet = new EventFacetImpl(); eventFacet.setDate(Calendar.getInstance().getTime()); - eventFacet.setValue("Created"); + ValueSchema event = new ValueSchemaImpl(); + event.setValue("Created"); + eventFacet.setEvent(event); eService.addFacet(eventFacet); - ServiceStateFacet serviceStateFacet = new ServiceStateFacetImpl(); - serviceStateFacet.setValue("ready"); - eService.addFacet(serviceStateFacet); + StateFacet stateFacet = new StateFacetImpl(); + stateFacet.setValue("ready"); + eService.addFacet(stateFacet); LicenseFacet licenseFacet = new LicenseFacetImpl(); licenseFacet.setName("EUPL"); @@ -221,12 +227,14 @@ public class ERManagementTest extends ContextTest { EventFacet eventFacet = new EventFacetImpl(); eventFacet.setDate(Calendar.getInstance().getTime()); - eventFacet.setValue("Created"); + ValueSchema event = new ValueSchemaImpl(); + event.setValue("Created"); + eventFacet.setEvent(event); eService.addFacet(eventFacet); - ServiceStateFacet serviceStateFacet = new ServiceStateFacetImpl(); - serviceStateFacet.setValue("ready"); - eService.addFacet(serviceStateFacet); + StateFacet stateFacet = new StateFacetImpl(); + stateFacet.setValue("ready"); + eService.addFacet(stateFacet); LicenseFacet licenseFacet = new LicenseFacetImpl(); licenseFacet.setName("EUPL"); @@ -263,12 +271,14 @@ public class ERManagementTest extends ContextTest { EventFacet eventFacet = new EventFacetImpl(); eventFacet.setDate(Calendar.getInstance().getTime()); - eventFacet.setValue("Created"); + ValueSchema event = new ValueSchemaImpl(); + event.setValue("Created"); + eventFacet.setEvent(event); eService.addFacet(eventFacet); - ServiceStateFacet serviceStateFacet = new ServiceStateFacetImpl(); - serviceStateFacet.setValue("ready"); - eService.addFacet(serviceStateFacet); + StateFacet stateFacet = new StateFacetImpl(); + stateFacet.setValue("ready"); + eService.addFacet(stateFacet); LicenseFacet licenseFacet = new LicenseFacetImpl(); licenseFacet.setName("EUPL"); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java index f4f4108..e8ef6f8 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java @@ -25,10 +25,11 @@ import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.LicenseFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.MemoryFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.NetworkingFacetImpl; -import org.gcube.resourcemanagement.model.impl.entities.facets.ServiceStateFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.StateFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.EServiceImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl; +import org.gcube.resourcemanagement.model.impl.properties.ValueSchemaImpl; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasPersistentMemoryImpl; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasVolatileMemoryImpl; import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl; @@ -40,10 +41,11 @@ import org.gcube.resourcemanagement.model.reference.entities.facets.LicenseFacet import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet.MemoryUnit; import org.gcube.resourcemanagement.model.reference.entities.facets.NetworkingFacet; -import org.gcube.resourcemanagement.model.reference.entities.facets.ServiceStateFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.StateFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; +import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPersistentMemory; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; @@ -89,12 +91,14 @@ public class MultiContextTest extends ContextTest { EventFacet eventFacet = new EventFacetImpl(); eventFacet.setDate(Calendar.getInstance().getTime()); - eventFacet.setValue("Created"); + ValueSchema event = new ValueSchemaImpl(); + event.setValue("Created"); + eventFacet.setEvent(event); eService.addFacet(eventFacet); - ServiceStateFacet serviceStateFacet = new ServiceStateFacetImpl(); - serviceStateFacet.setValue("ready"); - eService.addFacet(serviceStateFacet); + StateFacet stateFacet = new StateFacetImpl(); + stateFacet.setValue("ready"); + eService.addFacet(stateFacet); LicenseFacet licenseFacet = new LicenseFacetImpl(); licenseFacet.setName("EUPL"); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java index 2b4b3b1..14306e8 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java @@ -40,22 +40,22 @@ import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.utils.ElementMapper; import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl; -import org.gcube.resourcemanagement.model.impl.entities.facets.ContainerStateFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.MemoryFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.NetworkingFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.SimplePropertyFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.StateFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasPersistentMemoryImpl; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasVolatileMemoryImpl; import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.CPUFacet; -import org.gcube.resourcemanagement.model.reference.entities.facets.ContainerStateFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet.MemoryUnit; import org.gcube.resourcemanagement.model.reference.entities.facets.NetworkingFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.SimplePropertyFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.StateFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPersistentMemory; @@ -133,7 +133,7 @@ public class SmartgearResourcesTest extends ContextTest { try { networkingFacet.setIPAddress(InetAddress.getLocalHost().getHostAddress()); } catch (UnknownHostException e) { - logger.warn("unable to detect the IP address of the host"); + logger.warn("unable to detect the IP addregetStateFacetss of the host"); } networkingFacet.setHostName("pc-frosini.isti.cnr.it"); networkingFacet.setDomainName(getDomain(networkingFacet.getHostName())); @@ -160,8 +160,8 @@ public class SmartgearResourcesTest extends ContextTest { SimplePropertyFacet simplePropertyFacet = addEnvironmentVariables(); hostingNode.addFacet(simplePropertyFacet); - ContainerStateFacet containerStateFacet = getContainerStateFacet(null); - hostingNode.addFacet(containerStateFacet); + StateFacet stateFacet = getStateFacet(null); + hostingNode.addFacet(stateFacet); MemoryFacet ramFacet = getRamInfo(null); @@ -190,9 +190,9 @@ public class SmartgearResourcesTest extends ContextTest { List> consistsOfList = hostingNodeToUpdate.getConsistsOf(); for(ConsistsOf c : consistsOfList){ - if(c.getTarget() instanceof ContainerStateFacet){ - containerStateFacet = (ContainerStateFacet) c.getTarget(); - containerStateFacet = getContainerStateFacet(containerStateFacet); + if(c.getTarget() instanceof StateFacet){ + stateFacet = (StateFacet) c.getTarget(); + stateFacet = getStateFacet(stateFacet); continue; } @@ -235,12 +235,12 @@ public class SmartgearResourcesTest extends ContextTest { - private ContainerStateFacet getContainerStateFacet(ContainerStateFacet containerStateFacet){ - if(containerStateFacet == null){ - containerStateFacet = new ContainerStateFacetImpl(); + private StateFacet getStateFacet(StateFacet stateFacet){ + if(stateFacet == null){ + stateFacet = new StateFacetImpl(); } - containerStateFacet.setValue("ready"); - return containerStateFacet; + stateFacet.setValue("ready"); + return stateFacet; } public static final String MESSAGE = "message";