From ee6da1b05788cf95b14ba57af85059942eea2bd1 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 5 Feb 2020 16:16:38 +0100 Subject: [PATCH] Fixing tests --- .../resourceregistry/client/ContextTest.java | 20 +++++++++++++++++++ src/test/resources/.gitignore | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java index 9e5a7fd..49f2236 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java @@ -37,6 +37,10 @@ public class ContextTest { public static final String DEFAULT_TEST_SCOPE_ANOTHER_USER; + protected static final String REGISTRY_PROPERTIES_FILENAME = "registry.properties"; + public static final String RESOURCE_REGISTRY_URL_PROPERTY = "RESOURCE_REGISTRY_URL"; + public static final String RESOURCE_REGISTRY_URL; + static { properties = new Properties(); InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME); @@ -64,6 +68,22 @@ public class ContextTest { } catch(Exception e) { throw new RuntimeException(e); } + + + Properties registryProperties = new Properties(); + input = ContextTest.class.getClassLoader().getResourceAsStream(REGISTRY_PROPERTIES_FILENAME); + try { + // load the properties file + registryProperties.load(input); + } catch (IOException e) { + throw new RuntimeException(e); + } + + RESOURCE_REGISTRY_URL = registryProperties.getProperty(RESOURCE_REGISTRY_URL_PROPERTY); + + if(RESOURCE_REGISTRY_URL!=null){ + ResourceRegistryClientFactory.forceToURL(RESOURCE_REGISTRY_URL); + } } public static String getCurrentScope(String token) throws ObjectNotFound, Exception { diff --git a/src/test/resources/.gitignore b/src/test/resources/.gitignore index 22f985a..ad6d3a6 100644 --- a/src/test/resources/.gitignore +++ b/src/test/resources/.gitignore @@ -2,3 +2,7 @@ /devsec.gcubekey /gcube.gcubekey /token.properties +/registry.properties +/registry.properties.empty +/registry.properties.redirect-test +/registry.properties.test