From 8ebad38cae1e143045558721ef8ff12375d002d3 Mon Sep 17 00:00:00 2001 From: "manuele.simi" Date: Mon, 25 Feb 2019 03:54:52 +0000 Subject: [PATCH] Improve tests on ResourceRegistryContextClient. Advance JUnit to 4.12. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/resource-management/resource-manager@177251 82a268e6-3cf1-43bd-a215-b396298e98cf --- webapp/pom.xml | 3 ++- .../manager/webapp/context/Queries.java | 19 ++++++++++++------- .../manager/webapp/context/GXRestTest.java | 6 +++--- .../manager/webapp/context/QueriesTest.java | 7 +++---- .../manager/webapp/context/RMContextTest.java | 6 +++--- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/webapp/pom.xml b/webapp/pom.xml index 374d1fb..32aa3ab 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -140,10 +140,11 @@ + junit junit - 4.11 + 4.12 test diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java index b45f0aa..e5472a9 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java @@ -1,10 +1,12 @@ package org.gcube.resourcemanagement.manager.webapp.context; +import java.util.Objects; import java.util.UUID; import org.gcube.informationsystem.model.reference.entities.Context; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory; import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient; @@ -42,18 +44,21 @@ final class Queries { } /** - * Tests if the given context exists + * Returns {@code true} if the provided context exists + * otherwise returns {@code false}. * * @param context - * @return - */ + * @return {@code true} if the provided context exists + * otherwise {@code false} + * */ protected boolean contextExists(UUID context) { try { - return this.cclient.read(context) != null; - } catch (ResourceRegistryException e) { - logger.warn("Failed to query the Resource Registry: " + e.getMessage()); + Context results = this.cclient.read(context); + return Objects.nonNull(results); + } catch (ContextNotFoundException e) { + logger.warn("Context not found: " + e.getMessage()); return false; - }catch (RuntimeException e) { + } catch (Exception e) { logger.warn("Failed to query the Resource Registry: " + e.getMessage()); return false; } diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java index b775027..a989b17 100644 --- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java +++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java @@ -81,7 +81,7 @@ public class GXRestTest extends JerseyTest { setContext(DEFAULT_TEST_SCOPE); } - public static void setContext(String token) throws ObjectNotFound, Exception { + public static void setContext(String token) throws Exception { if (DEFAULT_TEST_SCOPE.isEmpty()) { skipTest = true; return; @@ -90,14 +90,14 @@ public class GXRestTest extends JerseyTest { ScopeProvider.instance.set(getCurrentScope(token)); } - public static String getCurrentScope(String token) throws ObjectNotFound, Exception { + public static String getCurrentScope(String token) throws Exception { AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); String context = authorizationEntry.getContext(); return context; } @AfterClass - public static void afterClass() throws Exception { + public static void afterClass() { SecurityTokenProvider.instance.reset(); ScopeProvider.instance.reset(); } diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java index aacd9c1..20ec2b0 100644 --- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java +++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java @@ -8,7 +8,6 @@ import java.util.Properties; import java.util.UUID; import org.gcube.common.authorization.client.Constants; -import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; @@ -68,7 +67,7 @@ public class QueriesTest { setContext(DEFAULT_TEST_SCOPE); } - public static void setContext(String token) throws ObjectNotFound, Exception { + public static void setContext(String token) throws Exception { if (DEFAULT_TEST_SCOPE.isEmpty()) { skipTest = true; return; @@ -77,14 +76,14 @@ public class QueriesTest { ScopeProvider.instance.set(getCurrentScope(token)); } - public static String getCurrentScope(String token) throws ObjectNotFound, Exception { + public static String getCurrentScope(String token) throws Exception { AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); String context = authorizationEntry.getContext(); return context; } @AfterClass - public static void afterClass() throws Exception { + public static void afterClass() { SecurityTokenProvider.instance.reset(); ScopeProvider.instance.reset(); } diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java index b858b17..9eb7d1e 100644 --- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java +++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java @@ -99,7 +99,7 @@ public class RMContextTest extends JerseyTest { setContext(DEFAULT_TEST_SCOPE); } - public static void setContext(String token) throws ObjectNotFound, Exception { + static void setContext(String token) throws Exception { if (DEFAULT_TEST_SCOPE.isEmpty()) { skipTest = true; return; @@ -108,14 +108,14 @@ public class RMContextTest extends JerseyTest { ScopeProvider.instance.set(getCurrentScope(token)); } - public static String getCurrentScope(String token) throws ObjectNotFound, Exception { + static String getCurrentScope(String token) throws Exception { AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); String context = authorizationEntry.getContext(); return context; } @AfterClass - public static void afterClass() throws Exception { + public static void afterClass() { SecurityTokenProvider.instance.reset(); ScopeProvider.instance.reset(); }