aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/junit/runners/model/FrameworkMember.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/junit/runners/model/FrameworkMember.java')
-rw-r--r--src/main/java/org/junit/runners/model/FrameworkMember.java24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/main/java/org/junit/runners/model/FrameworkMember.java b/src/main/java/org/junit/runners/model/FrameworkMember.java
index 5634b3f..724f096 100644
--- a/src/main/java/org/junit/runners/model/FrameworkMember.java
+++ b/src/main/java/org/junit/runners/model/FrameworkMember.java
@@ -12,29 +12,15 @@ public abstract class FrameworkMember<T extends FrameworkMember<T>> implements
Annotatable {
abstract boolean isShadowedBy(T otherMember);
- T handlePossibleBridgeMethod(List<T> members) {
- for (int i = members.size() - 1; i >=0; i--) {
- T otherMember = members.get(i);
- if (isShadowedBy(otherMember)) {
- if (otherMember.isBridgeMethod()) {
- /*
- * We need to return the previously-encountered bridge method
- * because JUnit won't be able to call the parent method,
- * because the parent class isn't public.
- */
- members.remove(i);
- return otherMember;
- }
- // We found a shadowed member that isn't a bridge method. Ignore it.
- return null;
+ boolean isShadowedBy(List<T> members) {
+ for (T each : members) {
+ if (isShadowedBy(each)) {
+ return true;
}
}
- // No shadow or bridge method found. The caller should add *this* member.
- return (T) this;
+ return false;
}
- abstract boolean isBridgeMethod();
-
protected abstract int getModifiers();
/**