X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDataChangeListenerTest.java;h=544a56628c385888e958a23df385a35d07a3fb51;hb=5fd8e6506248cc34da72281a1662612f6c2b2f9a;hp=101a73782b498943acb14b0cb03be2dde5df1f87;hpb=c352d8958cf16d2eded7bb103b7be69546164ce5;p=controller.git

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 101a73782b..544a56628c 100644
--- 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,15 +1,23 @@
+/*
+ * 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 akka.actor.ActorRef;
 import akka.actor.DeadLetter;
 import akka.actor.Props;
 import akka.testkit.JavaTestKit;
+import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.controller.cluster.datastore.messages.DataChanged;
 import org.opendaylight.controller.cluster.datastore.messages.DataChangedReply;
 import org.opendaylight.controller.cluster.datastore.messages.EnableNotification;
-import org.opendaylight.controller.md.cluster.datastore.model.CompositeModel;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener;
 
@@ -17,72 +25,116 @@ public class DataChangeListenerTest extends AbstractActorTest {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
-    public void testDataChangedWhenNotificationsAreEnabled(){
-        new JavaTestKit(getSystem()) {{
-            final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
-            final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-            final Props props = DataChangeListener.props(mockListener);
-            final ActorRef subject = getSystem().actorOf(props, "testDataChangedNotificationsEnabled");
+    public void testDataChangedWhenNotificationsAreEnabled() {
+        new JavaTestKit(getSystem()) {
+            {
+                final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
+                final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
+                final Props props = DataChangeListener.props(mockListener);
+                final ActorRef subject = getSystem().actorOf(props, "testDataChangedNotificationsEnabled");
 
-            // 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 DataChanged(CompositeModel.createTestContext(), mockChangeEvent),
-                    getRef());
+                subject.tell(new DataChanged(mockChangeEvent), getRef());
 
-            expectMsgClass(DataChangedReply.class);
+                expectMsgClass(DataChangedReply.class);
 
-            Mockito.verify(mockListener).onDataChanged(mockChangeEvent);
-        }};
+                Mockito.verify(mockListener).onDataChanged(mockChangeEvent);
+            }
+        };
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
-    public void testDataChangedWhenNotificationsAreDisabled(){
-        new JavaTestKit(getSystem()) {{
-            final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
-            final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-            final Props props = DataChangeListener.props(mockListener);
-            final ActorRef subject =
-                getSystem().actorOf(props, "testDataChangedNotificationsDisabled");
-
-            subject.tell(new DataChanged(CompositeModel.createTestContext(), mockChangeEvent),
-                    getRef());
-
-            new Within(duration("1 seconds")) {
-                @Override
-                protected void run() {
-                    expectNoMsg();
-
-                    Mockito.verify(mockListener, Mockito.never()).onDataChanged(
-                            Mockito.any(AsyncDataChangeEvent.class));
-                }
-            };
-        }};
+    public void testDataChangedWhenNotificationsAreDisabled() {
+        new JavaTestKit(getSystem()) {
+            {
+                final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
+                final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
+                final Props props = DataChangeListener.props(mockListener);
+                final ActorRef subject = getSystem().actorOf(props, "testDataChangedNotificationsDisabled");
+
+                subject.tell(new DataChanged(mockChangeEvent), getRef());
+
+                new Within(duration("1 seconds")) {
+                    @Override
+                    protected void run() {
+                        expectNoMsg();
+
+                        Mockito.verify(mockListener, Mockito.never())
+                                .onDataChanged(Mockito.any(AsyncDataChangeEvent.class));
+                    }
+                };
+            }
+        };
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
-    public void testDataChangedWithNoSender(){
-        new JavaTestKit(getSystem()) {{
-            final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
-            final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
-            final Props props = DataChangeListener.props(mockListener);
-            final ActorRef subject = getSystem().actorOf(props, "testDataChangedWithNoSender");
-
-            // Let the DataChangeListener know that notifications should be enabled
-            subject.tell(new EnableNotification(true), ActorRef.noSender());
-
-            subject.tell(new DataChanged(CompositeModel.createTestContext(), mockChangeEvent),
-                    ActorRef.noSender());
-
-            getSystem().eventStream().subscribe(getRef(), DeadLetter.class);
-            new Within(duration("1 seconds")) {
-                @Override
-                protected void run() {
-                    expectNoMsg();
+    public void testDataChangedWithNoSender() {
+        new JavaTestKit(getSystem()) {
+            {
+                final AsyncDataChangeEvent mockChangeEvent = Mockito.mock(AsyncDataChangeEvent.class);
+                final AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
+                final Props props = DataChangeListener.props(mockListener);
+                final ActorRef subject = getSystem().actorOf(props, "testDataChangedWithNoSender");
+
+                getSystem().eventStream().subscribe(getRef(), DeadLetter.class);
+
+                subject.tell(new DataChanged(mockChangeEvent), 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 DataChangedReply", deadLetter.message() instanceof DataChangedReply);
                 }
-            };
-        }};
+            }
+        };
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Test
+    public void testDataChangedWithListenerRuntimeEx() {
+        new JavaTestKit(getSystem()) {
+            {
+                final AsyncDataChangeEvent mockChangeEvent1 = Mockito.mock(AsyncDataChangeEvent.class);
+                final AsyncDataChangeEvent mockChangeEvent2 = Mockito.mock(AsyncDataChangeEvent.class);
+                final AsyncDataChangeEvent mockChangeEvent3 = Mockito.mock(AsyncDataChangeEvent.class);
+
+                AsyncDataChangeListener mockListener = Mockito.mock(AsyncDataChangeListener.class);
+                Mockito.doThrow(new RuntimeException("mock")).when(mockListener).onDataChanged(mockChangeEvent2);
+
+                Props props = DataChangeListener.props(mockListener);
+                ActorRef subject = getSystem().actorOf(props, "testDataChangedWithListenerRuntimeEx");
+
+                // Let the DataChangeListener know that notifications should be
+                // enabled
+                subject.tell(new EnableNotification(true), getRef());
+
+                subject.tell(new DataChanged(mockChangeEvent1), getRef());
+                expectMsgClass(DataChangedReply.class);
+
+                subject.tell(new DataChanged(mockChangeEvent2), getRef());
+                expectMsgClass(DataChangedReply.class);
+
+                subject.tell(new DataChanged(mockChangeEvent3), getRef());
+                expectMsgClass(DataChangedReply.class);
+
+                Mockito.verify(mockListener).onDataChanged(mockChangeEvent1);
+                Mockito.verify(mockListener).onDataChanged(mockChangeEvent2);
+                Mockito.verify(mockListener).onDataChanged(mockChangeEvent3);
+            }
+        };
     }
 }