Add OnDemandShardState to report additional Shard state

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java
index 37a6197dd8170d76ea4800c858bac69b5f2b5baa..1a586203a84c937be27f4d3139c56dd3eeef0755 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java
@@ -7,6 +7,8 @@
  */
 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;
@@ -24,14 +26,13 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 
 public class DataTreeChangeListenerActorTest extends AbstractActorTest {
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWhenNotificationsAreEnabled(){
         new JavaTestKit(getSystem()) {{
             final DataTreeCandidate mockTreeCandidate = Mockito.mock(DataTreeCandidate.class);
             final ImmutableList<DataTreeCandidate> mockCandidates = ImmutableList.of(mockTreeCandidate);
             final DOMDataTreeChangeListener mockListener = Mockito.mock(DOMDataTreeChangeListener.class);
-            final Props props = DataTreeChangeListenerActor.props(mockListener);
+            final Props props = DataTreeChangeListenerActor.props(mockListener, TEST_PATH);
             final ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedNotificationsEnabled");
 
             // Let the DataChangeListener know that notifications should be enabled
@@ -46,14 +47,13 @@ public class DataTreeChangeListenerActorTest extends AbstractActorTest {
         }};
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWhenNotificationsAreDisabled(){
         new JavaTestKit(getSystem()) {{
             final DataTreeCandidate mockTreeCandidate = Mockito.mock(DataTreeCandidate.class);
             final ImmutableList<DataTreeCandidate> mockCandidates = ImmutableList.of(mockTreeCandidate);
             final DOMDataTreeChangeListener mockListener = Mockito.mock(DOMDataTreeChangeListener.class);
-            final Props props = DataTreeChangeListenerActor.props(mockListener);
+            final Props props = DataTreeChangeListenerActor.props(mockListener, TEST_PATH);
             final ActorRef subject =
                     getSystem().actorOf(props, "testDataTreeChangedNotificationsDisabled");
 
@@ -72,14 +72,13 @@ public class DataTreeChangeListenerActorTest extends AbstractActorTest {
         }};
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWithNoSender(){
         new JavaTestKit(getSystem()) {{
             final DataTreeCandidate mockTreeCandidate = Mockito.mock(DataTreeCandidate.class);
             final ImmutableList<DataTreeCandidate> mockCandidates = ImmutableList.of(mockTreeCandidate);
             final DOMDataTreeChangeListener mockListener = Mockito.mock(DOMDataTreeChangeListener.class);
-            final Props props = DataTreeChangeListenerActor.props(mockListener);
+            final Props props = DataTreeChangeListenerActor.props(mockListener, TEST_PATH);
             final ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedWithNoSender");
 
             getSystem().eventStream().subscribe(getRef(), DeadLetter.class);
@@ -103,7 +102,6 @@ public class DataTreeChangeListenerActorTest extends AbstractActorTest {
         }};
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void testDataChangedWithListenerRuntimeEx(){
         new JavaTestKit(getSystem()) {{
@@ -117,7 +115,7 @@ public class DataTreeChangeListenerActorTest extends AbstractActorTest {
             final DOMDataTreeChangeListener mockListener = Mockito.mock(DOMDataTreeChangeListener.class);
             Mockito.doThrow(new RuntimeException("mock")).when(mockListener).onDataTreeChanged(mockCandidates2);
 
-            Props props = DataTreeChangeListenerActor.props(mockListener);
+            Props props = DataTreeChangeListenerActor.props(mockListener, TEST_PATH);
             ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedWithListenerRuntimeEx");
 
             // Let the DataChangeListener know that notifications should be enabled