Add OnDemandShardState to report additional Shard state

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

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 25d47388fe49579fdb66271e4f33ca7effeef314..580a0ab97bcbec82d7399b2b87526c3b5f767ecb 100644 (file)
--- 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
@@ -1,5 +1,15 @@
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 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;
@@ -23,13 +33,13 @@ public class DataChangeListenerTest extends AbstractActorTest {
         new JavaTestKit(getSystem()) {{
             final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
             final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-            final Props props = DataChangeListener.props(mockListener);
+            final Props props = DataChangeListener.props(mockListener, TEST_PATH);
             final ActorRef subject = getSystem().actorOf(props, "testDataChangedNotificationsEnabled");
 
             // Let the DataChangeListener know that notifications should be enabled
             subject.tell(new EnableNotification(true), getRef());
 
-            subject.tell(new DataChanged(CompositeModel.createTestContext(), mockChangeEvent),
+            subject.tell(new DataChanged(mockChangeEvent),
                     getRef());
 
             expectMsgClass(DataChangedReply.class);
@@ -44,11 +54,11 @@ public class DataChangeListenerTest extends AbstractActorTest {
         new JavaTestKit(getSystem()) {{
             final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
             final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-            final Props props = DataChangeListener.props(mockListener);
+            final Props props = DataChangeListener.props(mockListener, TEST_PATH);
             final ActorRef subject =
                 getSystem().actorOf(props, "testDataChangedNotificationsDisabled");
 
-            subject.tell(new DataChanged(CompositeModel.createTestContext(), mockChangeEvent),
+            subject.tell(new DataChanged(mockChangeEvent),
                     getRef());
 
             new Within(duration("1 seconds")) {
@@ -69,13 +79,12 @@ public class DataChangeListenerTest extends AbstractActorTest {
         new JavaTestKit(getSystem()) {{
             final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
             final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-            final Props props = DataChangeListener.props(mockListener);
+            final Props props = DataChangeListener.props(mockListener, TEST_PATH);
             final ActorRef subject = getSystem().actorOf(props, "testDataChangedWithNoSender");
 
             getSystem().eventStream().subscribe(getRef(), DeadLetter.class);
 
-            subject.tell(new DataChanged(CompositeModel.createTestContext(), mockChangeEvent),
-                    ActorRef.noSender());
+            subject.tell(new DataChanged(mockChangeEvent), ActorRef.noSender());
 
             // Make sure no DataChangedReply is sent to DeadLetters.
             while(true) {
@@ -105,7 +114,7 @@ public class DataChangeListenerTest extends AbstractActorTest {
             AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
             Mockito.doThrow(new RuntimeException("mock")).when(mockListener).onDataChanged(mockChangeEvent2);
 
-            Props props = DataChangeListener.props(mockListener);
+            Props props = DataChangeListener.props(mockListener, TEST_PATH);
             ActorRef subject = getSystem().actorOf(props, "testDataChangedWithListenerRuntimeEx");
 
             // Let the DataChangeListener know that notifications should be enabled
@@ -113,13 +122,13 @@ public class DataChangeListenerTest extends AbstractActorTest {
 
             SchemaContext schemaContext = CompositeModel.createTestContext();
 
-            subject.tell(new DataChanged(schemaContext, mockChangeEvent1),getRef());
+            subject.tell(new DataChanged(mockChangeEvent1),getRef());
             expectMsgClass(DataChangedReply.class);
 
-            subject.tell(new DataChanged(schemaContext, mockChangeEvent2),getRef());
+            subject.tell(new DataChanged(mockChangeEvent2),getRef());
             expectMsgClass(DataChangedReply.class);
 
-            subject.tell(new DataChanged(schemaContext, mockChangeEvent3),getRef());
+            subject.tell(new DataChanged(mockChangeEvent3),getRef());
             expectMsgClass(DataChangedReply.class);
 
             Mockito.verify(mockListener).onDataChanged(mockChangeEvent1);