Migrate to UntypedAbstractActor

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

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java
index 32b54c4a8cf5470e2fa11060f17e48f88f7cff41..e512938b712f070c956d131e4c8f4d304f72002b 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;
 import java.net.URI;
 import java.util.Collection;
 import org.junit.AfterClass;
@@ -23,9 +23,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity;
@@ -38,7 +38,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 /**
@@ -54,7 +53,7 @@ public class AbstractRpcTest {
     static final QName TEST_RPC_INPUT = QName.create(TEST_NS, TEST_REV, "input");
     static final QName TEST_RPC_INPUT_DATA = QName.create(TEST_NS, TEST_REV, "input-data");
     static final QName TEST_RPC_OUTPUT = QName.create(TEST_NS, TEST_REV, "output");
-    static final QName TEST_RPC_OUTPUT_DATA = new QName(TEST_URI, "output-data");
+    static final QName TEST_RPC_OUTPUT_DATA = QName.create(TEST_URI, "output-data");
 
 
     static final SchemaPath TEST_RPC_TYPE = SchemaPath.create(true, TEST_RPC);
@@ -68,9 +67,9 @@ public class AbstractRpcTest {
     static RemoteRpcProviderConfig config2;
 
     protected ActorRef rpcInvoker1;
-    protected JavaTestKit rpcRegistry1Probe;
+    protected TestKit rpcRegistry1Probe;
     protected ActorRef rpcInvoker2;
-    protected JavaTestKit rpcRegistry2Probe;
+    protected TestKit rpcRegistry2Probe;
     protected SchemaContext schemaContext;
     protected RemoteRpcImplementation remoteRpcImpl1;
     protected RemoteRpcImplementation remoteRpcImpl2;
@@ -81,7 +80,7 @@ public class AbstractRpcTest {
     protected DOMRpcService domRpcService2;
 
     @BeforeClass
-    public static void setup() throws InterruptedException {
+    public static void setup() {
         config1 = new RemoteRpcProviderConfig.Builder("memberA").build();
         config2 = new RemoteRpcProviderConfig.Builder("memberB").build();
         node1 = ActorSystem.create("opendaylight-rpc", config1.get());
@@ -90,21 +89,21 @@ public class AbstractRpcTest {
 
     @AfterClass
     public static void teardown() {
-        JavaTestKit.shutdownActorSystem(node1);
-        JavaTestKit.shutdownActorSystem(node2);
+        TestKit.shutdownActorSystem(node1);
+        TestKit.shutdownActorSystem(node2);
         node1 = null;
         node2 = null;
     }
 
     @Before
-    public void setUp() throws ReactorException {
+    public void setUp() {
         schemaContext = YangParserTestUtils.parseYangResources(AbstractRpcTest.class, "/test-rpc.yang");
 
         MockitoAnnotations.initMocks(this);
 
-        rpcRegistry1Probe = new JavaTestKit(node1);
+        rpcRegistry1Probe = new TestKit(node1);
         rpcInvoker1 = node1.actorOf(RpcInvoker.props(domRpcService1));
-        rpcRegistry2Probe = new JavaTestKit(node2);
+        rpcRegistry2Probe = new TestKit(node2);
         rpcInvoker2 = node2.actorOf(RpcInvoker.props(domRpcService2));
         remoteRpcImpl1 = new RemoteRpcImplementation(rpcInvoker2, config1);
         remoteRpcImpl2 = new RemoteRpcImplementation(rpcInvoker1, config2);