From 860d2ae83c910ed7a232cee3750cce497d23d268 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 22 Oct 2020 20:47:33 +0200 Subject: [PATCH] Migrate ReplicatedLogImplTest Use MockitoJUnitRunner to initialize mocks, which shows we have unneeded stubbings. Change-Id: Ib907fa4b027d063d3a0c3d7b9c0e94115ab39495 Signed-off-by: Robert Varga --- .../cluster/raft/ReplicatedLogImplTest.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java index 35ecd77d39..5b8ec2ec15 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.cluster.raft; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.same; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; @@ -22,11 +21,12 @@ import java.util.Collections; import java.util.function.Consumer; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.internal.matchers.Same; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.cluster.DataPersistenceProvider; import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload; import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; @@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory; * * @author Thomas Pantelis */ +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class ReplicatedLogImplTest { private static final Logger LOG = LoggerFactory.getLogger(RaftActorRecoverySupportTest.class); @@ -54,8 +55,6 @@ public class ReplicatedLogImplTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); - context = new RaftActorContextImpl(null, null, "test", new ElectionTermImpl(mockPersistence, "test", LOG), -1, -1, Collections.emptyMap(), configParams, mockPersistence, applyState -> { }, LOG, MoreExecutors.directExecutor()); @@ -78,8 +77,8 @@ public class ReplicatedLogImplTest { procedure.getValue().apply(message); } - @SuppressWarnings("unchecked") @Test + @SuppressWarnings("unchecked") public void testAppendAndPersistExpectingNoCapture() throws Exception { ReplicatedLog log = ReplicatedLogImpl.newInstance(context); @@ -131,8 +130,6 @@ public class ReplicatedLogImplTest { public void testAppendAndPersistExpectingCaptureDueToJournalCount() throws Exception { configParams.setSnapshotBatchCount(2); - doReturn(1L).when(mockBehavior).getReplicatedToAllIndex(); - ReplicatedLog log = ReplicatedLogImpl.newInstance(context); final ReplicatedLogEntry logEntry1 = new SimpleReplicatedLogEntry(2, 1, new MockPayload("2")); @@ -152,8 +149,6 @@ public class ReplicatedLogImplTest { @Test public void testAppendAndPersistExpectingCaptureDueToDataSize() throws Exception { - doReturn(1L).when(mockBehavior).getReplicatedToAllIndex(); - context.setTotalMemoryRetriever(() -> 100); ReplicatedLog log = ReplicatedLogImpl.newInstance(context); -- 2.36.6