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%2FDataTreeChangeListenerProxyTest.java;h=c66c3cd0aeb264291fad8aeddb3e3da7b68f1aad;hb=bc2b83e97bc73930badd4a3063c65b849f82c664;hp=6f2f99b24ef7a088586e39ce7334a4cc3e8d4d61;hpb=ec870dee9bacb971f11bc747b69e84ac37f5d746;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java
index 6f2f99b24e..c66c3cd0ae 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java
@@ -34,7 +34,7 @@ import org.opendaylight.controller.cluster.datastore.messages.FindLocalShard;
 import org.opendaylight.controller.cluster.datastore.messages.LocalShardFound;
 import org.opendaylight.controller.cluster.datastore.messages.LocalShardNotFound;
 import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListener;
-import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListenerReply;
+import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeNotificationListenerReply;
 import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
 import org.opendaylight.controller.cluster.datastore.utils.Dispatchers;
 import org.opendaylight.controller.cluster.raft.utils.DoNothingActor;
@@ -60,13 +60,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
                 final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
                         actorContext, mockListener, path);
 
-                new Thread() {
-                    @Override
-                    public void run() {
-                        proxy.init("shard-1");
-                    }
-
-                }.start();
+                new Thread(() -> proxy.init("shard-1")).start();
 
                 FiniteDuration timeout = duration("5 seconds");
                 FindLocalShard findLocalShard = expectMsgClass(timeout, FindLocalShard.class);
@@ -79,7 +73,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
                 Assert.assertEquals("getPath", path, registerMsg.getPath());
                 Assert.assertEquals("isRegisterOnAllInstances", false, registerMsg.isRegisterOnAllInstances());
 
-                reply(new RegisterDataTreeChangeListenerReply(getRef()));
+                reply(new RegisterDataTreeNotificationListenerReply(getRef()));
 
                 for (int i = 0; i < 20 * 5 && proxy.getListenerRegistrationActor() == null; i++) {
                     Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
@@ -119,13 +113,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
                 final DataTreeChangeListenerProxy<ClusteredDOMDataTreeChangeListener> proxy =
                         new DataTreeChangeListenerProxy<>(actorContext, mockClusteredListener, path);
 
-                new Thread() {
-                    @Override
-                    public void run() {
-                        proxy.init("shard-1");
-                    }
-
-                }.start();
+                new Thread(() -> proxy.init("shard-1")).start();
 
                 FiniteDuration timeout = duration("5 seconds");
                 FindLocalShard findLocalShard = expectMsgClass(timeout, FindLocalShard.class);
@@ -154,13 +142,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
                 final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
                         actorContext, mockListener, path);
 
-                new Thread() {
-                    @Override
-                    public void run() {
-                        proxy.init("shard-1");
-                    }
-
-                }.start();
+                new Thread(() -> proxy.init("shard-1")).start();
 
                 FiniteDuration timeout = duration("5 seconds");
                 FindLocalShard findLocalShard = expectMsgClass(timeout, FindLocalShard.class);
@@ -186,13 +168,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
                 final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
                         actorContext, mockListener, path);
 
-                new Thread() {
-                    @Override
-                    public void run() {
-                        proxy.init("shard-1");
-                    }
-
-                }.start();
+                new Thread(() -> proxy.init("shard-1")).start();
 
                 FiniteDuration timeout = duration("5 seconds");
                 FindLocalShard findLocalShard = expectMsgClass(timeout, FindLocalShard.class);
@@ -226,6 +202,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
                 final YangInstanceIdentifier path = YangInstanceIdentifier.of(TestModel.TEST_QNAME);
 
                 doReturn(executor).when(actorContext).getClientDispatcher();
+                doReturn(DatastoreContext.newBuilder().build()).when(actorContext).getDatastoreContext();
                 doReturn(mockActorSystem).when(actorContext).getActorSystem();
 
                 String shardName = "shard-1";
@@ -269,7 +246,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
 
                 Answer<Future<Object>> answer = invocation -> {
                     proxy.close();
-                    return Futures.successful((Object) new RegisterDataTreeChangeListenerReply(getRef()));
+                    return Futures.successful((Object) new RegisterDataTreeNotificationListenerReply(getRef()));
                 };
 
                 doAnswer(answer).when(actorContext).executeOperationAsync(any(ActorRef.class), any(Object.class),