aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-16 15:11:13 +0000
committerPaul Duffin <paulduffin@google.com>2016-12-19 14:41:11 +0000
commitf3aca4db137104480c0501f29d459f64b1f3f618 (patch)
tree7c1eb8e6d4cad179f72f11bf1334d2fcd51536af /src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
parent8f7a4bf1039370c7810bcfb287f6e0a6224f8063 (diff)
downloadjunit-f3aca4db137104480c0501f29d459f64b1f3f618.tar.gz
Minor changes to JUnit 4.10 to make it more like 4.12
Some other projects break when built against 4.12. This allows those projects to be updated separately to the JUnit 4.12 upgrade. Assert.java and Description.java are copied directly from upstream 4.12; that brings in new methods from 4.12. The changes are so extensive because the upstream code was reformatted between 4.10 anbd 4.12. Between 4.10 and 4.12 RuleFieldValidator.java was renamed to RuleMemberValidator.java. To allow existing code that uses RuleFieldValidator to be modified to use RuleMemberValidator instead RuleFieldValidator.java has been copied to RuleMemberValidator.java. The change to BlockJUnit4ClassRunner reflects an upstream change made between 4.10 and 4.12. Bug: 33613916 Test: make checkbuild Change-Id: Id8ee6d08268152ec1a22a309c4582f8f6663ae88
Diffstat (limited to 'src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java')
-rw-r--r--src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
index 92e0d07..397da19 100644
--- a/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
+++ b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
@@ -166,7 +166,7 @@ public class BlockJUnit4ClassRunner extends ParentRunner<FrameworkMethod> {
errors.add(new Exception("No runnable methods"));
}
- private void validateFields(List<Throwable> errors) {
+ protected void validateFields(List<Throwable> errors) {
RULE_VALIDATOR.validate(getTestClass(), errors);
}