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 e8f28af6c1a578ec23f2a47408b5fc1a94bb1fe9..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
@@ -48,7 +48,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
@@ -99,7 +98,7 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
     @Test
     public void testDeadlock() throws Exception {
         // when rpc is successful, but transformer fails for some reason
-        final RpcTransformer<NormalizedNode, DOMRpcResult> failingTransformer = mock(RpcTransformer.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();
@@ -114,13 +113,13 @@ 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())
-                .findChildByArg(NetconfMessageTransformUtil.NETCONF_DATA_NODEID).get();
+        DataContainerChild value = result.value()
+                .findChildByArg(NetconfMessageTransformUtil.NETCONF_DATA_NODEID).orElseThrow();
         Node node = ((DOMSourceAnyxmlNode)value).body().getNode();
         assertNotNull(node);
         return node;