File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
core/deployment/src/main/java/io/quarkus/deployment/dev/testing
integration-tests/maven/src/test
resources-filtered/projects/test-nested-tests-mixed-with-normal-tests/src/main/resources Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 2424import java .util .Objects ;
2525import java .util .Optional ;
2626import java .util .Set ;
27+ import java .util .TreeSet ;
2728import java .util .concurrent .LinkedBlockingDeque ;
2829import java .util .concurrent .atomic .AtomicReference ;
2930import java .util .function .Function ;
@@ -644,7 +645,9 @@ private DiscoveryResult discoverTestClasses() {
644645 }
645646
646647 Set <DotName > allTestAnnotations = collectTestAnnotations (index );
647- Set <DotName > allTestClasses = new HashSet <>();
648+ // Order matters here for nested tests
649+ // We assume we have evaluated the parent of a class before evaluating it
650+ Set <DotName > allTestClasses = new TreeSet <>();
648651 Map <DotName , DotName > enclosingClasses = new HashMap <>();
649652 for (DotName annotation : allTestAnnotations ) {
650653 for (AnnotationInstance instance : index .getAnnotations (annotation )) {
@@ -680,7 +683,7 @@ private DiscoveryResult discoverTestClasses() {
680683 }
681684 var enclosing = enclosingClasses .get (testClass );
682685 if (enclosing != null ) {
683- String enclosingString = enclosing .toString ();
686+ final String enclosingString = enclosing .toString ();
684687 if (quarkusTestClassesForFacadeClassLoader .contains (enclosingString )) {
685688 quarkusTestClassesForFacadeClassLoader .add (name );
686689 }
Original file line number Diff line number Diff line change 1212import org .junit .jupiter .api .Assertions ;
1313import org .junit .jupiter .api .Disabled ;
1414import org .junit .jupiter .api .Test ;
15- import org .junit .jupiter .api .condition .DisabledOnOs ;
16- import org .junit .jupiter .api .condition .OS ;
1715
1816import io .quarkus .maven .it .continuoustesting .ContinuousTestingMavenTestUtils ;
1917import io .quarkus .maven .it .verifier .MavenProcessInvocationResult ;
@@ -75,8 +73,6 @@ public void testNestedQuarkusTestMixedWithNormalTests()
7573
7674 }
7775
78- @ DisabledOnOs (OS .WINDOWS ) // Tracked by https://github.com/quarkusio/quarkus/issues/47913
79- @ Disabled ("See https://github.com/quarkusio/quarkus/issues/48004" )
8076 @ Test
8177 public void testNestedQuarkusTestMixedWithNormalTestsContinuousTesting ()
8278 throws MavenInvocationException , FileNotFoundException {
Original file line number Diff line number Diff line change 11quarkus.test.continuous-testing =enabled
2+ quarkus.test.display-test-output =true
23greeting.message =Hello from Quarkus REST via config
You can’t perform that action at this time.
0 commit comments