From 94814a5aaa12aa5d72a7b98042d0d48bbcd92fc6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 19 Mar 2021 09:26:28 +0100 Subject: [PATCH] Clean up use of MockitoAnnotations.initMocks Using MockitoAnnotations.initMocks() is deprecated, use JUnitRunner in cds-access-client and sal-clustering-commons. Change-Id: I10b52bfd0a989f722538e3983352c4465f918950 Signed-off-by: Robert Varga --- .../access/client/AbstractClientActorTest.java | 2 -- .../access/client/AbstractClientConnectionTest.java | 2 -- .../cluster/access/client/AccessClientUtil.java | 13 +++++++------ .../access/client/ClientActorContextTest.java | 5 +++-- .../client/ConnectingClientConnectionTest.java | 8 +++----- .../cluster/access/client/ConnectionEntryTest.java | 8 +++----- .../common/actor/QuarantinedMonitorActorTest.java | 6 +++--- .../cluster/persistence/LocalSnapshotStoreTest.java | 5 +++-- 8 files changed, 22 insertions(+), 27 deletions(-) diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorTest.java index 889bd58990..699e62191f 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorTest.java @@ -21,8 +21,6 @@ import org.opendaylight.controller.cluster.access.concepts.MemberName; /** * Abstract base class for client actors and their components. - * - * @author Robert Varga */ public abstract class AbstractClientActorTest { private static final MemberName MEMBER_NAME = MemberName.forName("member-1"); diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java index 36d97a1436..403ecbd6cc 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java @@ -28,7 +28,6 @@ import java.util.function.Consumer; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mockito.MockitoAnnotations; import org.opendaylight.controller.cluster.access.commands.AbortLocalTransactionRequest; import org.opendaylight.controller.cluster.access.commands.TransactionAbortSuccess; import org.opendaylight.controller.cluster.access.commands.TransactionFailure; @@ -64,7 +63,6 @@ public abstract class AbstractClientConnectionTest { private static final long serialVersionUID = 1L; @@ -136,8 +136,6 @@ public class ConnectingClientConnectionTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); - doNothing().when(mockCallback).accept(any(MockFailure.class)); ticker = new FakeTicker(); diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java index 1bb921c48b..2d1afb81ad 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java @@ -22,8 +22,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; 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.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.AbstractRequestFailureProxy; import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy; @@ -35,9 +36,8 @@ import org.opendaylight.yangtools.concepts.WritableIdentifier; /** * Test suite covering logic contained in {@link ConnectionEntry}. - * - * @author Robert Varga */ +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class ConnectionEntryTest { private static class MockFailure extends RequestFailure { private static final long serialVersionUID = 1L; @@ -113,8 +113,6 @@ public class ConnectionEntryTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); - doNothing().when(mockCallback).accept(any(MockFailure.class)); ticker = new FakeTicker(); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActorTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActorTest.java index caffa698f1..fd223e2efe 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActorTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActorTest.java @@ -23,10 +23,12 @@ import akka.testkit.javadsl.TestKit; import org.junit.After; 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 scala.Option; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class QuarantinedMonitorActorTest { private static final Address LOCAL = Address.apply("http", "local"); @@ -39,7 +41,6 @@ public class QuarantinedMonitorActorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); system = ActorSystem.apply(); actor = system.actorOf(QuarantinedMonitorActor.props(callback)); } @@ -90,5 +91,4 @@ public class QuarantinedMonitorActorTest { actor.tell(event, ActorRef.noSender()); verify(callback, never()).apply(); } - } \ No newline at end of file diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java index 7115dd8475..8531501fa2 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java @@ -42,7 +42,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.mockito.MockitoAnnotations; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; import scala.Option; /** @@ -51,6 +52,7 @@ import scala.Option; * * @author Thomas Pantelis */ +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class LocalSnapshotStoreTest { private static final String PERSISTENCE_ID = "member-1-shard-default-config"; private static final String PREFIX_BASED_SHARD_PERSISTENCE_ID = "member-1-shard-id-ints!-config"; @@ -74,7 +76,6 @@ public class LocalSnapshotStoreTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); cleanSnapshotDir(); } -- 2.36.6