X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fschema%2Fmapping%2FSchemalessMessageTransformerTest.java;h=75c99ebb2743c8557306dce1db1062e31bd7a7f1;hb=4f8fe6ca68115fecdb9ce43573af5a2e26c50b50;hp=ab99752c77ecfe353c884244adfdc8b2dfda7dd5;hpb=ddfdd7b56162e9c45639388b10407d45f5f0ba13;p=netconf.git

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java
index ab99752c77..75c99ebb27 100644
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java
@@ -5,26 +5,28 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.sal.connect.netconf.schema.mapping;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import javax.xml.transform.dom.DOMSource;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.config.util.xml.XmlUtil;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.netconf.api.NetconfMessage;
+import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.netconf.sal.connect.util.MessageCounter;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -49,9 +51,9 @@ public class SchemalessMessageTransformerTest {
             + "<ok/>\n"
             + "</rpc-reply>\n";
 
-    private SchemalessMessageTransformer transformer;
     private static final QName TEST_RPC = QName.create("test-ns", "2016-10-13", "test-rpc");
-    private static final SchemaPath SCHEMA_PATH = SchemaPath.create(true, TEST_RPC);
+
+    private SchemalessMessageTransformer transformer;
 
     @Before
     public void setUp() throws Exception {
@@ -63,47 +65,46 @@ public class SchemalessMessageTransformerTest {
         final Document payload = XmlUtil.readXmlToDocument(getClass().getResourceAsStream("/notification-payload.xml"));
         final NetconfMessage netconfMessage = new NetconfMessage(payload);
         final DOMNotification domNotification = transformer.toNotification(netconfMessage);
-        Assert.assertEquals(domNotification.getType().getLastComponent(),
+        assertEquals(domNotification.getType().lastNodeIdentifier(),
                 SchemalessMessageTransformer.SCHEMALESS_NOTIFICATION_PAYLOAD.getNodeType());
         final QName qName =
                 QName.create("org:opendaylight:notification:test:ns:yang:user-notification", "user-visited-page");
-        final AnyXmlNode dataContainerChild =
-                (AnyXmlNode) domNotification.getBody().getChild(new YangInstanceIdentifier.NodeIdentifier(qName)).get();
-        final Diff diff = XMLUnit.compareXML(payload, dataContainerChild.getValue().getNode().getOwnerDocument());
-        Assert.assertTrue(diff.toString(), diff.similar());
+        final DOMSourceAnyxmlNode dataContainerChild = (DOMSourceAnyxmlNode) domNotification.getBody()
+                .findChildByArg(new NodeIdentifier(qName)).get();
+        final Diff diff = XMLUnit.compareXML(payload, dataContainerChild.body().getNode().getOwnerDocument());
+        assertTrue(diff.toString(), diff.similar());
 
     }
 
     @Test
     public void toRpcRequest() throws Exception {
         final Node src = XmlUtil.readXmlToDocument("<test-rpc xmlns=\"test-ns\"><input>aaa</input></test-rpc>");
-        final AnyXmlNode input = Builders.anyXmlBuilder()
-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TEST_RPC))
+        final DOMSourceAnyxmlNode input = Builders.anyXmlBuilder()
+                .withNodeIdentifier(new NodeIdentifier(TEST_RPC))
                 .withValue(new DOMSource(src))
                 .build();
-        final NetconfMessage netconfMessage = transformer.toRpcRequest(SCHEMA_PATH, input);
+        final NetconfMessage netconfMessage = transformer.toRpcRequest(TEST_RPC, input);
         final Diff diff = XMLUnit.compareXML(XmlUtil.readXmlToDocument(EXP_REQUEST), netconfMessage.getDocument());
-        Assert.assertTrue(diff.toString(), diff.similar());
+        assertTrue(diff.toString(), diff.similar());
     }
 
     @Test
     public void toRpcResult() throws Exception {
         final Document doc = XmlUtil.readXmlToDocument(EXP_REPLY);
         final NetconfMessage netconfMessage = new NetconfMessage(doc);
-        final DOMRpcResult result = transformer.toRpcResult(netconfMessage, SCHEMA_PATH);
-        final DOMSource value = (DOMSource) result.getResult().getValue();
-        Assert.assertNotNull(result.getResult());
+        final DOMRpcResult result = transformer.toRpcResult(netconfMessage, TEST_RPC);
+        final DOMSource value = (DOMSource) result.getResult().body();
+        assertNotNull(result.getResult());
         final Document domSourceDoc = (Document) value.getNode();
         final Diff diff = XMLUnit.compareXML(XmlUtil.readXmlToDocument(EXP_REPLY), domSourceDoc);
-        Assert.assertTrue(diff.toString(), diff.similar());
+        assertTrue(diff.toString(), diff.similar());
     }
 
     @Test
     public void toEmptyRpcResult() throws Exception {
         final Document doc = XmlUtil.readXmlToDocument(OK_REPLY);
         final DOMRpcResult result = transformer.toRpcResult(
-                new NetconfMessage(doc), SchemaPath.create(true, NetconfMessageTransformUtil.NETCONF_COMMIT_QNAME));
-        Assert.assertNull(result.getResult());
+                new NetconfMessage(doc), NetconfMessageTransformUtil.NETCONF_COMMIT_QNAME);
+        assertNull(result.getResult());
     }
-
-}
\ No newline at end of file
+}