Bump upstreams

[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 cd9a86dc1c9b680b84a2b2c09d5d5f56e31b269e..2592c8017942164945e75aabb28c60606707ac1a 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
@@ -34,13 +34,13 @@ import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 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.api.MessageTransformer;
 import org.opendaylight.netconf.sal.connect.api.RemoteDeviceCommunicator;
+import org.opendaylight.netconf.sal.connect.api.RpcTransformer;
 import org.opendaylight.netconf.sal.connect.netconf.AbstractBaseSchemasTest;
 import org.opendaylight.netconf.sal.connect.netconf.schema.mapping.NetconfMessageTransformer;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.IetfNetconfService;
-import org.opendaylight.yangtools.rcf8528.data.util.EmptyMountPointContext;
+import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -60,7 +60,7 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
     @Mock
     private DOMRpcAvailabilityListener listener;
     @Mock
-    private RemoteDeviceCommunicator<NetconfMessage> communicator;
+    private RemoteDeviceCommunicator communicator;
 
     private NetconfDeviceRpc rpc;
     private QName type;
@@ -92,14 +92,14 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
         rpc = new NetconfDeviceRpc(SCHEMA_CONTEXT, communicator, transformer);
 
         type = QName.create("urn:ietf:params:xml:ns:netconf:base:1.0", "2011-06-01", "get-config");
-        expectedReply = transformer.toRpcResult(reply, type);
+        expectedReply = transformer.toRpcResult(RpcResultBuilder.success(reply).build(), type);
     }
 
     @Test
     public void testDeadlock() throws Exception {
         // when rpc is successful, but transformer fails for some reason
-        final MessageTransformer<NetconfMessage> failingTransformer = mock(MessageTransformer.class);
-        final RemoteDeviceCommunicator<NetconfMessage> communicatorMock = mock(RemoteDeviceCommunicator.class);
+        final RpcTransformer<ContainerNode, DOMRpcResult> failingTransformer = mock(RpcTransformer.class);
+        final RemoteDeviceCommunicator communicatorMock = mock(RemoteDeviceCommunicator.class);
         final NetconfMessage msg = null;
         final RpcResult<NetconfMessage> result = RpcResultBuilder.success(msg).build();
         when(communicatorMock.sendRequest(any(), any())).thenReturn(Futures.immediateFuture(result));
@@ -113,14 +113,14 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
     public void testInvokeRpc() throws Exception {
         ContainerNode input = createNode("urn:ietf:params:xml:ns:netconf:base:1.0", "2011-06-01", "filter");
         final DOMRpcResult result = rpc.invokeRpc(type, input).get();
-        assertEquals(expectedReply.getResult().getIdentifier(), result.getResult().getIdentifier());
+        assertEquals(expectedReply.value().getIdentifier(), result.value().getIdentifier());
         assertEquals(resolveNode(expectedReply), resolveNode(result));
     }
 
     private static Node resolveNode(final DOMRpcResult result) {
-        DataContainerChild<?, ?> value = ((ContainerNode) result.getResult())
-                .getChild(NetconfMessageTransformUtil.NETCONF_DATA_NODEID).get();
-        Node node = ((DOMSourceAnyxmlNode)value).getValue().getNode();
+        DataContainerChild value = result.value()
+                .findChildByArg(NetconfMessageTransformUtil.NETCONF_DATA_NODEID).orElseThrow();
+        Node node = ((DOMSourceAnyxmlNode)value).body().getNode();
         assertNotNull(node);
         return node;
     }
@@ -138,7 +138,6 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
         for (RpcDefinition operation : operations) {
             final DOMRpcIdentifier domRpcIdentifier = DOMRpcIdentifier.create(operation.getQName());
             assertTrue(argValue.contains(domRpcIdentifier));
-
         }
     }