Migrate from JavaTestKit to javadsl.TestKit

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerTest.java
index 544a56628c385888e958a23df385a35d07a3fb51..5d120f575781cf0787b9d1dde200be4ea4a7c99c 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerTest.java
@@ -8,10 +8,12 @@
 
 package org.opendaylight.controller.cluster.datastore;
 
+import static org.opendaylight.controller.md.cluster.datastore.model.TestModel.TEST_PATH;
+
 import akka.actor.ActorRef;
 import akka.actor.DeadLetter;
 import akka.actor.Props;
-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -26,16 +28,16 @@ public class DataChangeListenerTest extends AbstractActorTest {
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWhenNotificationsAreEnabled() {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
                 final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-                final Props props = DataChangeListener.props(mockListener);
+                final Props props = DataChangeListener.props(mockListener, TEST_PATH);
                 final ActorRef subject = getSystem().actorOf(props, "testDataChangedNotificationsEnabled");
 
                 // Let the DataChangeListener know that notifications should be
                 // enabled
-                subject.tell(new EnableNotification(true), getRef());
+                subject.tell(new EnableNotification(true, "test"), getRef());
 
                 subject.tell(new DataChanged(mockChangeEvent), getRef());
 
@@ -49,24 +51,21 @@ public class DataChangeListenerTest extends AbstractActorTest {
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWhenNotificationsAreDisabled() {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
                 final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-                final Props props = DataChangeListener.props(mockListener);
+                final Props props = DataChangeListener.props(mockListener, TEST_PATH);
                 final ActorRef subject = getSystem().actorOf(props, "testDataChangedNotificationsDisabled");
 
                 subject.tell(new DataChanged(mockChangeEvent), getRef());
 
-                new Within(duration("1 seconds")) {
-                    @Override
-                    protected void run() {
-                        expectNoMsg();
-
-                        Mockito.verify(mockListener, Mockito.never())
-                                .onDataChanged(Mockito.any(AsyncDataChangeEvent.class));
-                    }
-                };
+                within(duration("1 seconds"), () -> {
+                    expectNoMsg();
+                    Mockito.verify(mockListener, Mockito.never())
+                        .onDataChanged(Mockito.any(AsyncDataChangeEvent.class));
+                    return null;
+                });
             }
         };
     }
@@ -74,11 +73,11 @@ public class DataChangeListenerTest extends AbstractActorTest {
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWithNoSender() {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
                 final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-                final Props props = DataChangeListener.props(mockListener);
+                final Props props = DataChangeListener.props(mockListener, TEST_PATH);
                 final ActorRef subject = getSystem().actorOf(props, "testDataChangedWithNoSender");
 
                 getSystem().eventStream().subscribe(getRef(), DeadLetter.class);
@@ -106,7 +105,7 @@ public class DataChangeListenerTest extends AbstractActorTest {
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWithListenerRuntimeEx() {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final AsyncDataChangeEvent mockChangeEvent1 = Mockito.mock(AsyncDataChangeEvent.class);
                 final AsyncDataChangeEvent mockChangeEvent2 = Mockito.mock(AsyncDataChangeEvent.class);
@@ -115,12 +114,12 @@ public class DataChangeListenerTest extends AbstractActorTest {
                 AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
                 Mockito.doThrow(new RuntimeException("mock")).when(mockListener).onDataChanged(mockChangeEvent2);
 
-                Props props = DataChangeListener.props(mockListener);
+                Props props = DataChangeListener.props(mockListener, TEST_PATH);
                 ActorRef subject = getSystem().actorOf(props, "testDataChangedWithListenerRuntimeEx");
 
                 // Let the DataChangeListener know that notifications should be
                 // enabled
-                subject.tell(new EnableNotification(true), getRef());
+                subject.tell(new EnableNotification(true, "test"), getRef());
 
                 subject.tell(new DataChanged(mockChangeEvent1), getRef());
                 expectMsgClass(DataChangedReply.class);