Update sal-distributed-datastore tests a bit

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActorTest.java
index 397724b79317ac51367dd74016ef52a99f5749ad..0b45d595c0f19a7d8fbc4c4ad0011b5aee22d9a8 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActorTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActorTest.java
@@ -13,15 +13,18 @@ import static org.mockito.Mockito.verify;
 
 import akka.actor.ActorRef;
 import akka.testkit.javadsl.TestKit;
+import java.time.Duration;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
 import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeNotificationListenerRegistration;
 import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeNotificationListenerRegistrationReply;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class DataTreeNotificationListenerRegistrationActorTest extends AbstractActorTest {
     @Mock
     private ListenerRegistration<?> mockListenerReg;
@@ -33,7 +36,6 @@ public class DataTreeNotificationListenerRegistrationActorTest extends AbstractA
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
         DataTreeNotificationListenerRegistrationActor.killDelay = 100;
         kit = new TestKit(getSystem());
     }
@@ -48,12 +50,12 @@ public class DataTreeNotificationListenerRegistrationActorTest extends AbstractA
             mockOnClose), ActorRef.noSender());
         subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), kit.getRef());
 
-        kit.expectMsgClass(kit.duration("5 second"), CloseDataTreeNotificationListenerRegistrationReply.class);
+        kit.expectMsgClass(Duration.ofSeconds(5), CloseDataTreeNotificationListenerRegistrationReply.class);
 
         verify(mockListenerReg, timeout(5000)).close();
         verify(mockOnClose, timeout(5000)).run();
 
-        kit.expectTerminated(kit.duration("5 second"), subject);
+        kit.expectTerminated(Duration.ofSeconds(5), subject);
     }
 
     @Test
@@ -63,7 +65,7 @@ public class DataTreeNotificationListenerRegistrationActorTest extends AbstractA
         kit.watch(subject);
 
         subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), kit.getRef());
-        kit.expectMsgClass(kit.duration("5 second"), CloseDataTreeNotificationListenerRegistrationReply.class);
+        kit.expectMsgClass(Duration.ofSeconds(5), CloseDataTreeNotificationListenerRegistrationReply.class);
 
         subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg,
             mockOnClose), ActorRef.noSender());
@@ -71,7 +73,7 @@ public class DataTreeNotificationListenerRegistrationActorTest extends AbstractA
         verify(mockListenerReg, timeout(5000)).close();
         verify(mockOnClose, timeout(5000)).run();
 
-        kit.expectTerminated(kit.duration("5 second"), subject);
+        kit.expectTerminated(Duration.ofSeconds(5), subject);
     }
 
     @Test
@@ -95,6 +97,6 @@ public class DataTreeNotificationListenerRegistrationActorTest extends AbstractA
         verify(mockListenerReg2, timeout(5000)).close();
         verify(mockOnClose2, timeout(5000)).run();
 
-        kit.expectTerminated(kit.duration("5 second"), subject);
+        kit.expectTerminated(Duration.ofSeconds(5), subject);
     }
 }