From c44e3a369a4074b059e00cc15a0fdab2e1f8ba51 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 23 Feb 2023 18:42:01 +0100 Subject: [PATCH] Run test with MockitoJUnitRunner Fix an unsafe warning, which unfortunately requires resetting the mock. Change-Id: I9e9ce4bec7d8730fa844f23808de6dc2a722b514 Signed-off-by: Robert Varga --- .../akka/segjournal/SegmentedFileJournalTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java index 7db0d4b87e..92a8b001d1 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java +++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -41,10 +41,14 @@ 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.junit.MockitoJUnitRunner; import org.opendaylight.controller.akka.segjournal.SegmentedJournalActor.AsyncMessage; import org.opendaylight.controller.akka.segjournal.SegmentedJournalActor.WriteMessages; import scala.concurrent.Future; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class SegmentedFileJournalTest { private static final File DIRECTORY = new File("target/sfj-test"); private static final int SEGMENT_SIZE = 1024 * 1024; @@ -52,6 +56,9 @@ public class SegmentedFileJournalTest { private static ActorSystem SYSTEM; + @Mock + private Consumer firstCallback; + private TestKit kit; private ActorRef actor; @@ -219,7 +226,8 @@ public class SegmentedFileJournalTest { } private void assertReplayCount(final int expected) { - Consumer firstCallback = mock(Consumer.class); + // Cast fixes an Eclipse warning 'generic array created' + reset((Object) firstCallback); doNothing().when(firstCallback).accept(any(PersistentRepr.class)); AsyncMessage replay = SegmentedJournalActor.replayMessages(0, Long.MAX_VALUE, Long.MAX_VALUE, firstCallback); -- 2.36.6