X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FXmlAndJsonToCnSnInstanceIdentifierTest.java;fp=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FXmlAndJsonToCnSnInstanceIdentifierTest.java;h=aa37c7572d75160164befda763baf937b30b8259;hb=13d48361d8c7b09a61bf6aaa37cda699b14f881a;hp=6bd5178f1343a6b328ea641613abda7424896dc7;hpb=cf3c39048445c63710c82c0b3fb86a5694d5644f;p=controller.git

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java
index 6bd5178f13..aa37c7572d 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java
@@ -7,27 +7,7 @@
  */
 package org.opendaylight.controller.sal.restconf.impl.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.Map;
-import javax.ws.rs.WebApplicationException;
 import org.junit.BeforeClass;
-import org.junit.Test;
-import org.opendaylight.controller.sal.rest.impl.JsonToCompositeNodeProvider;
-import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider;
-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;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
 public class XmlAndJsonToCnSnInstanceIdentifierTest extends YangAndXmlAndDataSchemaLoader {
 
@@ -36,115 +16,4 @@ public class XmlAndJsonToCnSnInstanceIdentifierTest extends YangAndXmlAndDataSch
         dataLoad("/instanceidentifier/yang", 4, "instance-identifier-module", "cont");
     }
 
-    @Test
-    public void loadXmlToCnSn() throws WebApplicationException, IOException, URISyntaxException {
-        Node<?> node = TestUtils.readInputToCnSn("/instanceidentifier/xml/xmldata.xml",
-                XmlToCompositeNodeProvider.INSTANCE);
-
-        assertTrue(node instanceof CompositeNode);
-        CompositeNode cnSn = (CompositeNode)node;
-        TestUtils.normalizeCompositeNode(cnSn, modules, schemaNodePath);
-        verifyListPredicate(cnSn);
-    }
-
-    @Test
-    public void loadXmlLeafListToCnSn() throws WebApplicationException, IOException, URISyntaxException {
-        Node<?> node = TestUtils.readInputToCnSn("/instanceidentifier/xml/xmldata_leaf_list.xml",
-                XmlToCompositeNodeProvider.INSTANCE);
-
-        assertTrue(node instanceof CompositeNode);
-        CompositeNode cnSn = (CompositeNode)node;
-        TestUtils.normalizeCompositeNode(cnSn, modules, schemaNodePath);
-        verifyLeafListPredicate(cnSn);
-    }
-
-    @Test
-    public void loadJsonToCnSn() throws WebApplicationException, IOException, URISyntaxException {
-        Node<?> node = TestUtils.readInputToCnSn("/instanceidentifier/json/jsondata.json",
-                JsonToCompositeNodeProvider.INSTANCE);
-
-        assertTrue(node instanceof CompositeNode);
-        CompositeNode cnSn = (CompositeNode)node;
-        TestUtils.normalizeCompositeNode(cnSn, modules, schemaNodePath);
-        verifyListPredicate(cnSn);
-    }
-
-    @Test
-    public void loadJsonLeafListToCnSn() throws WebApplicationException, IOException, URISyntaxException {
-        Node<?> node = TestUtils.readInputToCnSn("/instanceidentifier/json/jsondata_leaf_list.json",
-                JsonToCompositeNodeProvider.INSTANCE);
-        assertTrue(node instanceof CompositeNode);
-        CompositeNode cnSn = (CompositeNode)node;
-
-        TestUtils.normalizeCompositeNode(cnSn, modules, schemaNodePath);
-        verifyLeafListPredicate(cnSn);
-    }
-
-    private void verifyLeafListPredicate(final CompositeNode cnSn) throws URISyntaxException {
-        SimpleNode<?> lf11 = getSnWithInstanceIdentifierWhenLeafList(cnSn);
-        Object value = lf11.getValue();
-        assertTrue(value instanceof YangInstanceIdentifier);
-
-        YangInstanceIdentifier instanceIdentifier = (YangInstanceIdentifier) value;
-        Iterator<PathArgument> it = instanceIdentifier.getPathArguments().iterator();
-        String revisionDate = "2014-01-17";
-
-        assertEquals(TestUtils.buildQName("cont", "instance:identifier:module", revisionDate), it.next().getNodeType());
-        assertEquals(TestUtils.buildQName("cont1", "instance:identifier:module", revisionDate), it.next().getNodeType());
-
-        PathArgument arg = it.next();
-        assertFalse(it.hasNext());
-        assertEquals(TestUtils.buildQName("lflst11", "augment:module:leaf:list", "2014-01-27"), arg.getNodeType());
-
-        assertTrue(arg instanceof NodeWithValue);
-        assertEquals("lflst11_1", ((NodeWithValue) arg).getValue());
-
-    }
-
-    private void verifyListPredicate(final CompositeNode cnSn) throws URISyntaxException {
-        SimpleNode<?> lf111 = getSnWithInstanceIdentifierWhenList(cnSn);
-        Object value = lf111.getValue();
-        assertTrue(value instanceof YangInstanceIdentifier);
-
-        YangInstanceIdentifier instanceIdentifier = (YangInstanceIdentifier) value;
-        Iterator<PathArgument> it = instanceIdentifier.getPathArguments().iterator();
-        String revisionDate = "2014-01-17";
-        assertEquals(TestUtils.buildQName("cont", "instance:identifier:module", revisionDate), it.next().getNodeType());
-        assertEquals(TestUtils.buildQName("cont1", "instance:identifier:module", revisionDate), it.next().getNodeType());
-
-        PathArgument arg = it.next();
-        assertEquals(TestUtils.buildQName("lst11", "augment:module", revisionDate), arg.getNodeType());
-        assertEquals(TestUtils.buildQName("lf112", "augment:augment:module", revisionDate), it.next().getNodeType());
-        assertFalse(it.hasNext());
-
-        assertTrue(arg instanceof NodeIdentifierWithPredicates);
-        Map<QName, Object> predicates = ((NodeIdentifierWithPredicates) arg).getKeyValues();
-        assertEquals(2, predicates.size());
-        assertEquals("value1", predicates.get(TestUtils.buildQName("keyvalue111", "augment:module", revisionDate)));
-        assertEquals("value2", predicates.get(TestUtils.buildQName("keyvalue112", "augment:module", revisionDate)));
-    }
-
-    private SimpleNode<?> getSnWithInstanceIdentifierWhenList(final CompositeNode cnSn) throws URISyntaxException {
-        CompositeNode cont1 = cnSn.getFirstCompositeByName(TestUtils.buildQName("cont1", "instance:identifier:module",
-                "2014-01-17"));
-        assertNotNull(cont1);
-        CompositeNode lst11 = cont1.getFirstCompositeByName(TestUtils.buildQName("lst11", "augment:module",
-                "2014-01-17"));
-        assertNotNull(lst11);
-        SimpleNode<?> lf111 = lst11.getFirstSimpleByName(TestUtils.buildQName("lf111", "augment:augment:module",
-                "2014-01-17"));
-        assertNotNull(lf111);
-        return lf111;
-    }
-
-    private SimpleNode<?> getSnWithInstanceIdentifierWhenLeafList(final CompositeNode cnSn) throws URISyntaxException {
-        CompositeNode cont1 = cnSn.getFirstCompositeByName(TestUtils.buildQName("cont1", "instance:identifier:module",
-                "2014-01-17"));
-        assertNotNull(cont1);
-        SimpleNode<?> lf11 = cont1.getFirstSimpleByName(TestUtils.buildQName("lf11", "augment:module:leaf:list",
-                "2014-01-27"));
-        assertNotNull(lf11);
-        return lf11;
-    }
-
 }