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%2FDataChangeListenerTest.java;h=5d120f575781cf0787b9d1dde200be4ea4a7c99c;hb=refs%2Fchanges%2F22%2F65622%2F11;hp=f3dcaa2b709810d169ae1ae1cc0b54c716051fe9;hpb=013a6679470bf692753f2e04ab4398c97fd9f5d0;p=controller.git

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 f3dcaa2b70..5d120f5757 100644
--- 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
@@ -13,7 +13,7 @@ import static org.opendaylight.controller.md.cluster.datastore.model.TestModel.T
 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;
@@ -28,7 +28,7 @@ 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);
@@ -37,7 +37,7 @@ public class DataChangeListenerTest extends AbstractActorTest {
 
                 // 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());
 
@@ -51,7 +51,7 @@ 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);
@@ -60,15 +60,12 @@ public class DataChangeListenerTest extends AbstractActorTest {
 
                 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;
+                });
             }
         };
     }
@@ -76,7 +73,7 @@ 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);
@@ -108,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);
@@ -122,7 +119,7 @@ public class DataChangeListenerTest extends AbstractActorTest {
 
                 // 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);