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 / json / to / cnsn / test / JsonIdentityrefToCnSnTest.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonIdentityrefToCnSnTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonIdentityrefToCnSnTest.java
index 23b040a9a3846b6e273dedcb0fcb42e8c36ff5f4..86c1595386a2f0fb9ef8fd36003ad057ec85c519 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonIdentityrefToCnSnTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonIdentityrefToCnSnTest.java
@@ -7,20 +7,8 @@
  */
 package org.opendaylight.controller.sal.restconf.impl.json.to.cnsn.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
 import org.junit.BeforeClass;
-import org.junit.Test;
-import org.opendaylight.controller.sal.rest.impl.JsonToCompositeNodeProvider;
-import org.opendaylight.controller.sal.restconf.impl.test.TestUtils;
 import org.opendaylight.controller.sal.restconf.impl.test.YangAndXmlAndDataSchemaLoader;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.Node;
-import org.opendaylight.yangtools.yang.data.api.SimpleNode;
 
 public class JsonIdentityrefToCnSnTest extends YangAndXmlAndDataSchemaLoader {
 
@@ -29,56 +17,4 @@ public class JsonIdentityrefToCnSnTest extends YangAndXmlAndDataSchemaLoader {
         dataLoad("/json-to-cnsn/identityref", 2, "identityref-module", "cont");
     }
 
-    @Test
-    public void jsonIdentityrefToCompositeNode() {
-        CompositeNode compositeNode = TestUtils.readInputToCnSn("/json-to-cnsn/identityref/json/data.json", false,
-                JsonToCompositeNodeProvider.INSTANCE);
-        assertNotNull(compositeNode);
-
-        TestUtils.normalizeCompositeNode(compositeNode, modules, searchedModuleName + ":" + searchedDataSchemaName);
-
-        assertEquals("cont", compositeNode.getNodeType().getLocalName());
-
-        List<Node<?>> childs = compositeNode.getValue();
-        assertEquals(1, childs.size());
-        Node<?> nd = childs.iterator().next();
-        assertTrue(nd instanceof CompositeNode);
-        assertEquals("cont1", nd.getNodeType().getLocalName());
-
-        childs = ((CompositeNode) nd).getValue();
-        assertEquals(4, childs.size());
-        SimpleNode<?> lf11 = null;
-        SimpleNode<?> lf12 = null;
-        SimpleNode<?> lf13 = null;
-        SimpleNode<?> lf14 = null;
-        for (Node<?> child : childs) {
-            assertTrue(child instanceof SimpleNode);
-            if (child.getNodeType().getLocalName().equals("lf11")) {
-                lf11 = (SimpleNode<?>) child;
-            } else if (child.getNodeType().getLocalName().equals("lf12")) {
-                lf12 = (SimpleNode<?>) child;
-            } else if (child.getNodeType().getLocalName().equals("lf13")) {
-                lf13 = (SimpleNode<?>) child;
-            } else if (child.getNodeType().getLocalName().equals("lf14")) {
-                lf14 = (SimpleNode<?>) child;
-            }
-        }
-
-        assertTrue(lf11.getValue() instanceof QName);
-        assertEquals("iden", ((QName) lf11.getValue()).getLocalName());
-        assertEquals("identity:module", ((QName) lf11.getValue()).getNamespace().toString());
-
-        assertTrue(lf12.getValue() instanceof QName);
-        assertEquals("iden_local", ((QName) lf12.getValue()).getLocalName());
-        assertEquals("identityref:module", ((QName) lf12.getValue()).getNamespace().toString());
-
-        assertTrue(lf13.getValue() instanceof QName);
-        assertEquals("iden_local", ((QName) lf13.getValue()).getLocalName());
-        assertEquals("identityref:module", ((QName) lf13.getValue()).getNamespace().toString());
-
-        assertTrue(lf14.getValue() instanceof QName);
-        assertEquals("iden_local", ((QName) lf14.getValue()).getLocalName());
-        assertEquals("identity:module", ((QName) lf14.getValue()).getNamespace().toString());
-    }
-
 }