Improve detection of ignored and disabled tests

Author: Donnerbart

src/main/java/de/donnerbart/split/TestSplit.java

@@ -4,6 +4,7 @@
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.expr.AnnotationExpr;
+import com.github.javaparser.ast.nodeTypes.NodeWithName;
 import de.donnerbart.split.model.Split;
 import de.donnerbart.split.model.TestCase;
 import de.donnerbart.split.model.TestSuite;
@@ -30,8 +31,9 @@
 
 public class TestSplit {
 
-    private static final @NotNull Set<String> SKIP_TEST_ANNOTATIONS =
-            Set.of("org.junit.jupiter.api.Disabled", "Disabled", "org.junit.Ignore", "Ignore");
+    private static final @NotNull Set<String> SKIP_TEST_IMPORTS =
+            Set.of("org.junit.jupiter.api.Disabled", "org.junit.Ignore");
+    private static final @NotNull Set<String> SKIP_TEST_ANNOTATIONS = Set.of("Disabled", "Ignore");
 
     private static final @NotNull Logger LOG = LoggerFactory.getLogger(TestSplit.class);
 
@@ -195,18 +197,26 @@ public void run() throws Exception {
                 final var className = declaration.getFullyQualifiedName().orElseThrow();
                 if (declaration.isInterface()) {
                     LOG.info("Skipping test interface {}", className);
+                    continue;
                 } else if (declaration.isAbstract()) {
                     LOG.info("Skipping abstract test class {}", className);
-                } else if (declaration.getAnnotations()
+                    continue;
+                }
+                final var hasSkipTestImport = compilationUnit.getImports()
+                        .stream()
+                        .map(NodeWithName::getNameAsString)
+                        .anyMatch(SKIP_TEST_IMPORTS::contains);
+                final var hasSkipTestAnnotation = declaration.getAnnotations()
                         .stream()
                         .map(AnnotationExpr::getNameAsString)
-                        .anyMatch(SKIP_TEST_ANNOTATIONS::contains)) {
+                        .anyMatch(SKIP_TEST_ANNOTATIONS::contains);
+                if (hasSkipTestImport && hasSkipTestAnnotation) {
                     LOG.info("Skipping disabled test class {}", className);
-                } else {
-                    classNames.add(className);
+                    continue;
                 }
+                classNames.add(className);
             } catch (final Exception e) {
-                LOG.error("Failed to parse test class: {}", testPath, e);
+                LOG.error("Failed to parse test class {}", testPath, e);
                 exitCodeConsumer.accept(1);
             }
         }

src/test/java/de/donnerbart/split/TestSplitTest.java

@@ -43,9 +43,12 @@ void setUp() throws Exception {
                 .resolve("donnerbart")
                 .resolve("example");
         Files.createDirectories(projectFolder);
+        // ignored tests
         copyResourceToTarget(projectFolder, "tests/BaseTest.java", "BaseTest.java", PERMISSIONS);
         copyResourceToTarget(projectFolder, "tests/DisabledTest.java", "DisabledTest.java", PERMISSIONS);
+        copyResourceToTarget(projectFolder, "tests/IgnoreTest.java", "IgnoreTest.java", PERMISSIONS);
         copyResourceToTarget(projectFolder, "tests/InterfaceTest.java", "InterfaceTest.java", PERMISSIONS);
+        // valid tests
         copyResourceToTarget(projectFolder, "tests/FastTest.java", "FastTest.java", PERMISSIONS);
         copyResourceToTarget(projectFolder, "tests/NoTimingOneTest.java", "NoTimingOneTest.java", PERMISSIONS);
         copyResourceToTarget(projectFolder, "tests/NoTimingTwoTest.java", "NoTimingTwoTest.java", PERMISSIONS);

src/test/resources/tests/DisabledTest.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@Disabled("This test should not be split")
+@Disabled("This test should be skipped")
 class DisabledTest {
 
     @Test

src/test/resources/tests/IgnoreTest.java

@@ -0,0 +1,12 @@
+package de.donnerbart.example;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore("This test should be skipped")
+class IgnoreTest {
+
+    @Test
+    void testIgnored() {
+    }
+}