Ensure @Nested classes are executed after sibling test methods
#4603
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sbrannen
requested changes
Jun 2, 2025
Member
sbrannen
left a comment
sbrannen
left a comment
There was a problem hiding this comment.
Thanks for the quick turnaround on this!
I've added some comments for discussion.
...t-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
Outdated
Show resolved
Hide resolved
...t-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
Show resolved
Hide resolved
jupiter-tests/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
Show resolved
Hide resolved
jupiter-tests/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
Show resolved
Hide resolved
jupiter-tests/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
Show resolved
Hide resolved
In order to validate them, classpath scanning was changed to find them in 5.13.0. However, that caused `@Nested` classes to be added to their parent descriptors before their sibling test methods. This made the order of execution in classes containing nested test classes dependent on how they were discovered unless a `MethodOrderer` was configured in which case `MethodOrderingVisitor` ensured test methods came before `@Nested` test classes on the same level. This commit changes `MethodOrderingVisitor` to also ensure this ordering constraint in case no `MethodOrderer` is configured. Resolves #4600.
marcphilipp
force-pushed
the
marc/4600-ensure-nested-class-order
branch
from
4d3ba5f to
940a2a5
Compare
sbrannen
approved these changes
Jun 3, 2025
marcphilipp
added a commit
that referenced
this pull request
Jun 4, 2025
In order to validate them, classpath scanning was changed to find them in 5.13.0. However, that caused `@Nested` classes to be added to their parent descriptors before their sibling test methods. This made the order of execution in classes containing nested test classes dependent on how they were discovered unless a `MethodOrderer` was configured in which case `MethodOrderingVisitor` ensured test methods came before `@Nested` test classes on the same level. This commit changes `MethodOrderingVisitor` to also ensure this ordering constraint in case no `MethodOrderer` is configured. Resolves #4600. (cherry picked from commit d0d6071)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
In order to validate them, classpath scanning was changed to find them
in 5.13.0. However, that caused
@Nestedclasses to be added to theirparent descriptors before their sibling test methods. This made the
order of execution in classes containing nested test classes dependent
on how they were discovered unless a
MethodOrdererwas configured inwhich case
MethodOrderingVisitorensured test methods came before@Nestedtest classes on the same level.This commit changes
MethodOrderingVisitorto also ensure thisordering constraint in case no
MethodOrdereris configured.Resolves #4600.
I hereby agree to the terms of the JUnit Contributor License Agreement.
Definition of Done
@APIannotations