From fa0b3e6ab0ee796b5c9351a6bc2f586531169d31 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Oct 2020 11:45:06 +0200 Subject: [PATCH] Remove use of MockitoAnnotations.initMocks() This method has been deprecated. To deal with it just upgrade tests to use strict runner. Change-Id: I2164ac5eab938f1cc1adf136f8a5394dac886f92 Signed-off-by: Robert Varga --- .../mdsal/binding/dom/adapter/ActionServiceAdapterTest.java | 5 +++-- .../dom/adapter/BindingDOMDataTreeListenerAdapterTest.java | 5 +++-- .../dom/adapter/BindingDOMDataTreeServiceAdapterTest.java | 5 +++-- .../dom/adapter/BindingDOMMountPointListenerAdapterTest.java | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapterTest.java index 214d1ed87f..7e759c6274 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapterTest.java @@ -25,8 +25,9 @@ import com.google.common.util.concurrent.SettableFuture; import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.ActionService; import org.opendaylight.mdsal.dom.api.DOMActionResult; import org.opendaylight.mdsal.dom.api.DOMActionService; @@ -44,6 +45,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class ActionServiceAdapterTest extends AbstractAdapterTest { private static final NodeIdentifier FOO_INPUT = NodeIdentifier.create(operationInputQName(Foo.QNAME.getModule())); private static final NodeIdentifier FOO_OUTPUT = NodeIdentifier.create(operationOutputQName(Foo.QNAME.getModule())); @@ -65,7 +67,6 @@ public class ActionServiceAdapterTest extends AbstractAdapterTest { @Override @Before public void before() { - MockitoAnnotations.initMocks(this); super.before(); domResult = SettableFuture.create(); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapterTest.java index e7a435f8aa..c0e10f7fb2 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapterTest.java @@ -9,20 +9,22 @@ package org.opendaylight.mdsal.binding.dom.adapter; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; -import static org.mockito.MockitoAnnotations.initMocks; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.MoreExecutors; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.DataTreeListener; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingBrokerTestFactory; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingTestContext; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeListeningException; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class BindingDOMDataTreeListenerAdapterTest { private BindingDOMDataTreeListenerAdapter bindingDOMDataTreeListenerAdapter; @@ -32,7 +34,6 @@ public class BindingDOMDataTreeListenerAdapterTest { @Before public void setUp() throws Exception { - initMocks(this); final BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); testFactory.setExecutor(MoreExecutors.newDirectExecutorService()); final BindingTestContext testContext = testFactory.getTestContext(); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapterTest.java index 24f502dc60..93a3627bb6 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapterTest.java @@ -12,17 +12,19 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.MockitoAnnotations.initMocks; import com.google.common.collect.ImmutableSet; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.DataTreeListener; import org.opendaylight.mdsal.binding.api.DataTreeLoopException; import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer; import org.opendaylight.mdsal.dom.api.DOMDataTreeService; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class BindingDOMDataTreeServiceAdapterTest extends AbstractAdapterTest { private BindingDOMDataTreeServiceAdapter bindingDOMDataTreeServiceAdapter; @@ -33,7 +35,6 @@ public class BindingDOMDataTreeServiceAdapterTest extends AbstractAdapterTest { @Override @Before public void before() { - initMocks(this); super.before(); bindingDOMDataTreeServiceAdapter = new BindingDOMDataTreeServiceAdapter(codec, delegate); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java index c22021fd46..82b61b2f31 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java @@ -13,12 +13,13 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.MockitoAnnotations.initMocks; import com.google.common.util.concurrent.MoreExecutors; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.MountPointService.MountPointListener; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingBrokerTestFactory; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingTestContext; @@ -26,6 +27,7 @@ import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class BindingDOMMountPointListenerAdapterTest { private BindingDOMMountPointListenerAdapter bindingDOMMountPointListenerAdapter; @@ -37,7 +39,6 @@ public class BindingDOMMountPointListenerAdapterTest { @Before public void setUp() throws Exception { - initMocks(this); final BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); testFactory.setExecutor(MoreExecutors.newDirectExecutorService()); final BindingTestContext testContext = testFactory.getTestContext(); -- 2.36.6