Centralize NETCONF_(DATA)_QNAME

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / sal / NetconfDeviceRpcTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java
index a4d86a4aa07abc0117bd4ba24e16b20ffdb4f0ce..1882e217bbf9f6920bdc61ae72b2cce157aab907 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java
@@ -36,8 +36,6 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
@@ -89,9 +87,9 @@ public class NetconfDeviceRpcTest {
         Assert.assertEquals(resolveNode(expectedReply), resolveNode(result));
     }
 
-    private Node resolveNode(final DOMRpcResult result) {
-        DataContainerChild<? extends PathArgument, ?> value = ((ContainerNode) result.getResult())
-                .getChild(NodeIdentifier.create(NetconfMessageTransformUtil.NETCONF_DATA_QNAME)).get();
+    private static Node resolveNode(final DOMRpcResult result) {
+        DataContainerChild<?, ?> value = ((ContainerNode) result.getResult())
+                .getChild(NetconfMessageTransformUtil.NETCONF_DATA_NODEID).get();
         Node node = ((AnyXmlNode)value).getValue().getNode();
         assertNotNull(node);
         return node;