From 2bb92c44e69d2b50704dd3aece10f046ec58cb7f Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 12 Jan 2017 11:44:50 +0000 Subject: [PATCH] Fixing test git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-publisher@141524 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../publisher/EntityManagementTest.java | 18 +++--------------- .../publisher/MultiContextTest.java | 6 ++++-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java index 577647a..93b962b 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java @@ -148,17 +148,6 @@ public class EntityManagementTest extends ScopedTest { boolean deleted = resourceRegistryPublisher.deleteResource(createdHostingNode); Assert.assertTrue(deleted); - deleted = resourceRegistryPublisher.deleteFacet(createdCPUFacet); - Assert.assertTrue(deleted); - - deleted = resourceRegistryPublisher.deleteFacet(createdNetworkingFacet); - Assert.assertTrue(deleted); - - - deleted = resourceRegistryPublisher.deleteFacet(createdSoftwareFacet); - Assert.assertTrue(deleted); - - deleted = resourceRegistryPublisher.deleteResource(createdEService); Assert.assertTrue(deleted); @@ -203,16 +192,15 @@ public class EntityManagementTest extends ScopedTest { Assert.assertTrue(deleted); - deleted = resourceRegistryPublisher.deleteFacet(createdCpuFacet); - Assert.assertTrue(deleted); - - deleted = resourceRegistryPublisher.deleteIsRelatedTo(createdHosts); Assert.assertTrue(deleted); deleted = resourceRegistryPublisher.deleteResource(createdHostingNode); Assert.assertTrue(deleted); + + deleted = resourceRegistryPublisher.deleteResource(createdEService); + Assert.assertTrue(deleted); } 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 7b8179a..d53a2ac 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java @@ -159,13 +159,15 @@ public class MultiContextTest extends ScopedTest { } - /* boolean deleted = resourceRegistryPublisher.deleteResource(createdHN); Assert.assertTrue(deleted); + + logger.debug("Restoring original scope"); + ScopedTest.setContext(ScopedTest.DEFAULT_TEST_SCOPE); + deleted = resourceRegistryPublisher.deleteResource(createEService); Assert.assertTrue(deleted); - */ }