BUG-3128: rework sal-remoterpc-connector

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / test / java / org / opendaylight / controller / remote / rpc / RemoteRpcImplementationTest.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java
index 05ee9f50963b01d8812a305ad8a9eafea8e771d3..0fe9dfe5e6720c791da24b93c3d06f97430fd85c 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java
@@ -11,30 +11,23 @@ package org.opendaylight.controller.remote.rpc;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.when;
 
-import akka.actor.ActorRef;
-import akka.actor.Status;
-import akka.japi.Pair;
-import akka.testkit.JavaTestKit;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationNotAvailableException;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
-import org.opendaylight.controller.remote.rpc.registry.RpcRegistry;
-import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.FindRouters;
-import org.opendaylight.controller.sal.connector.api.RpcRouter.RouteIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 /**
  * Unit tests for RemoteRpcImplementation.
@@ -43,19 +36,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  */
 public class RemoteRpcImplementationTest extends AbstractRpcTest {
 
-
-
-    @Test(expected = DOMRpcImplementationNotAvailableException.class)
-    public void testInvokeRpcWithNoRemoteActor() throws Exception {
-        final ContainerNode input = makeRPCInput("foo");
-        final CheckedFuture<DOMRpcResult, DOMRpcException> failedFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, input);
-        rpcRegistry1Probe.expectMsgClass(JavaTestKit.duration("5 seconds"), RpcRegistry.Messages.FindRouters.class);
-        rpcRegistry1Probe
-                .reply(new RpcRegistry.Messages.FindRoutersReply(Collections.<Pair<ActorRef, Long>>emptyList()));
-        failedFuture.checkedGet(5, TimeUnit.SECONDS);
-    }
-
-
     /**
      * This test method invokes and executes the remote rpc.
      */
@@ -75,13 +55,6 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest {
         final CheckedFuture<DOMRpcResult, DOMRpcException> frontEndFuture =
                 remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
         assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture);
-        final FindRouters findRouters = rpcRegistry1Probe.expectMsgClass(RpcRegistry.Messages.FindRouters.class);
-        final RouteIdentifier<?, ?, ?> routeIdentifier = findRouters.getRouteIdentifier();
-        assertEquals("getType", TEST_RPC, routeIdentifier.getType());
-        assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute());
-
-        rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>(
-                rpcBroker2, 200L))));
 
         final DOMRpcResult result = frontEndFuture.checkedGet(5, TimeUnit.SECONDS);
         assertEquals(rpcOutput, result.getResult());
@@ -105,19 +78,11 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest {
         final CheckedFuture<DOMRpcResult, DOMRpcException> frontEndFuture =
                 remoteRpcImpl1.invokeRpc(TEST_RPC_ID, null);
         assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture);
-        final FindRouters findRouters = rpcRegistry1Probe.expectMsgClass(RpcRegistry.Messages.FindRouters.class);
-        final RouteIdentifier<?, ?, ?> routeIdentifier = findRouters.getRouteIdentifier();
-        assertEquals("getType", TEST_RPC, routeIdentifier.getType());
-        assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute());
-
-        rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>(
-                rpcBroker2, 200L))));
 
         final DOMRpcResult result = frontEndFuture.checkedGet(5, TimeUnit.SECONDS);
         assertEquals(rpcOutput, result.getResult());
     }
 
-
     /**
      * This test method invokes and executes the remote rpc.
      */
@@ -137,19 +102,11 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest {
         final CheckedFuture<DOMRpcResult, DOMRpcException> frontEndFuture =
                 remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
         assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture);
-        final FindRouters findRouters = rpcRegistry1Probe.expectMsgClass(RpcRegistry.Messages.FindRouters.class);
-        final RouteIdentifier<?, ?, ?> routeIdentifier = findRouters.getRouteIdentifier();
-        assertEquals("getType", TEST_RPC, routeIdentifier.getType());
-        assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute());
-
-        rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>(
-                rpcBroker2, 200L))));
 
         final DOMRpcResult result = frontEndFuture.checkedGet(5, TimeUnit.SECONDS);
         assertNull(result.getResult());
     }
 
-
     /**
      * This test method invokes and executes the remote rpc.
      */
@@ -167,13 +124,6 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest {
         final CheckedFuture<DOMRpcResult, DOMRpcException> frontEndFuture =
                 remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
         assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture);
-        final FindRouters findRouters = rpcRegistry1Probe.expectMsgClass(RpcRegistry.Messages.FindRouters.class);
-        final RouteIdentifier<?, ?, ?> routeIdentifier = findRouters.getRouteIdentifier();
-        assertEquals("getType", TEST_RPC, routeIdentifier.getType());
-        assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute());
-
-        rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>(
-                rpcBroker2, 200L))));
         frontEndFuture.checkedGet(5, TimeUnit.SECONDS);
     }
 
@@ -188,10 +138,6 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest {
         final CheckedFuture<DOMRpcResult, DOMRpcException> frontEndFuture =
                 remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
         assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture);
-        final FindRouters findRouters = rpcRegistry1Probe.expectMsgClass(RpcRegistry.Messages.FindRouters.class);
-        final RouteIdentifier<?, ?, ?> routeIdentifier = findRouters.getRouteIdentifier();
-        assertEquals("getType", TEST_RPC, routeIdentifier.getType());
-        assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute());
 
         frontEndFuture.checkedGet(20, TimeUnit.SECONDS);
     }
@@ -203,25 +149,13 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest {
     @Test(expected = DOMRpcException.class)
     public void testInvokeRpcWithLookupException() throws Exception {
         final NormalizedNode<?, ?> invokeRpcInput = makeRPCInput("foo");
-        final CheckedFuture<DOMRpcResult, DOMRpcException> frontEndFuture =
-                remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
-        assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture);
-        final FindRouters findRouters = rpcRegistry1Probe.expectMsgClass(RpcRegistry.Messages.FindRouters.class);
-        final RouteIdentifier<?, ?, ?> routeIdentifier = findRouters.getRouteIdentifier();
-        assertEquals("getType", TEST_RPC, routeIdentifier.getType());
-        assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute());
-        rpcRegistry1Probe.reply( new Status.Failure(new RuntimeException("test")));
-        frontEndFuture.checkedGet(5, TimeUnit.SECONDS);
-    }
 
-    /**
-     * This test method invokes and executes the remote rpc.
-     */
-    @Test(expected = DOMRpcImplementationNotAvailableException.class)
-    public void testInvokeRpcWithLoopException() throws Exception {
-        final NormalizedNode<?, ?> invokeRpcInput = RemoteRpcInput.from(makeRPCInput("foo"));
+        doThrow(new RuntimeException("test")).when(domRpcService2).invokeRpc(any(SchemaPath.class),
+            any(NormalizedNode.class));
+
         final CheckedFuture<DOMRpcResult, DOMRpcException> frontEndFuture =
                 remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput);
+        assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture);
 
         frontEndFuture.checkedGet(5, TimeUnit.SECONDS);
     }