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%2FRpcRegistrarTest.java;h=dd11dd7ff5adf7763f48c99b895f7ddd9d8f566c;hp=aecadc4eb114fbb4ecff478084f220076a97e071;hb=refs%2Fchanges%2F22%2F65622%2F11;hpb=cc7d70b6fa32b99e1013c3b3c26006d9798d2b95 diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcRegistrarTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcRegistrarTest.java index aecadc4eb1..dd11dd7ff5 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcRegistrarTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcRegistrarTest.java @@ -11,8 +11,8 @@ import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Address; import akka.actor.Props; -import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; +import akka.testkit.javadsl.TestKit; import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.Map; @@ -52,7 +52,7 @@ public class RpcRegistrarTest { MockitoAnnotations.initMocks(this); system = ActorSystem.create("test"); - final JavaTestKit testKit = new JavaTestKit(system); + final TestKit testKit = new TestKit(system); final RemoteRpcProviderConfig config = new RemoteRpcProviderConfig.Builder("system").build(); final Props props = RpcRegistrar.props(config, service); testActorRef = new TestActorRef<>(system, props, testKit.getRef(), "actorRef"); @@ -63,7 +63,7 @@ public class RpcRegistrarTest { final DOMRpcIdentifier secondEndpointId = DOMRpcIdentifier.create( SchemaPath.create(true, QName.create("second:identifier", "bar"))); - final JavaTestKit senderKit = new JavaTestKit(system); + final TestKit senderKit = new TestKit(system); firstEndpoint = new RemoteRpcEndpoint(senderKit.getRef(), Collections.singletonList(firstEndpointId)); secondEndpoint = new RemoteRpcEndpoint(senderKit.getRef(), Collections.singletonList(secondEndpointId)); @@ -78,7 +78,7 @@ public class RpcRegistrarTest { @After public void tearDown() throws Exception { - JavaTestKit.shutdownActorSystem(system, null, Boolean.TRUE); + TestKit.shutdownActorSystem(system, true); } @Test @@ -136,4 +136,4 @@ public class RpcRegistrarTest { Mockito.verifyNoMoreInteractions(service, oldReg, newReg); } -} \ No newline at end of file +}