Merge pull request quarkusio#48094 from holly-cummins/nested-classes-in-continuous-testing

Sort dot names when identifying quarkus tests in continuous testing so nested tests are always identified

Author: gsmet

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java

@@ -24,6 +24,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -644,7 +645,9 @@ private DiscoveryResult discoverTestClasses() {
         }
 
         Set<DotName> allTestAnnotations = collectTestAnnotations(index);
-        Set<DotName> allTestClasses = new HashSet<>();
+        // Order matters here for nested tests
+        // We assume we have evaluated the parent of a class before evaluating it
+        Set<DotName> allTestClasses = new TreeSet<>();
         Map<DotName, DotName> enclosingClasses = new HashMap<>();
         for (DotName annotation : allTestAnnotations) {
             for (AnnotationInstance instance : index.getAnnotations(annotation)) {
@@ -680,7 +683,7 @@ private DiscoveryResult discoverTestClasses() {
             }
             var enclosing = enclosingClasses.get(testClass);
             if (enclosing != null) {
-                String enclosingString = enclosing.toString();
+                final String enclosingString = enclosing.toString();
                 if (quarkusTestClassesForFacadeClassLoader.contains(enclosingString)) {
                     quarkusTestClassesForFacadeClassLoader.add(name);
                 }

integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusTestIT.java

@@ -12,8 +12,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 
 import io.quarkus.maven.it.continuoustesting.ContinuousTestingMavenTestUtils;
 import io.quarkus.maven.it.verifier.MavenProcessInvocationResult;
@@ -75,8 +73,6 @@ public void testNestedQuarkusTestMixedWithNormalTests()
 
     }
 
-    @DisabledOnOs(OS.WINDOWS) // Tracked by https://github.com/quarkusio/quarkus/issues/47913
-    @Disabled("See https://github.com/quarkusio/quarkus/issues/48004")
     @Test
     public void testNestedQuarkusTestMixedWithNormalTestsContinuousTesting()
             throws MavenInvocationException, FileNotFoundException {

integration-tests/maven/src/test/resources-filtered/projects/test-nested-tests-mixed-with-normal-tests/src/main/resources/application.properties

@@ -1,2 +1,3 @@
 quarkus.test.continuous-testing=enabled
+quarkus.test.display-test-output=true
 greeting.message=Hello from Quarkus REST via config