Ignore disabled or empty tests in TestsShouldIncludeAssertions

openrewrite · Sep 16, 2024 · 5be8a6f · 5be8a6f
1 parent 13fcf55
commit 5be8a6f
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 12 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertions.java b/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertions.java
@@ -99,16 +99,6 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
 
     private static class TestShouldIncludeAssertionsVisitor extends JavaIsoVisitor<ExecutionContext> {
 
-        JavaParser.Builder<?, ?> javaParser;
-
-        private JavaParser.Builder<?, ?> javaParser(ExecutionContext ctx) {
-            if (javaParser == null) {
-                javaParser = JavaParser.fromJavaVersion()
-                        .classpathFromResources(ctx, "junit-jupiter-api-5.9");
-            }
-            return javaParser;
-        }
-
         private final Map<String, Set<J.Block>> matcherPatternToClassInvocation = new HashMap<>();
         private final List<String> additionalAsserts;
 
@@ -123,7 +113,8 @@ private static class TestShouldIncludeAssertionsVisitor extends JavaIsoVisitor<E
         @Override
         public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext
                 ctx) {
-            if ((!methodIsTest(method) || method.getBody() == null) ||
+            if ((!methodIsTest(method) || method.getBody() == null || method.getBody().getStatements().isEmpty()) ||
+                methodIsDisabled(method) ||
                 methodHasAssertion(method.getBody()) ||
                 methodInvocationInBodyContainsAssertion()) {
                 return method;
@@ -135,7 +126,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                 maybeAddImport("org.junit.jupiter.api.Assertions", "assertDoesNotThrow");
                 md = JavaTemplate.builder("assertDoesNotThrow(() -> #{any()});")
                         .staticImports("org.junit.jupiter.api.Assertions.assertDoesNotThrow")
-                        .javaParser(javaParser(ctx))
+                        .javaParser(JavaParser.fromJavaVersion()
+                                .classpathFromResources(ctx, "junit-jupiter-api-5.9"))
                         .build()
                         .apply(updateCursor(md), md.getCoordinates().replaceBody(), body);
             }
@@ -153,6 +145,15 @@ private boolean methodIsTest(J.MethodDeclaration methodDeclaration) {
             return false;
         }
 
+        private boolean methodIsDisabled(J.MethodDeclaration methodDeclaration) {
+            for (J.Annotation leadingAnnotation : methodDeclaration.getLeadingAnnotations()) {
+                if (TypeUtils.isOfClassType(leadingAnnotation.getType(), "org.junit.jupiter.api.Disabled")) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         private boolean methodHasAssertion(J.Block body) {
             AtomicBoolean hasAssertion = new AtomicBoolean(Boolean.FALSE);
             JavaIsoVisitor<AtomicBoolean> findAssertionVisitor = new JavaIsoVisitor<AtomicBoolean>() {

diff --git a/src/test/java/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertionsTest.java b/src/test/java/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertionsTest.java
@@ -399,4 +399,42 @@ public void verifyTest() {
           )
         );
     }
+
+    @Test
+    void ignoreDisabled() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              import org.junit.jupiter.api.Disabled;
+              import org.junit.jupiter.api.Test;
+              public class AaTest {
+                  @Disabled
+                  @Test
+                  public void methodTest() {
+                      Integer it = Integer.valueOf("2");
+                      System.out.println(it);
+                  }
+              }
+              """
+          )
+        );
+    }
+
+    @Test
+    void ignoreEmpty() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              import org.junit.jupiter.api.Test;
+              public class AaTest {
+                  @Test
+                  public void methodTest() {
+                  }
+              }
+              """
+          )
+        );
+    }
 }