X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Factors%2FDataTreeNotificationListenerRegistrationActorTest.java;h=0b45d595c0f19a7d8fbc4c4ad0011b5aee22d9a8;hb=refs%2Fchanges%2F61%2F96761%2F2;hp=12428e925682916eca8cfeddedf6242d0cd04887;hpb=ec870dee9bacb971f11bc747b69e84ac37f5d746;p=controller.git

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 12428e9256..0b45d595c0 100644
--- 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
@@ -7,20 +7,24 @@
  */
 package org.opendaylight.controller.cluster.datastore.actors;
 
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 
 import akka.actor.ActorRef;
-import akka.testkit.JavaTestKit;
+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.Mockito;
-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;
@@ -28,81 +32,71 @@ public class DataTreeNotificationListenerRegistrationActorTest extends AbstractA
     @Mock
     private Runnable mockOnClose;
 
+    private TestKit kit;
+
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
         DataTreeNotificationListenerRegistrationActor.killDelay = 100;
+        kit = new TestKit(getSystem());
     }
 
     @Test
-    public void testOnReceiveCloseListenerRegistrationAfterSetRegistration() throws Exception {
-        new JavaTestKit(getSystem()) {
-            {
-                final ActorRef subject = getSystem().actorOf(DataTreeNotificationListenerRegistrationActor.props(),
-                        "testOnReceiveCloseListenerRegistrationAfterSetRegistration");
-                watch(subject);
+    public void testOnReceiveCloseListenerRegistrationAfterSetRegistration() {
+        final ActorRef subject = getSystem().actorOf(DataTreeNotificationListenerRegistrationActor.props(),
+                "testOnReceiveCloseListenerRegistrationAfterSetRegistration");
+        kit.watch(subject);
 
-                subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg,
-                        mockOnClose), ActorRef.noSender());
-                subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), getRef());
+        subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg,
+            mockOnClose), ActorRef.noSender());
+        subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), kit.getRef());
 
-                expectMsgClass(duration("5 second"), CloseDataTreeNotificationListenerRegistrationReply.class);
+        kit.expectMsgClass(Duration.ofSeconds(5), CloseDataTreeNotificationListenerRegistrationReply.class);
 
-                Mockito.verify(mockListenerReg, timeout(5000)).close();
-                Mockito.verify(mockOnClose, timeout(5000)).run();
+        verify(mockListenerReg, timeout(5000)).close();
+        verify(mockOnClose, timeout(5000)).run();
 
-                expectTerminated(duration("5 second"), subject);
-            }
-        };
+        kit.expectTerminated(Duration.ofSeconds(5), subject);
     }
 
     @Test
-    public void testOnReceiveCloseListenerRegistrationBeforeSetRegistration() throws Exception {
-        new JavaTestKit(getSystem()) {
-            {
-                final ActorRef subject = getSystem().actorOf(DataTreeNotificationListenerRegistrationActor.props(),
-                        "testOnReceiveSetRegistrationAfterPriorClose");
-                watch(subject);
+    public void testOnReceiveCloseListenerRegistrationBeforeSetRegistration() {
+        final ActorRef subject = getSystem().actorOf(DataTreeNotificationListenerRegistrationActor.props(),
+                "testOnReceiveSetRegistrationAfterPriorClose");
+        kit.watch(subject);
 
-                subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), getRef());
-                expectMsgClass(duration("5 second"), CloseDataTreeNotificationListenerRegistrationReply.class);
+        subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), kit.getRef());
+        kit.expectMsgClass(Duration.ofSeconds(5), CloseDataTreeNotificationListenerRegistrationReply.class);
 
-                subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg,
-                        mockOnClose), ActorRef.noSender());
+        subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg,
+            mockOnClose), ActorRef.noSender());
 
-                Mockito.verify(mockListenerReg, timeout(5000)).close();
-                Mockito.verify(mockOnClose, timeout(5000)).run();
+        verify(mockListenerReg, timeout(5000)).close();
+        verify(mockOnClose, timeout(5000)).run();
 
-                expectTerminated(duration("5 second"), subject);
-            }
-        };
+        kit.expectTerminated(Duration.ofSeconds(5), subject);
     }
 
     @Test
-    public void testOnReceiveSetRegistrationAfterPriorClose() throws Exception {
-        new JavaTestKit(getSystem()) {
-            {
-                DataTreeNotificationListenerRegistrationActor.killDelay = 1000;
-                final ListenerRegistration<?> mockListenerReg2 = Mockito.mock(ListenerRegistration.class);
-                final Runnable mockOnClose2 = Mockito.mock(Runnable.class);
-
-                final ActorRef subject = getSystem().actorOf(DataTreeNotificationListenerRegistrationActor.props(),
-                        "testOnReceiveSetRegistrationAfterPriorClose");
-                watch(subject);
-
-                subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg,
-                        mockOnClose), ActorRef.noSender());
-                subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), ActorRef.noSender());
-                subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg2,
-                        mockOnClose2), ActorRef.noSender());
-
-                Mockito.verify(mockListenerReg, timeout(5000)).close();
-                Mockito.verify(mockOnClose, timeout(5000)).run();
-                Mockito.verify(mockListenerReg2, timeout(5000)).close();
-                Mockito.verify(mockOnClose2, timeout(5000)).run();
-
-                expectTerminated(duration("5 second"), subject);
-            }
-        };
+    public void testOnReceiveSetRegistrationAfterPriorClose() {
+        DataTreeNotificationListenerRegistrationActor.killDelay = 1000;
+        final ListenerRegistration<?> mockListenerReg2 = mock(ListenerRegistration.class);
+        final Runnable mockOnClose2 = mock(Runnable.class);
+
+        final ActorRef subject = getSystem().actorOf(DataTreeNotificationListenerRegistrationActor.props(),
+            "testOnReceiveSetRegistrationAfterPriorClose");
+        kit.watch(subject);
+
+        subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg,
+            mockOnClose), ActorRef.noSender());
+        subject.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), ActorRef.noSender());
+        subject.tell(new DataTreeNotificationListenerRegistrationActor.SetRegistration(mockListenerReg2,
+            mockOnClose2), ActorRef.noSender());
+
+        verify(mockListenerReg, timeout(5000)).close();
+        verify(mockOnClose, timeout(5000)).run();
+        verify(mockListenerReg2, timeout(5000)).close();
+        verify(mockOnClose2, timeout(5000)).run();
+
+        kit.expectTerminated(Duration.ofSeconds(5), subject);
     }
 }