forked from junit-team/junit4
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Declarative ordering of @Rule/@ClassRule rules
- Loading branch information
Showing
16 changed files
with
554 additions
and
61 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| package org.junit.runners; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.Comparator; | ||
| import java.util.IdentityHashMap; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.Rule; | ||
| import org.junit.rules.MethodRule; | ||
| import org.junit.rules.TestRule; | ||
| import org.junit.runner.Description; | ||
| import org.junit.runners.model.FrameworkMethod; | ||
| import org.junit.runners.model.Statement; | ||
|
|
||
| /** | ||
| * Data structure for ordering of {@link TestRule}/{@link MethodRule} instances. | ||
| * | ||
| * @since 4.13 | ||
| */ | ||
| class RuleContainer { | ||
| private final IdentityHashMap<Object, Integer> orderValues = new IdentityHashMap<Object, Integer>(); | ||
| private final List<TestRule> testRules = new ArrayList<TestRule>(); | ||
| private final List<MethodRule> methodRules = new ArrayList<MethodRule>(); | ||
|
|
||
| /** | ||
| * Sets order value for the specified rule. | ||
| */ | ||
| public void setOrder(Object rule, int order) { | ||
| orderValues.put(rule, order); | ||
| } | ||
|
|
||
| public void add(MethodRule methodRule) { | ||
| methodRules.add(methodRule); | ||
| } | ||
|
|
||
| public void add(TestRule testRule) { | ||
| testRules.add(testRule); | ||
| } | ||
|
|
||
| static final Comparator<RuleEntry> ENTRY_COMPARATOR = new Comparator<RuleEntry>() { | ||
| public int compare(RuleEntry o1, RuleEntry o2) { | ||
| int result = compareInt(o1.order, o2.order); | ||
| return result != 0 ? result : o1.type - o2.type; | ||
| } | ||
|
|
||
| private int compareInt(int a, int b) { | ||
| return (a < b) ? 1 : (a == b ? 0 : -1); | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Returns entries in the order how they should be applied, i.e. inner-to-outer. | ||
| */ | ||
| private List<RuleEntry> getSortedEntries() { | ||
| List<RuleEntry> ruleEntries = new ArrayList<RuleEntry>( | ||
| methodRules.size() + testRules.size()); | ||
| for (MethodRule rule : methodRules) { | ||
| ruleEntries.add(new RuleEntry(rule, RuleEntry.TYPE_METHOD_RULE, orderValues.get(rule))); | ||
| } | ||
| for (TestRule rule : testRules) { | ||
| ruleEntries.add(new RuleEntry(rule, RuleEntry.TYPE_TEST_RULE, orderValues.get(rule))); | ||
| } | ||
| Collections.sort(ruleEntries, ENTRY_COMPARATOR); | ||
| return ruleEntries; | ||
| } | ||
|
|
||
| /** | ||
| * Applies all the rules ordered accordingly to the specified {@code statement}. | ||
| */ | ||
| public Statement apply(FrameworkMethod method, Description description, Object target, | ||
| Statement statement) { | ||
| if (methodRules.isEmpty() && testRules.isEmpty()) { | ||
| return statement; | ||
| } | ||
| Statement result = statement; | ||
| for (RuleEntry ruleEntry : getSortedEntries()) { | ||
| if (ruleEntry.type == RuleEntry.TYPE_TEST_RULE) { | ||
| result = ((TestRule) ruleEntry.rule).apply(result, description); | ||
| } else { | ||
| result = ((MethodRule) ruleEntry.rule).apply(result, method, target); | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| /** | ||
| * Returns rule instances in the order how they should be applied, i.e. inner-to-outer. | ||
| * VisibleForTesting | ||
| */ | ||
| List<Object> getSortedRules() { | ||
| List<Object> result = new ArrayList<Object>(); | ||
| for (RuleEntry entry : getSortedEntries()) { | ||
| result.add(entry.rule); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| static class RuleEntry { | ||
| static final int TYPE_TEST_RULE = 1; | ||
| static final int TYPE_METHOD_RULE = 0; | ||
|
|
||
| final Object rule; | ||
| final int type; | ||
| final int order; | ||
|
|
||
| RuleEntry(Object rule, int type, Integer order) { | ||
| this.rule = rule; | ||
| this.type = type; | ||
| this.order = order != null ? order.intValue() : Rule.DEFAULT_ORDER; | ||
| } | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
src/main/java/org/junit/runners/model/MemberValueConsumer.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,18 @@ | ||
| package org.junit.runners.model; | ||
|
|
||
| /** | ||
| * Represents a receiver for values of annotated fields/methods together with the declaring member. | ||
| * | ||
| * @see TestClass#collectAnnotatedFieldValues(Object, Class, Class, MemberValueConsumer) | ||
| * @see TestClass#collectAnnotatedMethodValues(Object, Class, Class, MemberValueConsumer) | ||
| * @since 4.13 | ||
| */ | ||
| public interface MemberValueConsumer<T> { | ||
| /** | ||
| * Receives the next value and its declaring member. | ||
| * | ||
| * @param member declaring member ({@link FrameworkMethod or {@link FrameworkField}} | ||
| * @param value the value of the next member | ||
| */ | ||
| void accept(FrameworkMember member, T value); | ||
| } |
Oops, something went wrong.