Supporting arguments in PowerMockitoWhenNewToMockito (#686)

* Supporting arguments in PowerMockitoWhenNewToMockito

* Adding test coverage for withAnyArguments()

Author: greg-at-moderne

src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoWhenNewToMockito.java

@@ -35,7 +35,9 @@
 public class PowerMockitoWhenNewToMockito extends Recipe {
 
     private static final MethodMatcher PM_WHEN_NEW = new MethodMatcher("org.powermock.api.mockito.PowerMockito whenNew(..)");
-    private static final MethodMatcher WITH_NO_ARGUMENTS = new MethodMatcher("*..* withNoArguments(..)");
+    private static final MethodMatcher WITH_NO_ARGUMENTS = new MethodMatcher("*..* withNoArguments()");
+    private static final MethodMatcher WITH_ARGUMENTS = new MethodMatcher("*..* withArguments(..)");
+    private static final MethodMatcher WITH_ANY_ARGUMENTS = new MethodMatcher("*..* withAnyArguments()");
     private static final MethodMatcher THEN_RETURN = new MethodMatcher("org.mockito.stubbing.OngoingStubbing thenReturn(..)");
     private static final MethodMatcher MOCKITO_MOCK = new MethodMatcher("org.mockito.Mockito mock(..)");
     private static final MethodMatcher PM_MOCK = new MethodMatcher("org.powermock.api.mockito.PowerMockito mock(..)");
@@ -57,7 +59,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public @Nullable J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 if (THEN_RETURN.matches(method) && method.getSelect() instanceof J.MethodInvocation) {
                     J.MethodInvocation select1 = (J.MethodInvocation) method.getSelect();
-                    if (WITH_NO_ARGUMENTS.matches(select1) && select1.getSelect() instanceof J.MethodInvocation) {
+                    boolean withArgumentsMethodMatch = WITH_ANY_ARGUMENTS.matches(select1) || WITH_ARGUMENTS.matches(select1) || WITH_NO_ARGUMENTS.matches(select1);
+                    if (withArgumentsMethodMatch && select1.getSelect() instanceof J.MethodInvocation) {
                         J.MethodInvocation select2 = (J.MethodInvocation) select1.getSelect();
                         if (PM_WHEN_NEW.matches(select2) && select2.getArguments().size() == 1) {
                             maybeRemoveImport("org.powermock.api.mockito.PowerMockito");
@@ -112,8 +115,7 @@ private JavaIsoVisitor<ExecutionContext> removeMockUsagesVisitor(List<J.FieldAcc
                     @Override
                     public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
                         J.VariableDeclarations ret = super.visitVariableDeclarations(multiVariable, ctx);
-                        Cursor containingMethod = getCursor().dropParentUntil(x -> x instanceof J.MethodDeclaration);
-                        if (!inMethod.equals(containingMethod.getValue())) {
+                        if (!inMethod.equals(getCursor().firstEnclosing(J.MethodDeclaration.class))) {
                             return ret;
                         }
                         List<J.VariableDeclarations.NamedVariable> variables = ListUtils.filter(ret.getVariables(), varr -> {

src/test/java/org/openrewrite/java/testing/mockito/ReplacePowerMockitoIntegrationTest.java

@@ -16,6 +16,8 @@
 package org.openrewrite.java.testing.mockito;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.openrewrite.DocumentExample;
 import org.openrewrite.InMemoryExecutionContext;
 import org.openrewrite.java.JavaParser;
@@ -819,4 +821,67 @@ public final void testNumbers() throws Exception {
           )
         );
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"withArguments(\"Have a nice day!\")", "withAnyArguments()"})
+    void whenNewWithArguments(String methodCall) {
+        //language=java
+        rewriteRun(
+          java(
+            """
+            import org.powermock.api.mockito.PowerMockito;
+            import static org.powermock.api.mockito.PowerMockito.*;
+
+            import org.junit.jupiter.api.Test;
+            import static org.junit.jupiter.api.Assertions.assertEquals;
+
+            public class MyTest2 {
+                public static class SomeTexts {
+                    String text;
+                    public SomeTexts(String text) { this.text = text; }
+                    public String getText() { return text; }
+                }
+
+                @Test
+                public final void testWords() throws Exception {
+                    SomeTexts mock = PowerMockito.mock(SomeTexts.class);
+                    PowerMockito.whenNew(SomeTexts.class).METHODCALL.thenReturn(mock);
+
+                    SomeTexts st = new SomeTexts("Have a nice day!");
+                    when(st.getText()).thenReturn("overridden");
+
+                    assertEquals("overridden", st.getText());
+                }
+            }
+            """.replaceAll("METHODCALL", methodCall),
+            """
+            import org.mockito.MockedConstruction;
+            import org.mockito.Mockito;
+            import static org.mockito.Mockito.when;
+
+            import org.junit.jupiter.api.Test;
+            import static org.junit.jupiter.api.Assertions.assertEquals;
+
+            public class MyTest2 {
+                public static class SomeTexts {
+                    String text;
+                    public SomeTexts(String text) { this.text = text; }
+                    public String getText() { return text; }
+                }
+
+                @Test
+                public final void testWords() throws Exception {
+                    try (MockedConstruction<SomeTexts> mockSomeTexts = Mockito.mockConstruction(SomeTexts.class)) {
+
+                        SomeTexts st = new SomeTexts("Have a nice day!");
+                        when(st.getText()).thenReturn("overridden");
+
+                        assertEquals("overridden", st.getText());
+                    }
+                }
+            }
+            """
+          )
+        );
+    }
 }