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%2FDataTreeChangeListenerActorTest.java;h=62b95c214b1d50068ffec642821adae9bb1913c9;hp=73d520dfc34da0123bf7f2cc2c5b5570a0725613;hb=7204c455a1636a7fc89bcd28fe9e9000eaa81b3b;hpb=fcc7cfb5ff0efacb4460567a9a7df83988fdcfec

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 73d520dfc3..62b95c214b 100644
--- 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;
@@ -25,112 +27,120 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 public class DataTreeChangeListenerActorTest extends AbstractActorTest {
 
     @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 ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedNotificationsEnabled");
+    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, TEST_PATH);
+                final ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedNotificationsEnabled");
 
-            // Let the DataChangeListener know that notifications should be enabled
-            subject.tell(new EnableNotification(true), getRef());
+                // Let the DataChangeListener know that notifications should be
+                // enabled
+                subject.tell(new EnableNotification(true), getRef());
 
-            subject.tell(new DataTreeChanged(mockCandidates),
-                    getRef());
+                subject.tell(new DataTreeChanged(mockCandidates), getRef());
 
-            expectMsgClass(DataTreeChangedReply.class);
+                expectMsgClass(DataTreeChangedReply.class);
 
-            Mockito.verify(mockListener).onDataTreeChanged(mockCandidates);
-        }};
+                Mockito.verify(mockListener).onDataTreeChanged(mockCandidates);
+            }
+        };
     }
 
     @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 ActorRef subject =
-                    getSystem().actorOf(props, "testDataTreeChangedNotificationsDisabled");
-
-            subject.tell(new DataTreeChanged(mockCandidates),
-                    getRef());
-
-            new Within(duration("1 seconds")) {
-                @Override
-                protected void run() {
-                    expectNoMsg();
-
-                    Mockito.verify(mockListener, Mockito.never()).onDataTreeChanged(
-                            Matchers.anyCollectionOf(DataTreeCandidate.class));
-                }
-            };
-        }};
+    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, TEST_PATH);
+                final ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedNotificationsDisabled");
+
+                subject.tell(new DataTreeChanged(mockCandidates), getRef());
+
+                new Within(duration("1 seconds")) {
+                    @Override
+                    protected void run() {
+                        expectNoMsg();
+
+                        Mockito.verify(mockListener, Mockito.never())
+                                .onDataTreeChanged(Matchers.anyCollectionOf(DataTreeCandidate.class));
+                    }
+                };
+            }
+        };
     }
 
     @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 ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedWithNoSender");
-
-            getSystem().eventStream().subscribe(getRef(), DeadLetter.class);
-
-            subject.tell(new DataTreeChanged(mockCandidates), ActorRef.noSender());
-
-            // Make sure no DataChangedReply is sent to DeadLetters.
-            while(true) {
-                DeadLetter deadLetter;
-                try {
-                    deadLetter = expectMsgClass(duration("1 seconds"), DeadLetter.class);
-                } catch (AssertionError e) {
-                    // Timed out - got no DeadLetter - this is good
-                    break;
+    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, TEST_PATH);
+                final ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedWithNoSender");
+
+                getSystem().eventStream().subscribe(getRef(), DeadLetter.class);
+
+                subject.tell(new DataTreeChanged(mockCandidates), ActorRef.noSender());
+
+                // Make sure no DataChangedReply is sent to DeadLetters.
+                while (true) {
+                    DeadLetter deadLetter;
+                    try {
+                        deadLetter = expectMsgClass(duration("1 seconds"), DeadLetter.class);
+                    } catch (AssertionError e) {
+                        // Timed out - got no DeadLetter - this is good
+                        break;
+                    }
+
+                    // We may get DeadLetters for other messages we don't care
+                    // about.
+                    Assert.assertFalse("Unexpected DataTreeChangedReply",
+                            deadLetter.message() instanceof DataTreeChangedReply);
                 }
-
-                // We may get DeadLetters for other messages we don't care about.
-                Assert.assertFalse("Unexpected DataTreeChangedReply",
-                        deadLetter.message() instanceof DataTreeChangedReply);
             }
-        }};
+        };
     }
 
     @Test
-    public void testDataChangedWithListenerRuntimeEx(){
-        new JavaTestKit(getSystem()) {{
-            final DataTreeCandidate mockTreeCandidate1 = Mockito.mock(DataTreeCandidate.class);
-            final ImmutableList<DataTreeCandidate> mockCandidates1 = ImmutableList.of(mockTreeCandidate1);
-            final DataTreeCandidate mockTreeCandidate2 = Mockito.mock(DataTreeCandidate.class);
-            final ImmutableList<DataTreeCandidate> mockCandidates2 = ImmutableList.of(mockTreeCandidate2);
-            final DataTreeCandidate mockTreeCandidate3 = Mockito.mock(DataTreeCandidate.class);
-            final ImmutableList<DataTreeCandidate> mockCandidates3 = ImmutableList.of(mockTreeCandidate3);
-
-            final DOMDataTreeChangeListener mockListener = Mockito.mock(DOMDataTreeChangeListener.class);
-            Mockito.doThrow(new RuntimeException("mock")).when(mockListener).onDataTreeChanged(mockCandidates2);
-
-            Props props = DataTreeChangeListenerActor.props(mockListener);
-            ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedWithListenerRuntimeEx");
-
-            // Let the DataChangeListener know that notifications should be enabled
-            subject.tell(new EnableNotification(true), getRef());
-
-            subject.tell(new DataTreeChanged(mockCandidates1),getRef());
-            expectMsgClass(DataTreeChangedReply.class);
-
-            subject.tell(new DataTreeChanged(mockCandidates2),getRef());
-            expectMsgClass(DataTreeChangedReply.class);
-
-            subject.tell(new DataTreeChanged(mockCandidates3),getRef());
-            expectMsgClass(DataTreeChangedReply.class);
-
-            Mockito.verify(mockListener).onDataTreeChanged(mockCandidates1);
-            Mockito.verify(mockListener).onDataTreeChanged(mockCandidates2);
-            Mockito.verify(mockListener).onDataTreeChanged(mockCandidates3);
-        }};
+    public void testDataChangedWithListenerRuntimeEx() {
+        new JavaTestKit(getSystem()) {
+            {
+                final DataTreeCandidate mockTreeCandidate1 = Mockito.mock(DataTreeCandidate.class);
+                final ImmutableList<DataTreeCandidate> mockCandidates1 = ImmutableList.of(mockTreeCandidate1);
+                final DataTreeCandidate mockTreeCandidate2 = Mockito.mock(DataTreeCandidate.class);
+                final ImmutableList<DataTreeCandidate> mockCandidates2 = ImmutableList.of(mockTreeCandidate2);
+                final DataTreeCandidate mockTreeCandidate3 = Mockito.mock(DataTreeCandidate.class);
+                final ImmutableList<DataTreeCandidate> mockCandidates3 = ImmutableList.of(mockTreeCandidate3);
+
+                final DOMDataTreeChangeListener mockListener = Mockito.mock(DOMDataTreeChangeListener.class);
+                Mockito.doThrow(new RuntimeException("mock")).when(mockListener).onDataTreeChanged(mockCandidates2);
+
+                Props props = DataTreeChangeListenerActor.props(mockListener, TEST_PATH);
+                ActorRef subject = getSystem().actorOf(props, "testDataTreeChangedWithListenerRuntimeEx");
+
+                // Let the DataChangeListener know that notifications should be
+                // enabled
+                subject.tell(new EnableNotification(true), getRef());
+
+                subject.tell(new DataTreeChanged(mockCandidates1), getRef());
+                expectMsgClass(DataTreeChangedReply.class);
+
+                subject.tell(new DataTreeChanged(mockCandidates2), getRef());
+                expectMsgClass(DataTreeChangedReply.class);
+
+                subject.tell(new DataTreeChanged(mockCandidates3), getRef());
+                expectMsgClass(DataTreeChangedReply.class);
+
+                Mockito.verify(mockListener).onDataTreeChanged(mockCandidates1);
+                Mockito.verify(mockListener).onDataTreeChanged(mockCandidates2);
+                Mockito.verify(mockListener).onDataTreeChanged(mockCandidates3);
+            }
+        };
     }
 }