From 2734389b421f3db538fc2f886fee9acd4df8f89f Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 13 Feb 2019 11:25:56 +0000
Subject: [PATCH] Fixing tests

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/resource-registry-database-creator@177102 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../resourceregistry/context/ContextCreator.java            | 2 +-
 .../resourceregistry/{ScopedTest.java => ContextTest.java}  | 6 +++---
 .../informationsystem/resourceregistry/DataBaseCreator.java | 2 +-
 .../resourceregistry/context/ContextManagementTest.java     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/test/java/org/gcube/informationsystem/resourceregistry/{ScopedTest.java => ContextTest.java} (92%)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
index f51ddd4..77d77ca 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
@@ -32,7 +32,7 @@ public class ContextCreator extends ContextElaborator {
 	
 	protected Context create(Context context) throws ResourceRegistryException, IOException {
 		ContextManagement contextManagement = new ContextManagement();
-		contextManagement.setJSON(ISMapper.marshal(context));
+		contextManagement.setJson(ISMapper.marshal(context));
 		String contextString = contextManagement.create();
 		logger.info("Created {}", contextString);
 		Context c = ISMapper.unmarshal(Context.class, contextString);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/ScopedTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
similarity index 92%
rename from src/test/java/org/gcube/informationsystem/resourceregistry/ScopedTest.java
rename to src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
index efcbae5..1208848 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/ScopedTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
@@ -24,9 +24,9 @@ import org.slf4j.LoggerFactory;
  * @author Luca Frosini (ISTI - CNR)
  *
  */
-public class ScopedTest {
+public class ContextTest {
 	
-	private static final Logger logger = LoggerFactory.getLogger(ScopedTest.class);
+	private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
 	
 	protected static final String PROPERTIES_FILENAME = "token.properties"; 
 	
@@ -38,7 +38,7 @@ public class ScopedTest {
 	
 	static {
 		Properties properties = new Properties();
-		InputStream input = ScopedTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
+		InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
 
 		try {
 			// load the properties file
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
index d2a5169..028cf57 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
@@ -33,7 +33,7 @@ public class DataBaseCreator {
 	
 	protected Context create(Context context) throws ResourceRegistryException, IOException {
 		ContextManagement contextManagement = new ContextManagement();
-		contextManagement.setJSON(ISMapper.marshal(context));
+		contextManagement.setJson(ISMapper.marshal(context));
 		String contextString = contextManagement.create();
 		logger.info("Created {}", contextString);
 		Context c = ISMapper.unmarshal(Context.class, contextString);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java
index 5790c3b..152bdb3 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java
@@ -1,13 +1,13 @@
 package org.gcube.informationsystem.resourceregistry.context;
 
-import org.gcube.informationsystem.resourceregistry.ScopedTest;
+import org.gcube.informationsystem.resourceregistry.ContextTest;
 import org.junit.Test;
 /*
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 */
 
-public class ContextManagementTest extends ScopedTest {
+public class ContextManagementTest extends ContextTest {
 
 	// private static Logger logger = LoggerFactory.getLogger(ContextManagementTest.class);