-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Segregate native & user listeners before ordering (#2864)
* Segregate native & user listeners before ordering
- Loading branch information
1 parent
c087eaa
commit 69674cc
Showing
17 changed files
with
224 additions
and
33 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
82 changes: 82 additions & 0 deletions
82
testng-core/src/main/java/org/testng/internal/ListenerOrderDeterminer.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package org.testng.internal; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.function.Predicate; | ||
| import java.util.stream.Collectors; | ||
| import org.testng.collections.Lists; | ||
| import org.testng.internal.collections.Pair; | ||
|
|
||
| /** | ||
| * A Utility that helps us differentiate between a user's listener and preferential Listener. | ||
| * | ||
| * <p>When dealing with TestNG listeners we would need to ensure that the user created listeners are | ||
| * invoked first followed by Preferential listeners. This is required so that we always honour any | ||
| * state changes that a user's listener may have done to the internal state of objects that can | ||
| * affect the outcome of the execution (for e.g.,{@link org.testng.ITestResult}) | ||
| * | ||
| * <p>The ordering must be done such that, when dealing with "beforeXXX|afterXXX" we group all the | ||
| * IDE listeners at the end. That way, we can always ensure that the preferential listeners (for | ||
| * e.g., IDE listeners) always honour the changes that were done to the TestNG internal states and | ||
| * give a consistent experience for users. | ||
| */ | ||
| public final class ListenerOrderDeterminer { | ||
|
|
||
| private ListenerOrderDeterminer() { | ||
| // Defeat instantiation | ||
| } | ||
|
|
||
| private static final List<String> PREFERENTIAL_PACKAGES = | ||
| RuntimeBehavior.getPreferentialListeners().stream() | ||
| .map(each -> each.replaceAll("\\Q.*\\E", "")) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| private static final Predicate<Class<?>> SHOULD_ADD_AT_END = | ||
| clazz -> | ||
| PREFERENTIAL_PACKAGES.stream() | ||
| .anyMatch(each -> clazz.getPackage().getName().contains(each)); | ||
|
|
||
| /** | ||
| * @param original - The original collection of listeners | ||
| * @return - A re-ordered collection wherein preferential listeners are added at the end | ||
| */ | ||
| public static <T> List<T> order(Collection<T> original) { | ||
| Pair<List<T>, List<T>> ordered = arrange(original); | ||
| List<T> ideListeners = ordered.first(); | ||
| List<T> regularListeners = ordered.second(); | ||
| return Lists.merge(regularListeners, ideListeners); | ||
| } | ||
|
|
||
| /** | ||
| * @param original - The original collection of listeners | ||
| * @return - A reversed ordered list wherein the user listeners are found in reverse order | ||
| * followed by preferential listeners also in reverse order. | ||
| */ | ||
| public static <T> List<T> reversedOrder(Collection<T> original) { | ||
| Pair<List<T>, List<T>> ordered = arrange(original); | ||
| List<T> preferentialListeners = ordered.first(); | ||
| List<T> regularListeners = ordered.second(); | ||
| Collections.reverse(regularListeners); | ||
| Collections.reverse(preferentialListeners); | ||
| return Lists.merge(regularListeners, preferentialListeners); | ||
| } | ||
|
|
||
| private static <T> Pair<List<T>, List<T>> arrange(Collection<T> original) { | ||
| List<T> preferentialListeners = new ArrayList<>(); | ||
| List<T> regularListeners = new ArrayList<>(); | ||
| original.stream() | ||
| .filter(Objects::nonNull) | ||
| .forEach( | ||
| each -> { | ||
| if (SHOULD_ADD_AT_END.test(each.getClass())) { | ||
| preferentialListeners.add(each); | ||
| } else { | ||
| regularListeners.add(each); | ||
| } | ||
| }); | ||
| return new Pair<>(preferentialListeners, regularListeners); | ||
| } | ||
| } |
Oops, something went wrong.