BUG-5280: expand ShardDataTree to cover transaction mechanics

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

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 ac6f8017b8204b9ba81527cf1cab4efbbebba91b..ffe32260422ba1e5283574d0bd8eb4f3ab0cbf97 100644 (file)
--- 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
@@ -47,7 +47,7 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
     private DataChangeListenerSupport support;
 
     @Before
-    public void setup() {
+    public void setup() throws InterruptedException {
         shard = createShard();
         support = new DataChangeListenerSupport(shard);
     }
@@ -151,8 +151,8 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
         listener.verifyCreatedData(0, innerEntryPath(2, "four"));
     }
 
-    private MockDataChangeListener registerChangeListener(YangInstanceIdentifier path, DataChangeScope scope,
-            int expectedEvents, boolean isLeader) {
+    private MockDataChangeListener registerChangeListener(final YangInstanceIdentifier path, final DataChangeScope scope,
+            final int expectedEvents, final boolean isLeader) {
         MockDataChangeListener listener = new MockDataChangeListener(expectedEvents);
         ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener));
 
@@ -162,6 +162,8 @@ public class DataChangeListenerSupportTest extends AbstractShardTest {
 
     private Shard createShard() {
         TestActorRef<Shard> actor = actorFactory.createTestActor(newShardProps());
+        ShardTestKit.waitUntilLeader(actor);
+
         return actor.underlyingActor();
     }
 }