X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fit%2Fconfig%2FCldsReferencePropertiesItCase.java;h=c4c0c345a084e2d1de390e3f2f7eb754627e5c63;hb=536db7b811eba341aef48a745b495da068d170eb;hp=65aa9b44f23407c1eeecf8335f7049edb52c7792;hpb=aef5d4ba9128c0cc4418b6dd9e12533b3d76bc84;p=clamp.git

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 65aa9b44..c4c0c345 100644
--- 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,18 +24,12 @@
 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 java.util.List;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.clds.util.ResourceFileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -55,66 +49,19 @@ public class CldsReferencePropertiesItCase {
      */
     @Test
     public void testGetStringValue() {
-        assertEquals(refProp.getStringValue("policy.onap.name"), "DCAE");
-        assertEquals(refProp.getStringValue("policy.ms.policyNamePrefix", ""), "Config_MS_");
-        assertEquals(refProp.getStringValue("policy.ms.policyNamePrefix", "testos"), "Config_MS_");
-        assertEquals(refProp.getStringValue("policy.ms", "policyNamePrefix"), "Config_MS_");
-        assertNull(refProp.getStringValue("does.not.exist"));
-    }
-
-    @Test
-    public void shouldReturnJsonFromTemplate() throws IOException {
-        //when
-        JsonElement root = refProp.getJsonTemplate("ui.location.default");
-
-        //then
-        assertNotNull(root);
-        assertTrue(root.isJsonObject());
-        assertEquals(root.getAsJsonObject().get("DC1").getAsString(), "Data Center 1");
-    }
-
-    @Test
-    public void shouldReturnJsonFromTemplate_2() throws IOException {
-        //when
-        JsonElement root = refProp.getJsonTemplate("ui.location", "default");
-
-        //then
-        assertNotNull(root);
-        assertTrue(root.isJsonObject());
-        assertEquals(root.getAsJsonObject().get("DC1").getAsString(), "Data Center 1");
-    }
-
-    @Test
-    public void shouldReturnNullIfPropertyNotFound() throws IOException {
-        //when
-        JsonElement root = refProp.getJsonTemplate("ui.location", "");
-
-        //then
-        assertNull(root);
+        assertEquals("healthcheck", refProp.getStringValue("policy.api.userName"));
     }
 
     /**
      * Test getting prop value as a JSON Node / template.
      *
-     * @throws IOException
-     *         when JSON parsing fails
+     * @throws IOException when JSON parsing fails
      */
     @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 = ResourceFileUtils.getResourceAsString("clds/clds-users.json");
+        assertEquals(users, refProp.getFileContent("files.cldsUsers"));
         // Test composite key
-        content = refProp.getFileContent("ui.location", "default");
-        assertEquals(location, content);
-    }
-
-    @Test
-    public void testGetStringList() {
-        List<String> profileList = refProp.getStringList("policy.pdpUrl1", ",");
-        assertTrue(profileList.size() == 3);
-        assertTrue(profileList.get(0).trim().startsWith("http://localhost:"));
-        assertTrue(profileList.get(1).trim().equals("testpdp"));
-        assertTrue(profileList.get(2).trim().equals("alpha123"));
+        assertEquals(users, refProp.getFileContent("files", "cldsUsers"));
     }
 }