From 62fff336de9be5c88a27099e4e0047b394ca939a Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 28 Jan 2020 10:38:36 +0100 Subject: [PATCH] Fixed tests --- .../gcube/informationsystem/ContextTest.java | 74 ++++++++----------- .../impl/properties/EncryptedTest.java | 2 +- 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/src/test/java/org/gcube/informationsystem/ContextTest.java b/src/test/java/org/gcube/informationsystem/ContextTest.java index cbdc991..6f4cb55 100644 --- a/src/test/java/org/gcube/informationsystem/ContextTest.java +++ b/src/test/java/org/gcube/informationsystem/ContextTest.java @@ -22,79 +22,67 @@ import org.slf4j.LoggerFactory; /** * @author Luca Frosini (ISTI - CNR) + * */ public class ContextTest { private static final Logger logger = LoggerFactory.getLogger(ContextTest.class); - protected static final String PROPERTIES_FILENAME = "token.properties"; + protected static Properties properties; + protected static final String PROPERTIES_FILENAME = "token.properties"; - private static final String GCUBE_VARNAME = "GCUBE"; - public static final String GCUBE; - - 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; - - - private static final String GCUBE_DEVNEXT_ANOTHER_USER_VARNAME = "GCUBE_DEVNEXT_ANOTHER_USER"; - public static final String GCUBE_DEVNEXT_ANOTHER_USER; - - public static final String DEFAULT_TEST_SCOPE; public static final String PARENT_DEFAULT_TEST_SCOPE; - public static final String DEFAULT_TEST_SCOPE_ANOTHER_USER; + public static final String DEFAULT_TEST_SCOPE; public static final String ALTERNATIVE_TEST_SCOPE; + public static final String DEFAULT_TEST_SCOPE_ANOTHER_USER; + static { - Properties properties = new Properties(); + properties = new Properties(); InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME); - + try { // load the properties file properties.load(input); - } catch (IOException e) { + } catch(IOException e) { throw new RuntimeException(e); } - GCUBE = properties.getProperty(GCUBE_VARNAME); - - 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_DEVNEXT_ANOTHER_USER = properties.getProperty(GCUBE_DEVNEXT_ANOTHER_USER_VARNAME); + // PARENT_DEFAULT_TEST_SCOPE = "/pred4s" + // DEFAULT_TEST_SCOPE_NAME = PARENT_DEFAULT_TEST_SCOPE + "/preprod"; + // ALTERNATIVE_TEST_SCOPE = DEFAULT_TEST_SCOPE_NAME + "/preVRE"; - DEFAULT_TEST_SCOPE = GCUBE_DEVNEXT; - PARENT_DEFAULT_TEST_SCOPE = GCUBE; + PARENT_DEFAULT_TEST_SCOPE = "/gcube"; + DEFAULT_TEST_SCOPE = PARENT_DEFAULT_TEST_SCOPE + "/devNext"; + ALTERNATIVE_TEST_SCOPE = DEFAULT_TEST_SCOPE + "/NextNext"; - DEFAULT_TEST_SCOPE_ANOTHER_USER = GCUBE_DEVNEXT_ANOTHER_USER; - ALTERNATIVE_TEST_SCOPE = GCUBE_DEVNEXT_NEXTNEXT; + DEFAULT_TEST_SCOPE_ANOTHER_USER = "lucio.lelii_" + DEFAULT_TEST_SCOPE; + try { + setContextByName(DEFAULT_TEST_SCOPE); + } catch(Exception e) { + throw new RuntimeException(e); + } } - public static String getCurrentScope(String token) throws ObjectNotFound, Exception{ + 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); + } - public static void setContext(String token) throws ObjectNotFound, Exception{ + 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); @@ -102,12 +90,12 @@ public class ContextTest { } @BeforeClass - public static void beforeClass() throws Exception{ - setContext(DEFAULT_TEST_SCOPE); + public static void beforeClass() throws Exception { + setContextByName(DEFAULT_TEST_SCOPE); } @AfterClass - public static void afterClass() throws Exception{ + public static void afterClass() throws Exception { SecurityTokenProvider.instance.reset(); ScopeProvider.instance.reset(); } diff --git a/src/test/java/org/gcube/informationsystem/impl/properties/EncryptedTest.java b/src/test/java/org/gcube/informationsystem/impl/properties/EncryptedTest.java index 603b9cd..b898222 100644 --- a/src/test/java/org/gcube/informationsystem/impl/properties/EncryptedTest.java +++ b/src/test/java/org/gcube/informationsystem/impl/properties/EncryptedTest.java @@ -88,7 +88,7 @@ public class EncryptedTest extends ContextTest { @Test public void decryptTest() throws Exception { - ContextTest.setContext(GCUBE_DEVSEC); + ContextTest.setContextByName(DEFAULT_TEST_SCOPE); String encryptedValue = "yFdK2wXAOLkNoKKx+gopzA=="; String decryptedValue = EncryptedImpl.decrypt(encryptedValue); logger.debug("Encrypted Value is : '{}' which decrypted is : '{}'", encryptedValue, decryptedValue);