Only match methods with test annotations

Fixes #874

Author: timtebeek

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

@@ -170,10 +170,10 @@ private boolean methodExists(JavaType.Method method, String newName) {
         private static boolean hasJUnit5MethodAnnotation(MethodDeclaration method) {
             for (J.Annotation a : method.getLeadingAnnotations()) {
                 if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test") ||
-                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestTemplate") ||
                         TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest") ||
                         TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest") ||
-                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory")) {
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestTemplate")) {
                     return true;
                 }
             }

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

@@ -20,11 +20,9 @@
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.java.AnnotationMatcher;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.search.UsesType;
-import org.openrewrite.java.service.AnnotationService;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaType;
 import org.openrewrite.java.tree.Statement;
@@ -34,7 +32,7 @@
 
 public class TestMethodsShouldBeVoid extends Recipe {
 
-    private static final String TEST_ANNOTATION_PATTERN = "org..* *Test*";
+    private static final String TEST_ANNOTATION_TYPE_PATTERN = "org..*Test";
 
     @Override
     public String getDisplayName() {
@@ -50,13 +48,11 @@ public String getDescription() {
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return Preconditions.check(new UsesType<>(TEST_ANNOTATION_PATTERN, true), new JavaIsoVisitor<ExecutionContext>() {
+        return Preconditions.check(new UsesType<>(TEST_ANNOTATION_TYPE_PATTERN, true), new JavaIsoVisitor<ExecutionContext>() {
             @Override
             public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
                 J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
-
-                // Only consider test methods
-                if (!service(AnnotationService.class).matches(getCursor(), new AnnotationMatcher(TEST_ANNOTATION_PATTERN, true))) {
+                if (!hasJUnit5MethodAnnotation(m)) {
                     return m;
                 }
 
@@ -105,4 +101,17 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
                     null;
         }
     }
+
+    private static boolean hasJUnit5MethodAnnotation(J.MethodDeclaration method) {
+        for (J.Annotation a : method.getLeadingAnnotations()) {
+            if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test") ||
+                    TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest") ||
+                    TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest") ||
+                    TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory") ||
+                    TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestTemplate")) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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

@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
 import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Issue;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
@@ -30,8 +31,8 @@ class TestMethodsShouldBeVoidTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion()
-            .classpathFromResources(new InMemoryExecutionContext(), "junit-jupiter-api-5", "junit-jupiter-params-5"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(),
+            "junit-jupiter-api-5", "junit-jupiter-params-5"))
           .recipe(new TestMethodsShouldBeVoid());
     }
 
@@ -355,4 +356,23 @@ private int calculateValue() {
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/874")
+    @Test
+    void doesNotMatchNullableAnnotation() {
+        rewriteRun(
+          spec -> spec.parser(JavaParser.fromJavaVersion().classpath("jspecify")),
+          //language=java
+          java(
+            """
+              import org.jspecify.annotations.Nullable;
+
+              public interface Doer {
+                  @Nullable
+                  String getFile(String input);
+              }
+              """
+          )
+        );
+    }
 }