diff options
| -rw-r--r-- | README.version | 1 | ||||
| -rw-r--r-- | src/main/java/org/junit/rules/ErrorCollector.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/README.version b/README.version index ebab252..430e5e8 100644 --- a/README.version +++ b/README.version @@ -6,3 +6,4 @@ Local Changes: Extra generic type information to aid certain javacs. Remove DisableOnDebug (new in 4.12) as it is not supported on Android Remove support for stuck threads + Don't convert assumption failures into errors in rules/ErrorCollector diff --git a/src/main/java/org/junit/rules/ErrorCollector.java b/src/main/java/org/junit/rules/ErrorCollector.java index 9711e50..18d94b8 100644 --- a/src/main/java/org/junit/rules/ErrorCollector.java +++ b/src/main/java/org/junit/rules/ErrorCollector.java @@ -49,6 +49,9 @@ public class ErrorCollector extends Verifier { if (error == null) { throw new NullPointerException("Error cannot be null"); } + // BEGIN Android-changed: Don't convert assumption failures to errors. b/181123057 + // Submitted upstream: https://github.com/junit-team/junit4/issues/1703 + /* if (error instanceof AssumptionViolatedException) { AssertionError e = new AssertionError(error.getMessage()); e.initCause(error); @@ -56,6 +59,9 @@ public class ErrorCollector extends Verifier { } else { errors.add(error); } + */ + // END Android-changed: Don't convert assumption failures to errors. b/181123057 + errors.add(error); } /** |