Merge "Make sure YangInstanceIdentifier.EMPTY is retained"

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / codec / xml / XmlDocumentUtilsTest.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java
index 8ee05ff447de3b1871101c7adc9eb3c203bacd99..4145ea8d79201af817aa385f65efd9fc25f34839 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java
@@ -9,30 +9,20 @@
 package org.opendaylight.yangtools.yang.data.impl.codec.xml;
 
 import com.google.common.base.Charsets;
-import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import com.google.common.io.ByteSource;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import javax.activation.UnsupportedDataTypeException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import junit.framework.Assert;
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.SimpleNode;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
 public class XmlDocumentUtilsTest {
@@ -50,9 +40,15 @@ public class XmlDocumentUtilsTest {
 
     public static final String XML_CONTENT = "<input xmlns=\"urn:opendaylight:controller:rpc:test\">\n" +
             "<a>value</a>\n" +
-            "<ref xmlns:ltha=\"urn:opendaylight:controller:rpc:test\">/ltha:cont/ltha:l[ltha:id='id']</ref>\n" +
+            "<ref xmlns:ltha=\"urn:opendaylight:controller:rpc:test\">"+
+            "/ltha:cont/ltha:l[  ltha:id='id/foo/bar'  ]"+
+            "</ref>\n" +
             "</input>";
 
+    public static final String RPC_REPLY = "<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"m-1\">\n" +
+            " <ok/>\n" +
+            "</rpc-reply>";
+
     private SchemaContext schema;
     private RpcDefinition testRpc;
 
@@ -69,20 +65,6 @@ public class XmlDocumentUtilsTest {
         testRpc = rpcTestModule.getRpcs().iterator().next();
     }
 
-    @Test
-    public void testRpcInputTransform() throws Exception {
-
-        final Document inputDocument = readXmlToDocument(XML_CONTENT);
-        final Element input = inputDocument.getDocumentElement();
-
-        final CompositeNode node = inputXmlToCompositeNode(input);
-        final SimpleNode<?> refParsed = node.getSimpleNodesByName("ref").iterator().next();
-        Assert.assertEquals(YangInstanceIdentifier.class, refParsed.getValue().getClass());
-        final Document serializedDocument = inputCompositeNodeToXml(node);
-
-        XMLUnit.compareXML(inputDocument, serializedDocument);
-    }
-
     public static Document readXmlToDocument(final String xmlContent) throws SAXException, IOException {
         return readXmlToDocument(new ByteArrayInputStream(xmlContent.getBytes(Charsets.UTF_8)));
     }
@@ -99,14 +81,4 @@ public class XmlDocumentUtilsTest {
         doc.getDocumentElement().normalize();
         return doc;
     }
-
-    public Document inputCompositeNodeToXml(final CompositeNode cNode)
-            throws UnsupportedDataTypeException {
-        return XmlDocumentUtils.toDocument(cNode, testRpc.getInput(), XmlDocumentUtils.defaultValueCodecProvider());
-    }
-
-    public CompositeNode inputXmlToCompositeNode(final Element e) {
-        return (CompositeNode) XmlDocumentUtils.toDomNode(e, Optional.<DataSchemaNode>of(testRpc.getInput()),
-                Optional.of(XmlDocumentUtils.defaultValueCodecProvider()), Optional.of(schema));
-    }
 }