Eliminate use of deprecated mockito methods

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / sharding / RoleChangeListenerActorTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActorTest.java
index 978cc27c9a249cbbf8846eae3b3e6ba3190d58ed..ca8c05ddcbb97b81946d1b633d34f4b4c1fb3b7c 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActorTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActorTest.java
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.cluster.sharding;
 
 import static akka.actor.ActorRef.noSender;
 package org.opendaylight.controller.cluster.sharding;
 
 import static akka.actor.ActorRef.noSender;

-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;

 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;


@@ -18,7 +17,7 @@ import static org.mockito.Mockito.verify;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;

-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;

 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocation;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocation;


@@ -30,15 +29,12 @@ public class RoleChangeListenerActorTest extends AbstractActorTest {
 
     @Test
     public void testRegisterRoleChangeListenerOnStart() {
 
     @Test
     public void testRegisterRoleChangeListenerOnStart() {

-        new JavaTestKit(getSystem()) {
-            {
-                final LeaderLocationListener listener = mock(LeaderLocationListener.class);
-                final Props props = RoleChangeListenerActor.props(getRef(), listener);
-
-                getSystem().actorOf(props, "testRegisterRoleChangeListenerOnStart");
-                expectMsgClass(RegisterRoleChangeListener.class);
-            }
-        };
+        final TestKit testKit = new TestKit(getSystem());
+        final LeaderLocationListener listener = mock(LeaderLocationListener.class);
+        final Props props = RoleChangeListenerActor.props(testKit.getRef(), listener);
+
+        getSystem().actorOf(props, "testRegisterRoleChangeListenerOnStart");
+        testKit.expectMsgClass(RegisterRoleChangeListener.class);

     }
 
     @Test
     }
 
     @Test


@@ -57,6 +53,5 @@ public class RoleChangeListenerActorTest extends AbstractActorTest {
 
         subject.tell(new LeaderStateChanged("member-1", "member-2", (short) 0), noSender());
         verify(listener, timeout(5000)).onLeaderLocationChanged(eq(LeaderLocation.REMOTE));
 
         subject.tell(new LeaderStateChanged("member-1", "member-2", (short) 0), noSender());
         verify(listener, timeout(5000)).onLeaderLocationChanged(eq(LeaderLocation.REMOTE));

-

     }
 }
\ No newline at end of file
     }
 }
\ No newline at end of file