Rename implicit @MethodSource methods in RemoveTestPrefix (#961)

Fixes #462

Author: timtebeek

src/main/java/org/openrewrite/java/testing/cleanup/RemoveTestPrefix.java

@@ -28,6 +28,7 @@
 import org.openrewrite.java.search.UsesType;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.J.MethodDeclaration;
+import org.openrewrite.java.tree.Flag;
 import org.openrewrite.java.tree.JavaType;
 import org.openrewrite.java.tree.TypeUtils;
 
@@ -125,11 +126,33 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method,
                 return m;
             }
 
-            // Skip implied methodSource
+            // Handle implied methodSource: rename both test method and source method
+            boolean hasImpliedMethodSource = false;
             for (J.Annotation annotation : method.getLeadingAnnotations()) {
                 if (ANNOTATION_MATCHER.matches(annotation) &&
                         (annotation.getArguments() == null || annotation.getArguments().isEmpty())) {
-                    return m;
+                    hasImpliedMethodSource = true;
+                    break;
+                }
+            }
+            if (hasImpliedMethodSource) {
+                JavaType.FullyQualified declaringType = type.getDeclaringType();
+                if (declaringType != null) {
+                    for (JavaType.Method declaredMethod : declaringType.getMethods()) {
+                        if (declaredMethod.getName().equals(simpleName) &&
+                                declaredMethod.hasFlags(Flag.Static)) {
+                            // Check for conflict with source method's new name
+                            if (TypeUtils.findDeclaredMethod(declaringType, newMethodName,
+                                    declaredMethod.getParameterTypes()).isPresent()) {
+                                return m;
+                            }
+                            // Rename the source method too
+                            doAfterVisit(new ChangeMethodName(
+                                    MethodMatcher.methodPattern(declaredMethod),
+                                    newMethodName, false, false).getVisitor());
+                            break;
+                        }
+                    }
                 }
             }
 

src/test/java/org/openrewrite/java/testing/cleanup/RemoveTestPrefixTest.java

@@ -276,8 +276,9 @@ void myDoSomethingLogic() {}
         );
     }
 
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/462")
     @Test
-    void skipImpliedMethodSource() {
+    void renameImpliedMethodSource() {
         //language=java
         rewriteRun(
           java(
@@ -297,6 +298,88 @@ static Stream<Arguments> testMyDoSomethingLogic() {
                       return Stream.empty();
                   }
               }
+              """,
+            """
+              import org.junit.jupiter.api.Test;
+              import org.junit.jupiter.params.provider.Arguments;
+              import org.junit.jupiter.params.provider.MethodSource;
+              import java.util.stream.Stream;
+
+              class ATest {
+                  @Test
+                  @MethodSource
+                  void myDoSomethingLogic(Arguments args) {
+                  }
+
+                  static Stream<Arguments> myDoSomethingLogic() {
+                      return Stream.empty();
+                  }
+              }
+              """
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/462")
+    @Test
+    void renameImpliedMethodSourceWithoutSourceMethod() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              import org.junit.jupiter.api.Test;
+              import org.junit.jupiter.params.provider.Arguments;
+              import org.junit.jupiter.params.provider.MethodSource;
+
+              class ATest {
+                  @Test
+                  @MethodSource
+                  void testMyDoSomethingLogic(Arguments args) {
+                  }
+              }
+              """,
+            """
+              import org.junit.jupiter.api.Test;
+              import org.junit.jupiter.params.provider.Arguments;
+              import org.junit.jupiter.params.provider.MethodSource;
+
+              class ATest {
+                  @Test
+                  @MethodSource
+                  void myDoSomethingLogic(Arguments args) {
+                  }
+              }
+              """
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/462")
+    @Test
+    void skipImpliedMethodSourceWhenSourceMethodConflicts() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              import org.junit.jupiter.api.Test;
+              import org.junit.jupiter.params.provider.Arguments;
+              import org.junit.jupiter.params.provider.MethodSource;
+              import java.util.stream.Stream;
+
+              class ATest {
+                  @Test
+                  @MethodSource
+                  void testMyDoSomethingLogic(Arguments args) {
+                  }
+
+                  static Stream<Arguments> testMyDoSomethingLogic() {
+                      return Stream.empty();
+                  }
+
+                  static Stream<Arguments> myDoSomethingLogic() {
+                      return Stream.empty();
+                  }
+              }
               """
           )
         );