migrate to mockito 3

pitest-ant/src/test/java/org/pitest/ant/PitestTaskTest.java

@@ -15,8 +15,8 @@
 
 package org.pitest.ant;
 
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.startsWith;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.startsWith;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -36,7 +36,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.pitest.mutationtest.commandline.MutationCoverageReport;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -489,7 +489,7 @@ public void shouldPassMutationMatrixFlagToJavaTask() {
     verify(this.arg).setValue("--fullMutationMatrix=true");
   }
 
-  private static class PathMatcher extends ArgumentMatcher<Path> {
+  private static class PathMatcher implements ArgumentMatcher<Path> {
 
     private final String[] expectedPaths;
 
@@ -498,8 +498,7 @@ public PathMatcher(final String path) {
     }
 
     @Override
-    public boolean matches(final Object argument) {
-      final Path argPath = (Path) argument;
+    public boolean matches(final Path argPath) {
       final String[] paths = argPath.toString().split(File.pathSeparator);
       final boolean matches = paths.length == this.expectedPaths.length;
       if (matches) {

pitest-command-line/src/test/java/org/pitest/mutationtest/commandline/OptionsParserTest.java

@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.pitest.mutationtest.config.ReportOptions.DEFAULT_CHILD_JVM_ARGS;
 
@@ -56,7 +56,7 @@ public class OptionsParserTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     when(this.filter.test(any(String.class))).thenReturn(true);
     this.testee = new OptionsParser(this.filter);
   }

pitest-entry/src/test/java/com/example/MockitoRunnerTest.java

@@ -19,7 +19,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class MockitoRunnerTest {

pitest-entry/src/test/java/org/pitest/classinfo/RepositoryTest.java

@@ -17,8 +17,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -47,7 +47,7 @@ public class RepositoryTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testee = new Repository(new ClassloaderByteArraySource(
         IsolationUtils.getContextClassLoader()), this.hashFunction);
   }

pitest-entry/src/test/java/org/pitest/classinfo/TestToClassMapperTest.java

@@ -34,7 +34,7 @@ public class TestToClassMapperTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.repository = new Repository(this.source);
     this.testee = new TestToClassMapper(this.repository);
   }

pitest-entry/src/test/java/org/pitest/coverage/CoverageDataTest.java

@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.pitest.coverage.CoverageMother.aBlockLocation;
@@ -65,7 +65,7 @@ public class CoverageDataTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     when(this.lm.mapLines(any(ClassName.class))).thenReturn(
         new HashMap<BlockLocation, Set<Integer>>());
     when(this.code.findTestee(any())).thenReturn(Optional.empty());

pitest-entry/src/test/java/org/pitest/coverage/execute/ReceiveTest.java

@@ -32,7 +32,7 @@ public class ReceiveTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.handler = stubHandler();
     this.testee = new Receive(this.handler);
     this.description = new Description("foo", "bar");

pitest-entry/src/test/java/org/pitest/coverage/execute/SendDataTest.java

@@ -25,7 +25,7 @@ public class SendDataTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testClasses = new ArrayList<>();
     this.testee = new SendData(this.arguments, this.testClasses);
   }

pitest-entry/src/test/java/org/pitest/mutationtest/TestMutationTesting.java

@@ -88,7 +88,7 @@ public class TestMutationTesting {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.config = TestPluginArguments.defaults().withTestPlugin(SimpleTestPlugin.NAME);
     this.metaDataExtractor = new MetaDataExtractor();
     this.mae = new MutationAnalysisExecutor(1,

pitest-entry/src/test/java/org/pitest/mutationtest/build/CompoundMutationInterceptorTest.java

@@ -1,7 +1,7 @@
 package org.pitest.mutationtest.build;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.pitest.mutationtest.engine.MutationDetailsMother.aMutationDetail;
@@ -13,7 +13,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.pitest.bytecode.analysis.ClassTree;
 import org.pitest.mutationtest.engine.Mutater;
 import org.pitest.mutationtest.engine.MutationDetails;

pitest-entry/src/test/java/org/pitest/mutationtest/build/DefaultTestPrioritiserTest.java

@@ -1,7 +1,7 @@
 package org.pitest.mutationtest.build;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.pitest.mutationtest.LocationMother.aLocation;
 
@@ -39,7 +39,7 @@ public class DefaultTestPrioritiserTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testee = new DefaultTestPrioritiser(this.coverage);
   }
 

pitest-entry/src/test/java/org/pitest/mutationtest/build/KnownStatusMutationTestUnitTest.java

@@ -22,7 +22,7 @@ public class KnownStatusMutationTestUnitTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
 
   }
 

pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationSourceTest.java

@@ -4,7 +4,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.pitest.classinfo.ClassByteArraySource;
 import org.pitest.classinfo.ClassName;
 import org.pitest.classpath.ClassloaderByteArraySource;
@@ -25,7 +25,7 @@
 import java.util.function.Function;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.pitest.mutationtest.LocationMother.aLocation;
 

pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationTestBuilderTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.pitest.mutationtest.LocationMother.aLocation;
 import static org.pitest.mutationtest.LocationMother.aMutationId;
@@ -31,7 +31,7 @@ public class MutationTestBuilderTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     makeTesteeWithUnitSizeOf(0);
   }
 

pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationTestUnitTest.java

@@ -49,7 +49,7 @@ public class MutationTestUnitTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.mutationConfig = new MutationConfig(this.engine, new LaunchOptions(
         this.javaAgent));
     this.mutations = new ArrayList<>();

pitest-entry/src/test/java/org/pitest/mutationtest/config/CompoundListenerFactoryTest.java

@@ -26,7 +26,7 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -44,7 +44,7 @@ public class CompoundListenerFactoryTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
 
     when(firstChild.provides()).thenReturn(MutationResultListenerFactory.LEGACY_MODE);
     when(secondChild.provides()).thenReturn(MutationResultListenerFactory.LEGACY_MODE);
@@ -63,7 +63,7 @@ public void shouldCreateACombinedListenerForAllChildFactories() {
     when(
         this.secondChild.getListener(any(Properties.class),
             any(ListenerArguments.class))).thenReturn(listenerTwo);
-    this.testee.getListener(null, someArgs()).runStart();
+    this.testee.getListener(new Properties(), someArgs()).runStart();
     verify(listenerOne, times(1)).runStart();
     verify(listenerTwo, times(1)).runStart();
   }

pitest-entry/src/test/java/org/pitest/mutationtest/config/CompoundTestListenerTest.java

@@ -40,7 +40,7 @@ public class CompoundTestListenerTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testee = new CompoundTestListener(Arrays.asList(this.firstChild,
         this.secondChild));
   }

pitest-entry/src/test/java/org/pitest/mutationtest/incremental/DefaultCodeHistoryTest.java

@@ -38,7 +38,7 @@ public class DefaultCodeHistoryTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testee = new DefaultCodeHistory(this.classInfoSource, this.results,
         this.historicClassPath);
   }

pitest-entry/src/test/java/org/pitest/mutationtest/incremental/HistoryListenerTest.java

@@ -22,7 +22,7 @@ public class HistoryListenerTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testee = new HistoryListener(this.store);
   }
 

pitest-entry/src/test/java/org/pitest/mutationtest/incremental/IncrementalAnalyserTest.java

@@ -8,7 +8,7 @@
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.pitest.mutationtest.DetectionStatus.KILLED;
 import static org.pitest.mutationtest.DetectionStatus.NOT_STARTED;
@@ -69,7 +69,7 @@ public void configureLogCatcher() {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testee = new IncrementalAnalyser(this.history, this.coverage);
   }
 
@@ -98,6 +98,8 @@ public void shouldStartNewMutationsAtAStatusOfNotStarted() {
   public void shouldStartPreviousSurvivedMutationsAtAStatusOfNotStartedWhenCoverageHasChanged() {
     final MutationDetails md = makeMutation("foo");
     setHistoryForAllMutationsTo(DetectionStatus.SURVIVED);
+    when(coverage.getCoverageIdForClass(any(ClassName.class)))
+        .thenReturn(BigInteger.ONE);
     when(
         this.history.hasCoverageChanged(any(ClassName.class),
             any(BigInteger.class))).thenReturn(true);

pitest-entry/src/test/java/org/pitest/mutationtest/incremental/ObjectOutputStreamHistoryStoreTest.java

@@ -3,7 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -62,7 +62,7 @@ public void close() {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         when(this.coverage.getCoverageIdForClass(any(ClassName.class))).thenReturn(
             BigInteger.TEN);
     }
@@ -148,4 +148,4 @@ private void recordClassPathWithTestee(
         this.testee.recordClassPath(ids, this.coverage);
     }
 
-}
+}

pitest-entry/src/test/java/org/pitest/mutationtest/report/csv/CSVReportListenerTest.java

@@ -39,7 +39,7 @@ public class CSVReportListenerTest {
 
   @Before
   public void setup() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.testee = new CSVReportListener(this.out);
   }
 

pitest-entry/src/test/java/org/pitest/mutationtest/tooling/DirectorySourceLocatorTest.java

@@ -14,7 +14,7 @@
  */
 package org.pitest.mutationtest.tooling;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -39,7 +39,7 @@ public class DirectorySourceLocatorTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     this.root = new File(".");
     this.testee = new DirectorySourceLocator(this.root, this.locator);
     when(this.locator.apply(any(File.class)))

pitest-entry/src/test/java/org/pitest/mutationtest/tooling/JarCreatingJarFinderTest.java

@@ -36,7 +36,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 public class JarCreatingJarFinderTest {
@@ -51,7 +51,7 @@ public class JarCreatingJarFinderTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     when(this.byteSource.getBytes(anyString())).thenReturn(
         Optional.ofNullable(new byte[1]));
     this.testee = new JarCreatingJarFinder(this.byteSource);