Eliminate use of deprecated mockito methods
[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / entityownership / EntityOwnershipListenerSupportTest.java
index 2394ee0bb15b5a6e35e92f2607198ad7cda827b4..b331c9976064c795f7b099c9f698c53501517da8 100644 (file)
@@ -8,16 +8,18 @@
 package org.opendaylight.controller.cluster.datastore.entityownership;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
+
 import akka.actor.ActorContext;
 import akka.actor.ActorRef;
 import akka.actor.Props;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestActorRef;
+import akka.testkit.javadsl.TestKit;
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.ArrayList;
 import java.util.List;
@@ -27,9 +29,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.raft.TestActorFactory;
 import org.opendaylight.controller.cluster.raft.utils.DoNothingActor;
-import org.opendaylight.controller.md.sal.common.api.clustering.Entity;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidate;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListener;
+import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
+import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipChange;
+import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import scala.collection.Iterator;
@@ -61,149 +63,102 @@ public class EntityOwnershipListenerSupportTest extends AbstractEntityOwnershipT
     public void testNotifyEntityOwnershipListeners() {
         EntityOwnershipListenerSupport support = new EntityOwnershipListenerSupport(actorContext, "test");
 
-        EntityOwnershipListener mockListener1 = mock(EntityOwnershipListener.class, "EntityOwnershipListener1");
-        EntityOwnershipListener mockListener2 = mock(EntityOwnershipListener.class, "EntityOwnershipListener2");
-        EntityOwnershipListener mockListener3 = mock(EntityOwnershipListener.class, "EntityOwnershipListener3");
-        Entity entity1 = new Entity("type1", YangInstanceIdentifier.of(QName.create("test", "id1")));
-        Entity entity2 = new Entity("type1", YangInstanceIdentifier.of(QName.create("test", "id2")));
-        Entity entity3 = new Entity("type1", YangInstanceIdentifier.of(QName.create("test", "id3")));
-        Entity entity4 = new Entity("type2", YangInstanceIdentifier.of(QName.create("test", "id4")));
-        Entity entity5 = new Entity("noListener", YangInstanceIdentifier.of(QName.create("test", "id5")));
+        DOMEntityOwnershipListener mockListener1 = mock(DOMEntityOwnershipListener.class, "EntityOwnershipListener1");
+        DOMEntityOwnershipListener mockListener2 = mock(DOMEntityOwnershipListener.class, "EntityOwnershipListener2");
+        DOMEntityOwnershipListener mockListener12 = mock(DOMEntityOwnershipListener.class,
+                "EntityOwnershipListener1_2");
+        String entityType1 = "type1";
+        String entityType2 = "type2";
+        final DOMEntity entity1 = new DOMEntity(entityType1, YangInstanceIdentifier.of(QName.create("test", "id1")));
+        final DOMEntity entity2 = new DOMEntity(entityType2, YangInstanceIdentifier.of(QName.create("test", "id2")));
+        final DOMEntity entity3 = new DOMEntity("noListener", YangInstanceIdentifier.of(QName.create("test", "id5")));
 
         // Add EntityOwnershipListener registrations.
 
-        support.addEntityOwnershipListener(entity1, mockListener1);
-        support.addEntityOwnershipListener(entity1, mockListener1); // register again - should be noop
-        support.addEntityOwnershipListener(entity2, mockListener1);
-        support.addEntityOwnershipListener(entity1, mockListener2);
-        support.addEntityOwnershipListener(entity1.getType(), mockListener3);
+        support.addEntityOwnershipListener(entityType1, mockListener1);
+        support.addEntityOwnershipListener(entityType1, mockListener1); // register again - should be noop
+        support.addEntityOwnershipListener(entityType1, mockListener12);
+        support.addEntityOwnershipListener(entityType2, mockListener2);
 
-        // Notify entity1 changed and verify listeners are notified.
+        // Notify entity1 changed and verify appropriate listeners are notified.
 
         support.notifyEntityOwnershipListeners(entity1, false, true, true);
 
         verify(mockListener1, timeout(5000)).ownershipChanged(ownershipChange(entity1, false, true, true));
-        verify(mockListener2, timeout(5000)).ownershipChanged(ownershipChange(entity1, false, true, true));
-        verify(mockListener3, timeout(5000)).ownershipChanged(ownershipChange(entity1, false, true, true));
-        assertEquals("# of listener actors", 3, actorContext.children().size());
-
-        // Notify entity2 changed and verify only mockListener1 and mockListener3 are notified.
-
-        support.notifyEntityOwnershipListeners(entity2, false, false, false);
-
-        verify(mockListener1, timeout(5000)).ownershipChanged(ownershipChange(entity2, false, false, false));
-        verify(mockListener3, timeout(5000)).ownershipChanged(ownershipChange(entity2, false, false, false));
-        Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS);
-        verify(mockListener2, never()).ownershipChanged(ownershipChange(entity2));
-        assertEquals("# of listener actors", 3, actorContext.children().size());
-
-        // Notify entity3 changed and verify only mockListener3 is notified.
-
-        support.notifyEntityOwnershipListeners(entity3, false, true, true);
-
-        verify(mockListener3, timeout(5000)).ownershipChanged(ownershipChange(entity3, false, true, true));
+        verify(mockListener12, timeout(5000)).ownershipChanged(ownershipChange(entity1, false, true, true));
         Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS);
-        verify(mockListener1, never()).ownershipChanged(ownershipChange(entity3));
-        verify(mockListener2, never()).ownershipChanged(ownershipChange(entity3));
+        verify(mockListener2, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        assertEquals("# of listener actors", 2, actorContext.children().size());
+        reset(mockListener1, mockListener2, mockListener12);
 
-        // Notify entity4 changed and verify no listeners are notified.
+        // Notify entity2 changed and verify appropriate listeners are notified.
 
-        support.notifyEntityOwnershipListeners(entity4, true, false, true);
+        support.notifyEntityOwnershipListeners(entity2, false, true, true);
 
+        verify(mockListener2, timeout(5000)).ownershipChanged(ownershipChange(entity2, false, true, true));
         Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS);
-        verify(mockListener1, never()).ownershipChanged(ownershipChange(entity4));
-        verify(mockListener2, never()).ownershipChanged(ownershipChange(entity4));
-        verify(mockListener3, never()).ownershipChanged(ownershipChange(entity4));
+        verify(mockListener1, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        verify(mockListener12, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        assertEquals("# of listener actors", 3, actorContext.children().size());
+        reset(mockListener1, mockListener2, mockListener12);
 
-        // Notify entity5 changed and verify no listener is notified.
+        // Notify entity3 changed and verify no listeners are notified.
 
-        support.notifyEntityOwnershipListeners(entity5, true, false, true);
+        support.notifyEntityOwnershipListeners(entity3, true, false, true);
 
         Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS);
-        verify(mockListener1, never()).ownershipChanged(ownershipChange(entity4));
-        verify(mockListener2, never()).ownershipChanged(ownershipChange(entity4));
-        verify(mockListener3, never()).ownershipChanged(ownershipChange(entity4));
+        verify(mockListener1, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        verify(mockListener2, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        verify(mockListener12, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        reset(mockListener1, mockListener2, mockListener12);
 
-        reset(mockListener1, mockListener2, mockListener3);
+        Iterable<ActorRef> listenerActors = actorContext.children();
+        assertEquals("# of listener actors", 3, listenerActors.size());
 
-        // Unregister mockListener1 for entity1, issue a change and verify only mockListeners 2 & 3 are notified.
+        // Unregister mockListener1, issue a change for entity1 and verify only remaining listeners are notified.
 
-        support.removeEntityOwnershipListener(entity1, mockListener1);
+        support.removeEntityOwnershipListener(entityType1, mockListener1);
         support.notifyEntityOwnershipListeners(entity1, true, false, true);
 
-        verify(mockListener2, timeout(5000)).ownershipChanged(ownershipChange(entity1, true, false, true));
-        verify(mockListener3, timeout(5000)).ownershipChanged(ownershipChange(entity1, true, false, true));
-        Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS);
-        verify(mockListener1, never()).ownershipChanged(ownershipChange(entity1));
-
-        // Unregister mockListener3, issue a change for entity1 and verify only mockListeners2 is notified.
-
-        reset(mockListener1, mockListener2, mockListener3);
-
-        support.removeEntityOwnershipListener(entity1.getType(), mockListener3);
-        support.notifyEntityOwnershipListeners(entity1, false, false, false);
-
-        verify(mockListener2, timeout(5000)).ownershipChanged(ownershipChange(entity1, false, false, false));
+        verify(mockListener12, timeout(5000)).ownershipChanged(ownershipChange(entity1, true, false, true));
         Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS);
-        verify(mockListener1, never()).ownershipChanged(ownershipChange(entity1));
-        verify(mockListener3, never()).ownershipChanged(ownershipChange(entity1));
+        verify(mockListener1, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        reset(mockListener1, mockListener2, mockListener12);
 
-        // Completely unregister all listeners and verify their listener actors are destroyed.
+        // Unregister all listeners and verify their listener actors are destroyed.
 
-        Iterable<ActorRef> listenerActors = actorContext.children();
-        assertEquals("# of listener actors", 2, listenerActors.size());
-
-        List<JavaTestKit> watchers = new ArrayList<>();
-        for(Iterator<ActorRef> iter = listenerActors.iterator(); iter.hasNext();) {
-            JavaTestKit kit = new JavaTestKit(getSystem());
+        List<TestKit> watchers = new ArrayList<>();
+        for (Iterator<ActorRef> iter = listenerActors.iterator(); iter.hasNext();) {
+            TestKit kit = new TestKit(getSystem());
             kit.watch(iter.next());
             watchers.add(kit);
         }
 
-        support.removeEntityOwnershipListener(entity2, mockListener1);
-        support.removeEntityOwnershipListener(entity2, mockListener1); // un-register again - shoild be noop
-        support.removeEntityOwnershipListener(entity1, mockListener2);
+        support.removeEntityOwnershipListener(entityType1, mockListener12);
+        support.removeEntityOwnershipListener(entityType1, mockListener12); // un-register again - should be noop
+        support.removeEntityOwnershipListener(entityType2, mockListener2);
 
         Iterator<ActorRef> iter = listenerActors.iterator();
-        for(JavaTestKit kit: watchers) {
-            kit.expectTerminated(JavaTestKit.duration("3 seconds"), iter.next());
+        for (TestKit kit: watchers) {
+            kit.expectTerminated(kit.duration("3 seconds"), iter.next());
         }
 
         assertEquals("# of listener actors", 0, actorContext.children().size());
 
-        // Re-register mockListener1 for entity1 and verify it is notified.
+        // Re-register mockListener1 and verify it is notified.
 
         reset(mockListener1, mockListener2);
 
-        support.addEntityOwnershipListener(entity1, mockListener1);
-
+        support.addEntityOwnershipListener(entityType1, mockListener1);
         support.notifyEntityOwnershipListeners(entity1, false, false, true);
 
         verify(mockListener1, timeout(5000)).ownershipChanged(ownershipChange(entity1, false, false, true));
-        verify(mockListener2, never()).ownershipChanged(ownershipChange(entity1));
-        verify(mockListener3, never()).ownershipChanged(ownershipChange(entity1));
+        verify(mockListener12, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
+        verify(mockListener2, never()).ownershipChanged(any(DOMEntityOwnershipChange.class));
 
         // Quickly register and unregister mockListener2 - expecting no exceptions.
 
-        support.addEntityOwnershipListener(entity1, mockListener2);
-        support.removeEntityOwnershipListener(entity1, mockListener2);
-    }
-
-    @Test
-    public void testHasCandidateForEntity() {
-        EntityOwnershipListenerSupport support = new EntityOwnershipListenerSupport(actorContext, "test");
-        Entity entity = new Entity("type", YangInstanceIdentifier.of(QName.create("test", "id")));
-
-        assertEquals("hasCandidateForEntity", false, support.hasCandidateForEntity(entity));
-
-        support.addEntityOwnershipListener(entity, mock(EntityOwnershipListener.class));
-        assertEquals("hasCandidateForEntity", false, support.hasCandidateForEntity(entity));
-
-        EntityOwnershipCandidate candidate = mock(EntityOwnershipCandidate.class);
-        support.addEntityOwnershipListener(entity, candidate);
-        assertEquals("hasCandidateForEntity", true, support.hasCandidateForEntity(entity));
-
-        support.removeEntityOwnershipListener(entity, candidate);
-        assertEquals("hasCandidateForEntity", false, support.hasCandidateForEntity(entity));
+        support.addEntityOwnershipListener(entityType1, mockListener2);
+        support.removeEntityOwnershipListener(entityType1, mockListener2);
     }
 }