Merge "Fix modules Restconf call for mounted devices"

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / cnsn / to / json / test / CnSnToJsonWithDataFromSeveralModulesTest.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java
index a84fc79b86fbc9bb1d028859b629aeb1ecbfe622..f0a4371944e48d0a75357606808c126e277a60e5 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java
@@ -7,23 +7,8 @@
  */
 package org.opendaylight.controller.sal.restconf.impl.cnsn.to.json.test;
 
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.ws.rs.WebApplicationException;
 import org.junit.BeforeClass;
-import org.junit.Test;
-import org.opendaylight.controller.sal.rest.impl.StructuredDataToJsonProvider;
-import org.opendaylight.controller.sal.restconf.impl.test.TestUtils;
 import org.opendaylight.controller.sal.restconf.impl.test.YangAndXmlAndDataSchemaLoader;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
-import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
-import org.opendaylight.yangtools.yang.data.impl.NodeFactory;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class CnSnToJsonWithDataFromSeveralModulesTest extends YangAndXmlAndDataSchemaLoader {
 
@@ -31,102 +16,4 @@ public class CnSnToJsonWithDataFromSeveralModulesTest extends YangAndXmlAndDataS
     public static void initialize() {
         dataLoad("/xml-to-cnsn/data-of-several-modules/yang", 2, "module1", "cont_m1");
     }
-
-    @Test
-    public void dataFromSeveralModulesToJsonTest() throws WebApplicationException, IOException, URISyntaxException {
-        SchemaContext schemaContext = TestUtils.loadSchemaContext(modules);
-        String output = TestUtils.writeCompNodeWithSchemaContextToOutput(prepareCnSn(), modules, schemaContext,
-                StructuredDataToJsonProvider.INSTANCE);
-
-        // String output =
-        // String.format("\"data\"   :   {\n" +
-        // "\t\"cont_m1\"   :  {\n" +
-        // "\t\t\"lf1_m1\"   :  \"lf1 m1 value\"\n" +
-        // "\t}\n" +
-        // "\t\"cont_m2\"   :  {\n" +
-        // "\t\t\"lf1_m2\"   :  \"lf1 m2 value\"\n" +
-        // "\t}\n" +
-        // "}");
-
-        StringBuilder regex = new StringBuilder();
-        regex.append("^");
-
-        regex.append(".*\"data\"");
-        regex.append(".*:");
-        regex.append(".*\\{");
-
-        regex.append(".*\"cont_m1\"");
-        regex.append(".*:");
-        regex.append(".*\\{");
-        regex.append(".*\\}");
-
-        regex.append(".*\"contB_m1\"");
-        regex.append(".*:");
-        regex.append(".*\\{");
-        regex.append(".*\\}");
-
-        regex.append(".*\"cont_m2\"");
-        regex.append(".*:");
-        regex.append(".*\\{");
-        regex.append(".*\\}");
-
-        regex.append(".*\"contB_m2\"");
-        regex.append(".*:");
-        regex.append(".*\\{");
-        regex.append(".*\\}");
-
-        regex.append(".*\\}");
-
-        regex.append(".*");
-        regex.append("$");
-
-        Pattern ptrn = Pattern.compile(regex.toString(), Pattern.DOTALL);
-        Matcher matcher = ptrn.matcher(output);
-
-        assertTrue(matcher.find());
-
-    }
-
-    private CompositeNode prepareCnSn() throws URISyntaxException {
-        String uri1 = "module:one";
-        String rev1 = "2014-01-17";
-
-        MutableCompositeNode data = NodeFactory.createMutableCompositeNode(
-                TestUtils.buildQName("data", "urn:ietf:params:xml:ns:netconf:base:1.0", "2000-01-01"), null, null,
-                null, null);
-
-        MutableCompositeNode cont_m1 = NodeFactory.createMutableCompositeNode(
-                TestUtils.buildQName("cont_m1", uri1, rev1), data, null, null, null);
-        data.getValue().add(cont_m1);
-
-        MutableSimpleNode<?> lf1_m1 = NodeFactory.createMutableSimpleNode(TestUtils.buildQName("lf1_m1", uri1, rev1),
-                cont_m1, "lf1 m1 value", null, null);
-        cont_m1.getValue().add(lf1_m1);
-        cont_m1.init();
-
-        MutableCompositeNode contB_m1 = NodeFactory.createMutableCompositeNode(
-                TestUtils.buildQName("contB_m1", uri1, rev1), data, null, null, null);
-        data.getValue().add(contB_m1);
-        contB_m1.init();
-
-        String uri2 = "module:two";
-        String rev2 = "2014-01-17";
-        MutableCompositeNode cont_m2 = NodeFactory.createMutableCompositeNode(
-                TestUtils.buildQName("cont_m2", uri2, rev2), data, null, null, null);
-        data.getValue().add(cont_m2);
-
-        MutableSimpleNode<?> lf1_m2 = NodeFactory.createMutableSimpleNode(TestUtils.buildQName("lf1_m2", uri2, rev2),
-                cont_m1, "lf1 m2 value", null, null);
-        cont_m2.getValue().add(lf1_m2);
-        cont_m2.init();
-
-        MutableCompositeNode contB_m2 = NodeFactory.createMutableCompositeNode(
-                TestUtils.buildQName("contB_m2", uri2, rev2), data, null, null, null);
-        data.getValue().add(contB_m2);
-        contB_m2.init();
-
-        data.init();
-        return data;
-    }
-
 }