Prepare codebase for dynamic DMaaP configuration

From now on, there is only one single place
where we can create whole app core concerning sending events
and it has a single entry point, based on DMaaP configuration.
It can be used to rebuild part of app that is responsible
for sending events dynamically.
Changes are in scope for the dynamic DMaaP config feature.
+ bumped up code coverage a bit

Change-Id: Iecc8c4e534ae9b781f47e3616409271ba83169c8
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
Issue-ID: DCAEGEN2-517

1 files changed, 18 insertions, 62 deletions

diff --git a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
index 695f53c9..9400e46d 100644
--- a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
+++ b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
@@ -19,89 +19,45 @@
  */
 package org.onap.dcae.vestest;
 
-import com.google.common.collect.ImmutableMap;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.google.common.collect.Sets;
-import org.json.JSONObject;
+import java.util.Set;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.dcae.commonFunction.AnyNode;
 
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * Created by koblosz on 07.06.18.
  */
 public class AnyNodeTest {
 
-    private static final String SAMPLE_JSON_FILEPATH = "src/test/resources/test_anynode_class.json";
-    private static final Map<String, Object> EXPECTED_RAW_MAP = ImmutableMap.<String, Object>builder().put("a", 1).put("b", 2).build();
-    private static final Set<String> EXPECTED_JSON_KEYS = Sets.newHashSet("channels", "sampleStrList", "sampleNestedObject", "sampleInt", "sampleString", "sampleNull");
+    private static final String SAMPLE_JSON_FILEPATH = "{\n"
+        + "  \"channels\": [{\n"
+        + "    \"one\": \"number1\", \"two\": \"number2\", \"three\": \"number3\"}],\n"
+        + "  \"sampleStrList\": [\"1\", \"2\", \"3\", \"4\", \"5\"],\n"
+        + "  \"sampleNestedObject\": {\"a\": 1, \"b\": 2},\n"
+        + "  \"sampleInt\": 1,\n"
+        + "  \"sampleString\": \"str\",\n"
+        + "  \"sampleNull\": null\n"
+        + "}\n";
+    private static final Set<String> EXPECTED_JSON_KEYS = Sets
+        .newHashSet("channels", "sampleStrList", "sampleNestedObject", "sampleInt", "sampleString", "sampleNull");
     private static AnyNode node;
 
 
     @BeforeClass
-    public static void setUpClass() throws IOException {
-        node = AnyNode.parse(SAMPLE_JSON_FILEPATH);
-    }
-
-    @Test(expected = IOException.class)
-    public void testShouldRethrowExceptionWhenFileNotFound() throws IOException {
-        AnyNode.parse("not/existing/path");
+    public static void setUpClass() {
+        node = AnyNode.fromString(SAMPLE_JSON_FILEPATH);
     }
 
     @Test
     public void testShouldReturnJsonObjectKeySet() {
-        assertThat(node.getKeys()).containsOnlyElementsOf(EXPECTED_JSON_KEYS);
-    }
-
-    @Test
-    public void testShouldGetElementAsString() {
-        assertThat(node.get("sampleStrList").get(0).asString()).isEqualTo("1");
-    }
-
-    @Test
-    public void testShouldGetElementAsInt() {
-        assertThat(node.get("sampleInt").asInt()).isSameAs(1);
-    }
-
-    @Test
-    public void testWhenNullValuePresentShouldReturnJsonObjectNullAsString() {
-        assertThat(node.get("sampleNull").asString()).isSameAs(JSONObject.NULL.toString());
+        assertThat(node.keys()).containsOnlyElementsOf(EXPECTED_JSON_KEYS);
     }
 
-    @Test
-    public void testShouldGetJsonObjectAsStringToObjectMap() {
-        assertThat(node.get("sampleNestedObject").asRawMap()).containsAllEntriesOf(EXPECTED_RAW_MAP);
-    }
-
-    @Test
-    public void testShouldGetAsMap() {
-        assertThat(node.asMap().keySet()).containsOnlyElementsOf(EXPECTED_JSON_KEYS);
-    }
-
-    @Test
-    public void testShouldGetAsList() {
-        assertThat(node.get("sampleStrList").asList().stream().map(AnyNode::asString).collect(Collectors.toList())).containsExactly("1", "2", "3", "4", "5");
-    }
-
-    @Test
-    public void testShouldGetAsOptional() {
-        assertThat(node.getAsOptional("absentKey")).isNotPresent();
-    }
-
-    @Test
-    public void testWhenChainMethodsShouldReturnValue() {
-        assertThat(node.get("channels").get(0).get("two").asString()).isEqualTo("number2");
-    }
-
-
     @Test(expected = ClassCastException.class)
     public void whenInvokedOnJsonObjInsteadOfJsonArrShouldRaiseRuntimeEx() {
-        node.asList();
+        node.toList();
     }
 }
\ No newline at end of file