X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FRoleChangeNotifierTest.java;h=bbcedd681104eaa45b905ce981cb991e7aa3ee49;hp=13c42f919ef84b8b42fb6de5a0c28dead296a4fb;hb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;hpb=5464f50be733df1bbbe31cf05665d542d3b7c5e7

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java
index 13c42f919e..bbcedd6811 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java
@@ -13,9 +13,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestActorRef;
+import akka.testkit.javadsl.TestKit;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.notifications.LeaderStateChanged;
 import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListener;
@@ -29,11 +28,11 @@ import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor;
 public class RoleChangeNotifierTest extends AbstractActorTest {
 
     @Test
-    public void testHandleRegisterRoleChangeListener() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testHandleRegisterRoleChangeListener() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "testHandleRegisterRoleChangeListener";
-                ActorRef listenerActor = getSystem().actorOf(Props.create(MessageCollectorActor.class));
+                ActorRef listenerActor = getSystem().actorOf(MessageCollectorActor.props());
 
                 TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(getSystem(),
                         RoleChangeNotifier.getProps(memberId), memberId);
@@ -52,11 +51,11 @@ public class RoleChangeNotifierTest extends AbstractActorTest {
     }
 
     @Test
-    public void testHandleRaftRoleChanged() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testHandleRaftRoleChanged() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "testHandleRegisterRoleChangeListenerWithNotificationSet";
-                ActorRef listenerActor = getSystem().actorOf(Props.create(MessageCollectorActor.class));
+                ActorRef listenerActor = getSystem().actorOf(MessageCollectorActor.props());
                 ActorRef shardActor = getTestActor();
 
                 TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(getSystem(),
@@ -89,8 +88,8 @@ public class RoleChangeNotifierTest extends AbstractActorTest {
     }
 
     @Test
-    public void testHandleLeaderStateChanged() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testHandleLeaderStateChanged() {
+        new TestKit(getSystem()) {
             {
                 String actorId = "testHandleLeaderStateChanged";
                 TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(getSystem(),