From 7262298e9881782e51d60086a11776d2156a2bc5 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 3 Apr 2020 17:44:08 +0200 Subject: [PATCH] Fixing plugin --- .classpath | 2 +- .settings/.gitignore | 3 + pom.xml | 8 +- .../sweeper/ContextTest.java | 106 ++++++++++++++++++ .../sweeper/ISSweeperPluginTest.java | 16 +-- .../informationsystem/sweeper/ScopedTest.java | 96 ---------------- src/test/resources/.gitignore | 1 + 7 files changed, 122 insertions(+), 110 deletions(-) create mode 100644 .settings/.gitignore create mode 100644 src/test/java/org/gcube/informationsystem/sweeper/ContextTest.java delete mode 100644 src/test/java/org/gcube/informationsystem/sweeper/ScopedTest.java create mode 100644 src/test/resources/.gitignore diff --git a/.classpath b/.classpath index 9d886d5..ace8266 100644 --- a/.classpath +++ b/.classpath @@ -27,7 +27,7 @@ - + diff --git a/.settings/.gitignore b/.settings/.gitignore new file mode 100644 index 0000000..1de83a6 --- /dev/null +++ b/.settings/.gitignore @@ -0,0 +1,3 @@ +/org.eclipse.core.resources.prefs +/org.eclipse.jdt.core.prefs +/org.eclipse.m2e.core.prefs diff --git a/pom.xml b/pom.xml index c288bbb..c5fae3f 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ - org.gcube.distribution - gcube-bom - LATEST + org.gcube.vremanagement + smart-executor-bom + 1.0.0 pom import @@ -42,7 +42,6 @@ org.gcube.vremanagement smart-executor-api - [1.5.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided @@ -80,7 +79,6 @@ ch.qos.logback logback-classic - 1.0.13 test diff --git a/src/test/java/org/gcube/informationsystem/sweeper/ContextTest.java b/src/test/java/org/gcube/informationsystem/sweeper/ContextTest.java new file mode 100644 index 0000000..7067eba --- /dev/null +++ b/src/test/java/org/gcube/informationsystem/sweeper/ContextTest.java @@ -0,0 +1,106 @@ +/** + * + */ +package org.gcube.informationsystem.sweeper; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +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.AuthorizationProvider; +import org.gcube.common.authorization.library.provider.ClientInfo; +import org.gcube.common.authorization.library.provider.SecurityTokenProvider; +import org.gcube.common.authorization.library.utils.Caller; +import org.gcube.common.scope.api.ScopeProvider; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * @author Luca Frosini (ISTI - CNR) + * + */ +public class ContextTest { + + private static final Logger logger = LoggerFactory.getLogger(ContextTest.class); + + protected static Properties properties; + protected static final String PROPERTIES_FILENAME = "token.properties"; + + public static final String ROOT_TEST_CONTEXT; + public static final String VO_DEFAULT_CONTEXT; + public static final String VRE_DEFAULT_CONTEXT; + public static final String VO_ALTERNATIVE_CONTEXT; + public static final String VRE_ALTERNATIVE_CONTEXT; + + static { + properties = new Properties(); + InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME); + + try { + // load the properties file + properties.load(input); + } catch(IOException e) { + throw new RuntimeException(e); + } + + // PARENT_DEFAULT_TEST_SCOPE = "/pred4s" + // DEFAULT_TEST_SCOPE_NAME = PARENT_DEFAULT_TEST_SCOPE + "/preprod"; + // ALTERNATIVE_TEST_SCOPE = DEFAULT_TEST_SCOPE_NAME + "/preVRE"; + + + ROOT_TEST_CONTEXT = "/gcube"; + VO_DEFAULT_CONTEXT = ROOT_TEST_CONTEXT + "/devNext"; + VRE_DEFAULT_CONTEXT = VO_DEFAULT_CONTEXT + "/NextNext"; + + VO_ALTERNATIVE_CONTEXT = ROOT_TEST_CONTEXT + "/devsec"; + VRE_ALTERNATIVE_CONTEXT = VO_ALTERNATIVE_CONTEXT + "/devVRE"; + + try { + setContextByName(VRE_DEFAULT_CONTEXT); + } catch(Exception e) { + throw new RuntimeException(e); + } + + + } + + public static String getCurrentScope(String token) throws ObjectNotFound, Exception { + AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); + String context = authorizationEntry.getContext(); + logger.info("Context of token {} is {}", token, context); + return context; + } + + public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception { + String token = ContextTest.properties.getProperty(fullContextName); + setContext(token); + } + + private static void setContext(String token) throws ObjectNotFound, Exception { + SecurityTokenProvider.instance.set(token); + AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); + ClientInfo clientInfo = authorizationEntry.getClientInfo(); + logger.debug("User : {} - Type : {}", clientInfo.getId(), clientInfo.getType().name()); + String qualifier = authorizationEntry.getQualifier(); + Caller caller = new Caller(clientInfo, qualifier); + AuthorizationProvider.instance.set(caller); + ScopeProvider.instance.set(getCurrentScope(token)); + } + + @BeforeClass + public static void beforeClass() throws Exception { + setContextByName(VO_DEFAULT_CONTEXT); + } + + @AfterClass + public static void afterClass() throws Exception { + SecurityTokenProvider.instance.reset(); + ScopeProvider.instance.reset(); + } + +} diff --git a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java index e55f402..8970dbe 100644 --- a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java +++ b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java @@ -15,17 +15,17 @@ public class ISSweeperPluginTest { @Test public void testLaunch() throws ObjectNotFound, Exception{ - String[] tokens = { - ScopedTest.GCUBE_DEVNEXT_NEXTNEXT, - ScopedTest.GCUBE_DEVSEC_DEVVRE, - ScopedTest.GCUBE_DEVNEXT, - ScopedTest.GCUBE_DEVSEC, - ScopedTest.GCUBE + String[] contexts = { + ContextTest.VRE_ALTERNATIVE_CONTEXT, + ContextTest.VRE_DEFAULT_CONTEXT, + ContextTest.VO_ALTERNATIVE_CONTEXT, + ContextTest.VO_DEFAULT_CONTEXT, + ContextTest.ROOT_TEST_CONTEXT }; - for(String token : tokens){ + for(String context : contexts){ logger.info("\n\n\n-------------------------------------------------------------------------"); - ScopedTest.setContext(token); + ContextTest.setContextByName(context); try{ Map inputs = new HashMap(); inputs.put(ISSweeperPlugin.EXPIRING_MINUTES_TIMEOUT, 30); diff --git a/src/test/java/org/gcube/informationsystem/sweeper/ScopedTest.java b/src/test/java/org/gcube/informationsystem/sweeper/ScopedTest.java deleted file mode 100644 index 6828ee7..0000000 --- a/src/test/java/org/gcube/informationsystem/sweeper/ScopedTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * - */ -package org.gcube.informationsystem.sweeper; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -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; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Luca Frosini (ISTI - CNR) - * - */ -public class ScopedTest { - - private static final Logger logger = LoggerFactory.getLogger(ScopedTest.class); - - protected static final String PROPERTIES_FILENAME = "token.properties"; - - private static final String GCUBE_DEVNEXT_VARNAME = "GCUBE_DEVNEXT"; - public static final String GCUBE_DEVNEXT; - - private static final String GCUBE_DEVNEXT_NEXTNEXT_VARNAME = "GCUBE_DEVNEXT_NEXTNEXT"; - public static final String GCUBE_DEVNEXT_NEXTNEXT; - - public static final String GCUBE_DEVSEC_VARNAME = "GCUBE_DEVSEC"; - public static final String GCUBE_DEVSEC; - - public static final String GCUBE_DEVSEC_DEVVRE_VARNAME = "GCUBE_DEVSEC_DEVVRE"; - public static final String GCUBE_DEVSEC_DEVVRE; - - public static final String GCUBE_VARNAME = "GCUBE"; - public static final String GCUBE; - - public static final String DEFAULT_TEST_SCOPE; - public static final String ALTERNATIVE_TEST_SCOPE; - - static { - Properties properties = new Properties(); - InputStream input = ScopedTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME); - - try { - // load the properties file - properties.load(input); - } catch (IOException e) { - throw new RuntimeException(e); - } - - GCUBE_DEVNEXT = properties.getProperty(GCUBE_DEVNEXT_VARNAME); - GCUBE_DEVNEXT_NEXTNEXT = properties.getProperty(GCUBE_DEVNEXT_NEXTNEXT_VARNAME); - - GCUBE_DEVSEC = properties.getProperty(GCUBE_DEVSEC_VARNAME); - GCUBE_DEVSEC_DEVVRE = properties.getProperty(GCUBE_DEVSEC_DEVVRE_VARNAME); - - GCUBE = properties.getProperty(GCUBE_VARNAME); - - DEFAULT_TEST_SCOPE = GCUBE_DEVSEC; - ALTERNATIVE_TEST_SCOPE = GCUBE_DEVSEC_DEVVRE; - - } - - public static String getCurrentScope(String token) throws ObjectNotFound, Exception{ - AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); - String context = authorizationEntry.getContext(); - logger.info("Context of token {} is {}", token, context); - return context; - } - - - public static void setContext(String token) throws ObjectNotFound, Exception{ - SecurityTokenProvider.instance.set(token); - ScopeProvider.instance.set(getCurrentScope(token)); - } - - @BeforeClass - public static void beforeClass() throws Exception{ - setContext(DEFAULT_TEST_SCOPE); - } - - @AfterClass - public static void afterClass() throws Exception{ - SecurityTokenProvider.instance.reset(); - ScopeProvider.instance.reset(); - } - -} diff --git a/src/test/resources/.gitignore b/src/test/resources/.gitignore new file mode 100644 index 0000000..a8e4366 --- /dev/null +++ b/src/test/resources/.gitignore @@ -0,0 +1 @@ +/token.properties