Change json representation in op policy

[clamp.git] / src / test / java / org / onap / clamp / clds / it / config / CldsReferencePropertiesItCase.java

diff --git a/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java b/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
index c25415e..4bf2de0 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
@@ -24,17 +24,11 @@
 package org.onap.clamp.clds.it.config;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import com.google.gson.JsonElement;
-
 import java.io.IOException;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -57,37 +51,6 @@ public class CldsReferencePropertiesItCase {
         assertEquals("healthcheck", refProp.getStringValue("policy.api.userName"));
     }
 
-    @Test
-    public void shouldReturnJsonFromTemplate() throws IOException {
-        // when
-        JsonElement root = refProp.getJsonTemplate("ui.location.default");
-
-        // then
-        assertNotNull(root);
-        assertTrue(root.isJsonObject());
-        assertEquals("Data Center 1", root.getAsJsonObject().get("DC1").getAsString());
-    }
-
-    @Test
-    public void shouldReturnJsonFromTemplate_2() throws IOException {
-        // when
-        JsonElement root = refProp.getJsonTemplate("ui.location", "default");
-
-        // then
-        assertNotNull(root);
-        assertTrue(root.isJsonObject());
-        assertEquals("Data Center 1", root.getAsJsonObject().get("DC1").getAsString());
-    }
-
-    @Test
-    public void shouldReturnNullIfPropertyNotFound() throws IOException {
-        // when
-        JsonElement root = refProp.getJsonTemplate("ui.location", "");
-
-        // then
-        assertNull(root);
-    }
-
     /**
      * Test getting prop value as a JSON Node / template.
      *
@@ -95,12 +58,9 @@ public class CldsReferencePropertiesItCase {
      */
     @Test
     public void testGetFileContent() throws IOException {
-        String location = "{\n\t\"DC1\": \"Data Center 1\","
-                + "\n\t\"DC2\": \"Data Center 2\",\n\t\"DC3\": \"Data Center 3\"\n}\n";
-        String content = refProp.getFileContent("ui.location.default");
-        assertEquals(location, content);
+        String users = ResourceFileUtil.getResourceAsString("clds/clds-users.json");
+        assertEquals(users, refProp.getFileContent("files.cldsUsers"));
         // Test composite key
-        content = refProp.getFileContent("ui.location", "default");
-        assertEquals(location, content);
+        assertEquals(users, refProp.getFileContent("files", "cldsUsers"));
     }
 }