Replace deprecated initMocks() in topology-manager

initMocks has been deprecated. Use MockitoJUnitRunner instead
and remove unnecessary stubbings in topology-manager.

JIRA: OPNFLWPLUG-1122
Change-Id: I2ebeb322a1feaa78c7f2afbffe2a6fab0d9add52
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/DataTreeChangeListenerBase.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/DataTreeChangeListenerBase.java
index 4d1d62a189c0c67ba2419ab032a119379de4a46e..256aaada0766ad1327b8cc365e98e427072e7590 100644 (file)
--- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/DataTreeChangeListenerBase.java
+++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/DataTreeChangeListenerBase.java
@@ -16,8 +16,9 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
@@ -38,6 +39,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 
+@RunWith(MockitoJUnitRunner.class)
 public abstract class DataTreeChangeListenerBase {
 
     private OperationProcessor processor;
@@ -52,8 +54,6 @@ public abstract class DataTreeChangeListenerBase {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
         doReturn(mockTxChain).when(mockDataBroker).createTransactionChain(any(TransactionChainListener.class));
 
         processor = new OperationProcessor(mockDataBroker);
@@ -80,13 +80,16 @@ public abstract class DataTreeChangeListenerBase {
     }
 
     protected <T extends DataObject> DataTreeModification<T> setupDataTreeChange(final ModificationType type,
-                                                                              final InstanceIdentifier<T> ii) {
+                                                                                 final InstanceIdentifier<T> ii,
+                                                                                 final boolean getDataAfter) {
         final DataTreeModification dataTreeModification = mock(DataTreeModification.class);
         final DataTreeIdentifier<T> identifier = DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, ii);
         when(dataTreeModification.getRootNode()).thenReturn(mock(DataObjectModification.class));
         when(dataTreeModification.getRootNode().getModificationType()).thenReturn(type);
         when(dataTreeModification.getRootPath()).thenReturn(identifier);
-        when(dataTreeModification.getRootNode().getDataAfter()).thenReturn(mock(FlowCapableNodeConnector.class));
+        if (getDataAfter) {
+            when(dataTreeModification.getRootNode().getDataAfter()).thenReturn(mock(FlowCapableNodeConnector.class));
+        }
         return dataTreeModification;
     }
 }

diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java
index d404fb285ea727dbd65ce69f1887aaaa5a4c80a7..344473aa26dc9effa590a5ffda60a8ccb5eac75a 100644 (file)
--- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java
+++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java
@@ -30,9 +30,10 @@ import java.util.concurrent.Executors;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.binding.api.TransactionChain;
@@ -51,6 +52,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@RunWith(MockitoJUnitRunner.class)
 public class FlowCapableTopologyExporterTest {
 
     private OperationProcessor processor;
@@ -64,8 +66,6 @@ public class FlowCapableTopologyExporterTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
         doReturn(mockTxChain).when(mockDataBroker)
                 .createTransactionChain(any(TransactionChainListener.class));
 

diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImplTest.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImplTest.java
index 320c26eca9d7a6155be1f41a3db6ecb533057712..6ad359e5cc4a678502b2bc7591600577efbd8507 100644 (file)
--- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImplTest.java
+++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImplTest.java
@@ -88,7 +88,6 @@ public class NodeChangeListenerImplTest extends DataTreeChangeListenerBase {
 
         SettableFuture<Optional<Node>> readFutureNode = SettableFuture.create();
         readFutureNode.set(Optional.of(topoNode));
-        doReturn(FluentFuture.from(readFutureNode)).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topoNodeII);
 
         final CountDownLatch submitLatch1 = setupStubbedSubmit(mockTx1);
 
@@ -100,7 +99,7 @@ public class NodeChangeListenerImplTest extends DataTreeChangeListenerBase {
 
         doReturn(mockTx1).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeID, false);
         nodeChangeListener.onDataTreeChanged(Collections.singleton(dataTreeModification));
 
         waitForSubmit(submitLatch1);
@@ -137,9 +136,6 @@ public class NodeChangeListenerImplTest extends DataTreeChangeListenerBase {
                 .read(LogicalDatastoreType.OPERATIONAL, topologyIID);
         final CountDownLatch submitLatch = setupStubbedSubmit(mockTx);
 
-        doReturn(FluentFutures.immediateFluentFuture(Optional.of(topoNode))).when(mockTx)
-            .read(LogicalDatastoreType.OPERATIONAL, topoNodeII);
-
         CountDownLatch deleteLatch = new CountDownLatch(1);
         ArgumentCaptor<InstanceIdentifier> deletedLinkIDs =
                 ArgumentCaptor.forClass(InstanceIdentifier.class);
@@ -147,7 +143,7 @@ public class NodeChangeListenerImplTest extends DataTreeChangeListenerBase {
 
         doReturn(mockTx).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeID, false);
         nodeChangeListener.onDataTreeChanged(Collections.singleton(dataTreeModification));
 
         waitForSubmit(submitLatch);
@@ -170,7 +166,7 @@ public class NodeChangeListenerImplTest extends DataTreeChangeListenerBase {
         CountDownLatch submitLatch = setupStubbedSubmit(mockTx);
         doReturn(mockTx).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeID, false);
         nodeChangeListener.onDataTreeChanged(Collections.singleton(dataTreeModification));
 
         waitForSubmit(submitLatch);

diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java
index 02bf1c9cbe0b921002448731842674196b46045c..7764242662a9d6566980cfba7db1c49116d02182 100644 (file)
--- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java
+++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java
@@ -112,7 +112,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
 
         doReturn(mockTx1).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeConnID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeConnID, false);
         terminationPointListener.onDataTreeChanged(Collections.singleton(dataTreeModification));
 
         waitForSubmit(submitLatch1);
@@ -164,7 +164,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
 
         doReturn(mockTx).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeConnID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(DELETE, invNodeConnID, false);
         terminationPointListener.onDataTreeChanged(Collections.singleton(dataTreeModification));
 
         waitForSubmit(submitLatch);
@@ -189,7 +189,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
         CountDownLatch submitLatch = setupStubbedSubmit(mockTx);
         doReturn(mockTx).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeConnID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeConnID, true);
         terminationPointListener.onDataTreeChanged(Collections.singleton(dataTreeModification));
 
         waitForSubmit(submitLatch);
@@ -239,7 +239,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
 
         doReturn(mockTx).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeConnID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeConnID, false);
         when(dataTreeModification.getRootNode().getDataAfter())
                 .thenReturn(provideFlowCapableNodeConnector(true, false));
         terminationPointListener.onDataTreeChanged(Collections.singleton(dataTreeModification));
@@ -286,7 +286,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
 
         doReturn(mockTx).when(mockTxChain).newReadWriteTransaction();
 
-        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeConnID);
+        DataTreeModification dataTreeModification = setupDataTreeChange(WRITE, invNodeConnID, false);
         when(dataTreeModification.getRootNode().getDataAfter())
                 .thenReturn(provideFlowCapableNodeConnector(false, true));
         terminationPointListener.onDataTreeChanged(Collections.singleton(dataTreeModification));