From 912e5e9201bf60169ad39686ba5bd9d9bc6e3579 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Mon, 5 Mar 2018 13:38:34 +0100 Subject: Rework configuration Move the JSON content from the properties file to json files for all configuration defined in clds-reference.properties Issue-ID: CLAMP-136 Change-Id: Idfb21be729d7260518756e5f585371de78d18944 Signed-off-by: Determe, Sebastien (sd378r) --- .../clds/it/config/CldsReferencePropertiesItCase.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/test/java/org') 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 79b26111f..484a13e60 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 @@ -59,6 +59,7 @@ public class CldsReferencePropertiesItCase { 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")); } /** @@ -68,7 +69,7 @@ public class CldsReferencePropertiesItCase { * when JSON parsing fails */ @Test - public void testJsonTemplate() throws IOException { + public void testGetJsonTemplate() throws IOException { // ui.location.default={"DC1":"Data Center 1","DC2":"Data Center // 2","DC3":"Data Center 3"} ObjectNode root = (ObjectNode) refProp.getJsonTemplate("ui.location.default"); @@ -81,4 +82,19 @@ public class CldsReferencePropertiesItCase { root = (ObjectNode) refProp.getJsonTemplate("ui.location", ""); assertNull(root); } + + /** + * Test getting prop value as a JSON Node / template. + * + * @throws IOException + * when JSON parsing fails + */ + @Test + public void testGetFileContent() throws IOException { + String content = refProp.getFileContent("sdc.decode.service_ids"); + assertEquals("{}", content); + // Test composite key + content = refProp.getFileContent("sdc.decode", "service_ids"); + assertEquals("{}", content); + } } -- cgit 1.2.3-korg