X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDataChangeListenerSupportTest.java;h=9721766d9f7709d5d398c8628b07b72735a210d5;hp=fc70e3308c4f0a965c0e8fc501a735adb4e281a1;hb=013a6679470bf692753f2e04ab4398c97fd9f5d0;hpb=5464f50be733df1bbbe31cf05665d542d3b7c5e7

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupportTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupportTest.java
index fc70e3308c..9721766d9f 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupportTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupportTest.java
@@ -30,6 +30,7 @@ import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeList
 import org.opendaylight.controller.cluster.datastore.utils.MockDataChangeListener;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 
@@ -53,7 +54,7 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
 
                 final Shard shard = actor.underlyingActor();
                 final MockDataChangeListener listener = new MockDataChangeListener(0);
-                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener),
+                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, TEST_PATH),
                         "testChangeListenerWithNoInitialData-DataChangeListener");
                 final DataChangeListenerSupport support = new DataChangeListenerSupport(shard);
                 support.onMessage(new RegisterChangeListener(TEST_PATH, dclActor, DataChangeScope.ONE, false),
@@ -79,7 +80,7 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
                 writeToStore(shard.getDataStore(), TestModel.TEST_PATH,
                         ImmutableNodes.containerNode(TestModel.TEST_QNAME));
                 final MockDataChangeListener listener = new MockDataChangeListener(1);
-                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener),
+                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, TEST_PATH),
                         "testInitialChangeListenerEventWithContainerPath-DataChangeListener");
                 final DataChangeListenerSupport support = new DataChangeListenerSupport(shard);
                 support.onMessage(new RegisterChangeListener(TEST_PATH, dclActor, DataChangeScope.ONE, false),
@@ -104,7 +105,7 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
                 mergeToStore(shard.getDataStore(), TEST_PATH, testNodeWithOuter(1, 2));
 
                 final MockDataChangeListener listener = new MockDataChangeListener(1);
-                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener),
+                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, OUTER_LIST_PATH),
                         "testInitialChangeListenerEventWithListPath-DataChangeListener");
                 final DataChangeListenerSupport support = new DataChangeListenerSupport(shard);
                 support.onMessage(new RegisterChangeListener(OUTER_LIST_PATH, dclActor, DataChangeScope.ONE, false),
@@ -137,11 +138,11 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
                         ImmutableNodes.containerNode(OUTER_CONTAINER_QNAME));
 
                 final MockDataChangeListener listener = new MockDataChangeListener(1);
-                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener),
+                final YangInstanceIdentifier path = OUTER_LIST_PATH.node(OUTER_LIST_QNAME);
+                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, path),
                         "testInitialChangeListenerEventWithWildcardedListPath-DataChangeListener");
                 final DataChangeListenerSupport support = new DataChangeListenerSupport(shard);
-                support.onMessage(new RegisterChangeListener(OUTER_LIST_PATH.node(OUTER_LIST_QNAME), dclActor,
-                        DataChangeScope.ONE, false), true, true);
+                support.onMessage(new RegisterChangeListener(path, dclActor, DataChangeScope.ONE, false), true, true);
 
                 listener.waitForChangeEvents();
                 listener.verifyCreatedData(0, outerEntryPath(1));
@@ -169,12 +170,12 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
                                 outerNodeEntry(2, innerNode("three", "four")))));
 
                 final MockDataChangeListener listener = new MockDataChangeListener(1);
-                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener),
+                final YangInstanceIdentifier path = OUTER_LIST_PATH.node(OUTER_LIST_QNAME)
+                        .node(INNER_LIST_QNAME).node(INNER_LIST_QNAME);
+                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, path),
                         "testInitialChangeListenerEventWithNestedWildcardedListsPath-DataChangeListener");
                 final DataChangeListenerSupport support = new DataChangeListenerSupport(shard);
-                support.onMessage(new RegisterChangeListener(OUTER_LIST_PATH.node(OUTER_LIST_QNAME)
-                        .node(INNER_LIST_QNAME).node(INNER_LIST_QNAME), dclActor, DataChangeScope.ONE, false),
-                            true, true);
+                support.onMessage(new RegisterChangeListener(path, dclActor, DataChangeScope.ONE, false), true, true);
 
 
                 listener.waitForChangeEvents();
@@ -185,12 +186,13 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
 
                 // Register for a specific outer list entry
                 final MockDataChangeListener listener2 = new MockDataChangeListener(1);
-                final ActorRef dclActor2 = actorFactory.createActor(DataChangeListener.props(listener2),
+                final YangInstanceIdentifier path2 = OUTER_LIST_PATH.node(outerEntryKey(1)).node(INNER_LIST_QNAME)
+                        .node(INNER_LIST_QNAME);
+                final ActorRef dclActor2 = actorFactory.createActor(DataChangeListener.props(listener2, path2),
                         "testInitialChangeListenerEventWithNestedWildcardedListsPath-DataChangeListener2");
                 final DataChangeListenerSupport support2 = new DataChangeListenerSupport(shard);
-                support2.onMessage(new RegisterChangeListener(
-                        OUTER_LIST_PATH.node(outerEntryKey(1)).node(INNER_LIST_QNAME).node(INNER_LIST_QNAME), dclActor2,
-                        DataChangeScope.ONE, false), true, true);
+                support2.onMessage(new RegisterChangeListener(path2, dclActor2, DataChangeScope.ONE, false),
+                        true, true);
 
                 listener2.waitForChangeEvents();
                 listener2.verifyCreatedData(0, innerEntryPath(1, "one"));
@@ -219,12 +221,12 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
                                 outerNodeEntry(2, innerNode("three", "four")))));
 
                 final MockDataChangeListener listener = new MockDataChangeListener(0);
-                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener),
+                final YangInstanceIdentifier path = OUTER_LIST_PATH.node(OUTER_LIST_QNAME).node(INNER_LIST_QNAME)
+                        .node(INNER_LIST_QNAME);
+                final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, path),
                         "testInitialChangeListenerEventWhenNotInitiallyLeader-DataChangeListener");
                 final DataChangeListenerSupport support = new DataChangeListenerSupport(shard);
-                support.onMessage(new RegisterChangeListener(
-                        OUTER_LIST_PATH.node(OUTER_LIST_QNAME).node(INNER_LIST_QNAME).node(INNER_LIST_QNAME), dclActor,
-                        DataChangeScope.ONE, false), false, true);
+                support.onMessage(new RegisterChangeListener(path, dclActor, DataChangeScope.ONE, false), false, true);
 
                 listener.expectNoMoreChanges("Unexpected initial change event");
                 listener.reset(1);