From 908fe07fd553bee78fcc531f08dff4040947c6f4 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 14 Apr 2021 15:11:37 +0200 Subject: [PATCH] fixed merge --- CHANGELOG.md | 2 +- src/test/java/org/gcube/gcat/client/ContextTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfca6ae..91d7967 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for gCube Catalogue (gCat) Client + ## [v2.0.0-SNAPSHOT] - Changed service class - ## [v1.2.2] - Added count method for Item collection [#20627] diff --git a/src/test/java/org/gcube/gcat/client/ContextTest.java b/src/test/java/org/gcube/gcat/client/ContextTest.java index a1e2355..819a743 100644 --- a/src/test/java/org/gcube/gcat/client/ContextTest.java +++ b/src/test/java/org/gcube/gcat/client/ContextTest.java @@ -31,7 +31,7 @@ public class ContextTest { protected static final String GCAT_PROPERTIES_FILENAME = "gcat.properties"; public static final String GCAT_URL_PROPERTY = "GCAT_URL_PROPERTY"; - public static final String GCAT_URL; + public static String GCAT_URL; public static final String DEFAULT_TEST_CONTEXT_NAME; @@ -61,12 +61,12 @@ public class ContextTest { try { // load the properties file gcatProperties.load(input); - } catch (IOException e) { - throw new RuntimeException(e); + GCAT_URL = gcatProperties.getProperty(GCAT_URL_PROPERTY); + } catch (Exception e) { + // throw new RuntimeException(e); + GCAT_URL = null; } - GCAT_URL = gcatProperties.getProperty(GCAT_URL_PROPERTY); - if(GCAT_URL!=null){ try { GCatClientDiscovery.forceToURL(GCAT_URL);