X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2FRemoteRpcImplementationTest.java;h=2026d48a81d3a3a201f131d3c20e97f6562c363b;hp=6c3a57b3448e23ac485aa04518c788f2fad390ce;hb=1e884647502a8d91f8a57bde8193c60b9bbcce0d;hpb=c33b2b55b2eae406df001619885a0610800cb951

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 6c3a57b344..2026d48a81 100644
--- 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
@@ -8,27 +8,6 @@
 
 package org.opendaylight.controller.remote.rpc;
 
-import static org.junit.Assert.assertEquals;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.Test;
-import org.opendaylight.controller.remote.rpc.messages.InvokeRpc;
-import org.opendaylight.controller.remote.rpc.messages.RpcResponse;
-import org.opendaylight.controller.xml.codec.XmlUtils;
-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.common.RpcError.ErrorSeverity;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-
-import akka.testkit.JavaTestKit;
-
-import com.google.common.util.concurrent.ListenableFuture;
 
 /***
  * Unit tests for RemoteRpcImplementation.
@@ -37,149 +16,8 @@ import com.google.common.util.concurrent.ListenableFuture;
  */
 public class RemoteRpcImplementationTest extends AbstractRpcTest {
 
-    @Test
-    public void testInvokeRpc() throws Exception {
-        final AtomicReference<AssertionError> assertError = new AtomicReference<>();
-        try {
-            RemoteRpcImplementation rpcImpl = new RemoteRpcImplementation(
-                    probeReg1.getRef(), schemaContext);
-
-            final CompositeNode input = makeRPCInput("foo");
-            final CompositeNode output = makeRPCOutput("bar");
-            final AtomicReference<InvokeRpc> invokeRpcMsg = setupInvokeRpcReply(assertError, output);
-
-            ListenableFuture<RpcResult<CompositeNode>> future = rpcImpl.invokeRpc(TEST_RPC, input);
-
-            RpcResult<CompositeNode> rpcResult = future.get(5, TimeUnit.SECONDS);
-
-            assertSuccessfulRpcResult(rpcResult, (CompositeNode)output.getValue().get(0));
-
-            assertEquals("getRpc", TEST_RPC, invokeRpcMsg.get().getRpc());
-            assertEquals("getInput", input, invokeRpcMsg.get().getInput());
-        } finally {
-            if(assertError.get() != null) {
-                throw assertError.get();
-            }
-        }
-    }
-
-    @Test
-    public void testInvokeRpcWithIdentifier() throws Exception {
-        final AtomicReference<AssertionError> assertError = new AtomicReference<>();
-        try {
-            RemoteRpcImplementation rpcImpl = new RemoteRpcImplementation(
-                    probeReg1.getRef(), schemaContext);
-
-            QName instanceQName = new QName(new URI("ns"), "instance");
-            YangInstanceIdentifier identifier = YangInstanceIdentifier.of(instanceQName);
-
-            CompositeNode input = makeRPCInput("foo");
-            CompositeNode output = makeRPCOutput("bar");
-            final AtomicReference<InvokeRpc> invokeRpcMsg = setupInvokeRpcReply(assertError, output);
-
-            ListenableFuture<RpcResult<CompositeNode>> future = rpcImpl.invokeRpc(
-                    TEST_RPC, identifier, input);
-
-            RpcResult<CompositeNode> rpcResult = future.get(5, TimeUnit.SECONDS);
-
-            assertSuccessfulRpcResult(rpcResult, (CompositeNode)output.getValue().get(0));
-
-            assertEquals("getRpc", TEST_RPC, invokeRpcMsg.get().getRpc());
-            assertEquals("getInput", input, invokeRpcMsg.get().getInput());
-            assertEquals("getRoute", identifier, invokeRpcMsg.get().getIdentifier());
-        } finally {
-            if(assertError.get() != null) {
-                throw assertError.get();
-            }
-        }
-    }
-
-    @Test
-    public void testInvokeRpcWithRpcErrorsException() throws Exception {
-        final AtomicReference<AssertionError> assertError = new AtomicReference<>();
-        try {
-            RemoteRpcImplementation rpcImpl = new RemoteRpcImplementation(
-                    probeReg1.getRef(), schemaContext);
-
-            final CompositeNode input = makeRPCInput("foo");
-
-            setupInvokeRpcErrorReply(assertError, new RpcErrorsException(
-                    "mock", Arrays.asList(RpcResultBuilder.newError(ErrorType.RPC, "tag",
-                            "error", "appTag", "info", null))));
-
-            ListenableFuture<RpcResult<CompositeNode>> future = rpcImpl.invokeRpc(TEST_RPC, input);
-
-            RpcResult<CompositeNode> rpcResult = future.get(5, TimeUnit.SECONDS);
-
-            assertFailedRpcResult(rpcResult, ErrorSeverity.ERROR, ErrorType.RPC, "tag",
-                    "error", "appTag", "info", null);
-        } finally {
-            if(assertError.get() != null) {
-                throw assertError.get();
-            }
-        }
-    }
-
-    @Test
-    public void testInvokeRpcWithOtherException() throws Exception {
-        final AtomicReference<AssertionError> assertError = new AtomicReference<>();
-        try {
-            RemoteRpcImplementation rpcImpl = new RemoteRpcImplementation(
-                    probeReg1.getRef(), schemaContext);
-
-            final CompositeNode input = makeRPCInput("foo");
-
-            setupInvokeRpcErrorReply(assertError, new TestException());
-
-            ListenableFuture<RpcResult<CompositeNode>> future = rpcImpl.invokeRpc(TEST_RPC, input);
-
-            RpcResult<CompositeNode> rpcResult = future.get(5, TimeUnit.SECONDS);
-
-            assertFailedRpcResult(rpcResult, ErrorSeverity.ERROR, ErrorType.RPC, "operation-failed",
-                    TestException.MESSAGE, null, null, TestException.MESSAGE);
-        } finally {
-            if(assertError.get() != null) {
-                throw assertError.get();
-            }
-        }
-    }
-
-    private AtomicReference<InvokeRpc> setupInvokeRpcReply(
-            final AtomicReference<AssertionError> assertError, final CompositeNode output) {
-        return setupInvokeRpcReply(assertError, output, null);
-    }
-
-    private AtomicReference<InvokeRpc> setupInvokeRpcErrorReply(
-            final AtomicReference<AssertionError> assertError, final Exception error) {
-        return setupInvokeRpcReply(assertError, null, error);
-    }
-
-    private AtomicReference<InvokeRpc> setupInvokeRpcReply(
-            final AtomicReference<AssertionError> assertError, final CompositeNode output,
-            final Exception error) {
-        final AtomicReference<InvokeRpc> invokeRpcMsg = new AtomicReference<>();
-
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    invokeRpcMsg.set(probeReg1.expectMsgClass(
-                            JavaTestKit.duration("5 seconds"), InvokeRpc.class));
-
-                    if(output != null) {
-                        probeReg1.reply(new RpcResponse(XmlUtils.outputCompositeNodeToXml(
-                                output, schemaContext)));
-                    } else {
-                        probeReg1.reply(new akka.actor.Status.Failure(error));
-                    }
-
-                } catch(AssertionError e) {
-                    assertError.set(e);
-                }
-            }
-
-        }.start();
 
-        return invokeRpcMsg;
+    private RemoteRpcProviderConfig getConfig(){
+        return new RemoteRpcProviderConfig.Builder("unit-test").build();
     }
 }