X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=restconf-client%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fccsdk%2Fsli%2Fplugins%2Fyangserializers%2Fdfserializer%2FDataFormatUtilsTest.java;h=a7814e10e9d9cba70a0d2a25b2f9d6dfcb4a49de;hb=614bd0b6897b1ece3ee7deb581089c301bb3f2e8;hp=c7efdeb3724adf1eb694fcb67c320897adda900b;hpb=259eece936114ccacf9acc8f412eeed033fd10c4;p=ccsdk%2Fsli%2Fplugins.git

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java b/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java
index c7efdeb3..a7814e10 100644
--- a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java
+++ b/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java
@@ -26,9 +26,9 @@ package org.onap.ccsdk.sli.plugins.yangserializers.dfserializer;
  */
 public final class DataFormatUtilsTest {
 
-    static final String ENCODE_TO_JSON_ID = "{\n" +
-            "    \"identity-test:con1\": {\n" +
-            "        \"interfaces\": {\n" +
+    static final String ENCODE_TO_JSON_ID_COMMON = "\n        \"interfaces\"" +
+            ": " +
+            "{\n" +
             "            \"int-list\": [\n" +
             "                {\n" +
             "                    \"iden\": \"optical\",\n" +
@@ -61,14 +61,23 @@ public final class DataFormatUtilsTest {
             "            ]\n" +
             "        },\n" +
             "        \"interface\": \"identity-types:physical\"\n" +
-            "    },\n" +
+            "    }";
+
+    static final String ENCODE_TO_JSON_ID = "{\n" +
+            "    \"identity-test:con1\": {" + ENCODE_TO_JSON_ID_COMMON +
+            ",\n" +
             "    \"identity-test:l\": \"abc\"\n" +
             "}";
 
-    static final String ENCODE_TO_XML_ID = "<?xml version=\"1.0\" encoding=" +
-            "\"UTF-8\" standalone=\"no\"?>\n" +
-            "<con1 xmlns=\"identity:ns:test:json:ser\">\n" +
-            "    <interfaces>\n" +
+    static final String ENCODE_TO_JSON_ID_PUT = "{\n" +
+            "    \"identity-test:test\": {\n" +
+            "        \"con1\": {" + addSpace(ENCODE_TO_JSON_ID_COMMON, 4) +
+            ",\n" +
+            "        \"l\": \"abc\"\n" +
+            "    }\n" +
+            "}";
+
+    static final String ENCODE_TO_XML_ID_COMMON = "\n    <interfaces>\n" +
             "        <int-list>\n" +
             "            <iden>optical</iden>\n" +
             "            <available>\n" +
@@ -97,8 +106,59 @@ public final class DataFormatUtilsTest {
             "        </int-list>\n" +
             "    </interfaces>\n" +
             "    <interface xmlns:yangid=\"identity:list:ns:test:json:ser\">" +
-            "yangid:physical</interface>\n" +
-            "</con1>\n";
+            "yangid:physical</interface>";
+
+    static final String ENCODE_TO_XML_ID = "<?xml version=\"1.0\" encoding=" +
+            "\"UTF-8\" standalone=\"no\"?>\n" +
+            "<con1 xmlns=\"identity:ns:test:json:ser\">" +
+            ENCODE_TO_XML_ID_COMMON + "\n</con1>\n";
+
+    static final String ENCODE_TO_XML_ID_PUT = "<?xml version=\"1.0\" enco" +
+            "ding=\"UTF-8\" standalone=\"no\"?>\n" +
+            "<test xmlns=\"identity:ns:test:json:ser\">\n" +
+            "    <con1>" + addSpace(ENCODE_TO_XML_ID_COMMON, 4)
+            + "\n    </con1>\n" +
+            "</test>\n";
+
+    static final String ENCODE_TO_JSON_YANG_COMMON = "\n    " +
+            "\"test-augment:ll6\": [\n" +
+            "        \"unbounded\",\n" +
+            "        \"8\"\n" +
+            "    ],\n" +
+            "    \"test-augment:cont13\": {\n" +
+            "        \"ll9\": [\n" +
+            "            \"abc\",\n" +
+            "            \"abc\"\n" +
+            "        ],\n" +
+            "        \"list9\": [\n" +
+            "            {\n" +
+            "                \"leaf27\": \"abc\"\n" +
+            "            },\n" +
+            "            {\n" +
+            "                \"leaf27\": \"abc\"\n" +
+            "            }\n" +
+            "        ],\n" +
+            "        \"leaf28\": \"abc\",\n" +
+            "        \"cont12\": {\n" +
+            "            \"leaf26\": \"abc\"\n" +
+            "        }\n" +
+            "    },\n" +
+            "    \"test-augment:list7\": [\n" +
+            "        {\n" +
+            "            \"leaf14\": \"test\"\n" +
+            "        },\n" +
+            "        {\n" +
+            "            \"leaf14\": \"create\"\n" +
+            "        }\n" +
+            "    ],\n" +
+            "    \"test-augment:leaf15\": \"abc\",\n" +
+            "    \"test-augment:cont5\": {\n" +
+            "        \"leaf13\": \"true\"\n" +
+            "    }";
+
+    static final String ENCODE_TO_JSON_YANG_AUG_POST = "{\n" +
+            "    \"test-yang:leaf10\": \"abc\"," +
+            ENCODE_TO_JSON_YANG_COMMON + "\n}";
 
     static final String ENCODE_TO_JSON_YANG = "{\n" +
             "    \"test-yang:cont2\": {\n" +
@@ -177,41 +237,8 @@ public final class DataFormatUtilsTest {
             "            \"abc\"\n" +
             "        ],\n" +
             "        \"cont4\": {\n" +
-            "            \"leaf10\": \"abc\",\n" +
-            "            \"test-augment:cont13\": {\n" +
-            "                \"ll9\": [\n" +
-            "                    \"abc\",\n" +
-            "                    \"abc\"\n" +
-            "                ],\n" +
-            "                \"list9\": [\n" +
-            "                    {\n" +
-            "                        \"leaf27\": \"abc\"\n" +
-            "                    },\n" +
-            "                    {\n" +
-            "                        \"leaf27\": \"abc\"\n" +
-            "                    }\n" +
-            "                ],\n" +
-            "                \"leaf28\": \"abc\",\n" +
-            "                \"cont12\": {\n" +
-            "                    \"leaf26\": \"abc\"\n" +
-            "                }\n" +
-            "            },\n" +
-            "            \"test-augment:list7\": [\n" +
-            "                {\n" +
-            "                    \"leaf14\": \"test\"\n" +
-            "                },\n" +
-            "                {\n" +
-            "                    \"leaf14\": \"create\"\n" +
-            "                }\n" +
-            "            ],\n" +
-            "            \"test-augment:leaf15\": \"abc\",\n" +
-            "            \"test-augment:ll6\": [\n" +
-            "                \"unbounded\",\n" +
-            "                \"8\"\n" +
-            "            ],\n" +
-            "            \"test-augment:cont5\": {\n" +
-            "                \"leaf13\": \"true\"\n" +
-            "            }\n" +
+            "            \"leaf10\": \"abc\"," +
+            addSpace(ENCODE_TO_JSON_YANG_COMMON, 8) + "\n" +
             "        },\n" +
             "        \"ll4\": [\n" +
             "            \"abc\",\n" +
@@ -242,6 +269,60 @@ public final class DataFormatUtilsTest {
             "    }\n" +
             "}";
 
+    static final String ENCODE_TO_JSON_YANG_PUT = "{\n" +
+            "    \"test-yang:cont4\": {" + addSpace(
+            ENCODE_TO_JSON_YANG_COMMON, 4) + ",\n" +
+            "        \"leaf10\": \"abc\"\n" +
+            "    }\n" +
+            "}";
+
+    static final String ENCODE_TO_XML_YANG_COMMON = "\n" +
+            "<ll6 xmlns=\"urn:opendaylight:params:xml:ns:yang:aug" +
+            "ment\">unbounded</ll6>\n" +
+            "<ll6 xmlns=\"urn:opendaylight:params:xml:ns:yang:aug" +
+            "ment\">8</ll6>\n" +
+            "<cont13 xmlns=\"urn:opendaylight:params:xml:ns:yang:" +
+            "augment\">\n" +
+            "    <ll9>abc</ll9>\n" +
+            "    <ll9>abc</ll9>\n" +
+            "    <list9>\n" +
+            "        <leaf27>abc</leaf27>\n" +
+            "    </list9>\n" +
+            "    <list9>\n" +
+            "        <leaf27>abc</leaf27>\n" +
+            "    </list9>\n" +
+            "    <leaf28>abc</leaf28>\n" +
+            "    <cont12>\n" +
+            "        <leaf26>abc</leaf26>\n" +
+            "    </cont12>\n" +
+            "</cont13>\n" +
+            "<list7 xmlns=\"urn:opendaylight:params:xml:ns:yang:a" +
+            "ugment\">\n" +
+            "    <leaf14>test</leaf14>\n" +
+            "</list7>\n" +
+            "<list7 xmlns=\"urn:opendaylight:params:xml:ns:yang:a" +
+            "ugment\">\n" +
+            "    <leaf14>create</leaf14>\n" +
+            "</list7>\n" +
+            "<leaf15 xmlns=\"urn:opendaylight:params:xml:ns:yang:" +
+            "augment\">abc</leaf15>\n" +
+            "<cont5 xmlns=\"urn:opendaylight:params:xml:ns:yang:a" +
+            "ugment\">\n" +
+            "    <leaf13>true</leaf13>\n" +
+            "</cont5>";
+
+    static final String ENCODE_TO_XML_YANG_AUG_POST = "<?xml version=\"1.0\"" +
+            " encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+            "<leaf10 xmlns=\"urn:opendaylight:params:xml:ns:yang:test\">abc" +
+            "</leaf10>" +
+            ENCODE_TO_XML_YANG_COMMON + "\n";
+
+    static final String ENCODE_TO_XML_YANG_PUT = "<?xml version=\"1.0\" enc" +
+            "oding=\"UTF-8\" standalone=\"no\"?>\n" +
+            "<cont4 xmlns=\"urn:opendaylight:params:xml:ns:yang:test\">\n" +
+            "    <leaf10>abc</leaf10>" +
+            addSpace(ENCODE_TO_XML_YANG_COMMON, 4) + "\n</cont4>\n";
+
     static final String ENCODE_TO_XML_YANG = "<?xml version=\"1.0\" encoding" +
             "=\"UTF-8\" standalone=\"no\"?>\n" +
             "<cont2 xmlns=\"urn:opendaylight:params:xml:ns:yang:test\">\n" +
@@ -298,40 +379,8 @@ public final class DataFormatUtilsTest {
             "    <ll5>abc</ll5>\n" +
             "    <ll5>abc</ll5>\n" +
             "    <cont4>\n" +
-            "        <leaf10>abc</leaf10>\n" +
-            "        <cont13 xmlns=\"urn:opendaylight:params:xml:ns:yang:" +
-            "augment\">\n" +
-            "            <ll9>abc</ll9>\n" +
-            "            <ll9>abc</ll9>\n" +
-            "            <list9>\n" +
-            "                <leaf27>abc</leaf27>\n" +
-            "            </list9>\n" +
-            "            <list9>\n" +
-            "                <leaf27>abc</leaf27>\n" +
-            "            </list9>\n" +
-            "            <leaf28>abc</leaf28>\n" +
-            "            <cont12>\n" +
-            "                <leaf26>abc</leaf26>\n" +
-            "            </cont12>\n" +
-            "        </cont13>\n" +
-            "        <list7 xmlns=\"urn:opendaylight:params:xml:ns:yang:a" +
-            "ugment\">\n" +
-            "            <leaf14>test</leaf14>\n" +
-            "        </list7>\n" +
-            "        <list7 xmlns=\"urn:opendaylight:params:xml:ns:yang:a" +
-            "ugment\">\n" +
-            "            <leaf14>create</leaf14>\n" +
-            "        </list7>\n" +
-            "        <leaf15 xmlns=\"urn:opendaylight:params:xml:ns:yang:" +
-            "augment\">abc</leaf15>\n" +
-            "        <ll6 xmlns=\"urn:opendaylight:params:xml:ns:yang:aug" +
-            "ment\">unbounded</ll6>\n" +
-            "        <ll6 xmlns=\"urn:opendaylight:params:xml:ns:yang:aug" +
-            "ment\">8</ll6>\n" +
-            "        <cont5 xmlns=\"urn:opendaylight:params:xml:ns:yang:a" +
-            "ugment\">\n" +
-            "            <leaf13>true</leaf13>\n" +
-            "        </cont5>\n" +
+            "        <leaf10>abc</leaf10>"+
+            addSpace(ENCODE_TO_XML_YANG_COMMON, 8) + "\n" +
             "    </cont4>\n" +
             "    <ll4>abc</ll4>\n" +
             "    <ll4>abc</ll4>\n" +
@@ -355,7 +404,6 @@ public final class DataFormatUtilsTest {
             "    </list6>\n" +
             "</cont2>\n";
 
-
     static final String ENCODE_TO_JSON_RPC = "{\n" +
             "    \"test-yang:input\": {\n" +
             "        \"leaf30\": \"abc\",\n" +
@@ -501,4 +549,19 @@ public final class DataFormatUtilsTest {
             "        <leaf28>abc</leaf28>\n" +
             "    </cont13>\n" +
             "</output>";
+
+    /**
+     * Adds the specified number of space required for a req in each line.
+     *
+     * @param req request message
+     * @param i   number of space
+     * @return space appended string
+     */
+    public static String addSpace(String req, int i) {
+        StringBuilder space = new StringBuilder();
+        for (int sp = 0; sp < i; sp++) {
+            space = space.append(" ");
+        }
+        return req.replaceAll("\n", "\n" + space.toString());
+    }
 }