Retain original TestEngine order after pruning
#4864
Merged
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
Prior to this commit, LauncherDiscoveryResult.retainEngines() stored the pruned LinkedHashMap content in a HashMap, which sometimes resulted in different iteration order for pruned test engines. To address that, this commit replaces the use of Collectors.toMap(Function<? super T, ? extends K>, Function<? super T, ? extends U>) -- which creates a HashMap -- with the use of Collectors.toMap(Function<? super T, ? extends K>, Function<? super T, ? extends U>, BinaryOperator<U>, Supplier<M>) -- which allows us to specify that the pruned test engines should be stored in a LinkedHashMap to retain the original iteration order. Fixes junit-team#4862
github-actions
bot
added
backport-candidate
component: Platform
theme: execution
type: bug
labels
This comment was marked as outdated.
This comment was marked as outdated.
sbrannen
changed the title
TestEngine order after pruningTestEngine order after pruning
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
sormuras
approved these changes
Aug 22, 2025
marcphilipp
pushed a commit
that referenced
this pull request
Sep 22, 2025
Prior to this commit, LauncherDiscoveryResult.retainEngines() stored the retained LinkedHashMap content in a HashMap, which sometimes resulted in different iteration order if test engines were pruned. To address that, this commit replaces the use of the Stream API and Collectors.toMap() (which creates a HashMap) -- with the use of a LinkedHashMap combined with entrySet().removeIf() which allows us to ensure that the retained test engines are stored in a LinkedHashMap that maintains the original iteration order. Fixes #4862 Closes #4864 (cherry picked from commit a400fc6)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Prior to this commit,
LauncherDiscoveryResult.retainEngines()stored the prunedLinkedHashMapcontent in aHashMap, which sometimes resulted in different iteration order for pruned test engines.To address that, this commit replaces the use of
Collectors.toMap(Function<? super T, ? extends K>, Function<? super T, ? extends U>)-- which creates aHashMap-- with the use ofCollectors.toMap(Function<? super T, ? extends K>, Function<? super T, ? extends U>, BinaryOperator<U>, Supplier<M>)-- which allows us to specify that the pruned test engines should be stored in aLinkedHashMapto retain the original iteration order.Fixes #4862