fix package of argument matchers

openrewrite · Oct 30, 2023 · 0c28f55 · 0c28f55
1 parent c56a747
commit 0c28f55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/jmockit/JMockitExpectationsToMockito.java b/src/main/java/org/openrewrite/java/testing/jmockit/JMockitExpectationsToMockito.java
@@ -175,10 +175,10 @@ private void rewriteArgumentMatchers(ExecutionContext ctx, List<Object> template
                     continue;
                 }
                 String argumentMatcher = ((J.Identifier) methodArgument).getSimpleName();
-                maybeAddImport("org.mockito.Mockito", argumentMatcher);
+                maybeAddImport("org.mockito.ArgumentMatchers", argumentMatcher);
                 newArguments.add(JavaTemplate.builder(argumentMatcher + "()")
                         .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "mockito-core-3.12"))
-                        .staticImports("org.mockito.Mockito." + argumentMatcher)
+                        .staticImports("org.mockito.ArgumentMatchers." + argumentMatcher)
                         .build()
                         .apply(
                                 new Cursor(getCursor(), methodArgument),

diff --git a/src/test/java/org/openrewrite/java/testing/jmockit/JMockitToMockitoTest.java b/src/test/java/org/openrewrite/java/testing/jmockit/JMockitToMockitoTest.java
@@ -258,7 +258,7 @@ void test() {
               import org.mockito.junit.jupiter.MockitoExtension;
                             
               import static org.junit.jupiter.api.Assertions.assertEquals;
-              import static org.mockito.Mockito.anyString;
+              import static org.mockito.ArgumentMatchers.anyString;
               import static org.mockito.Mockito.when;
 
               @ExtendWith(MockitoExtension.class)
@@ -516,7 +516,10 @@ void test() {
 
               import static org.junit.jupiter.api.Assertions.assertEquals;
               import static org.junit.jupiter.api.Assertions.assertNull;
-              import static org.mockito.Mockito.*;
+              import static org.mockito.ArgumentMatchers.anyLong;
+              import static org.mockito.ArgumentMatchers.anyString;
+              import static org.mockito.Mockito.doNothing;
+              import static org.mockito.Mockito.when;
 
               @ExtendWith(MockitoExtension.class)
               class MyTest {