Don't convert assumption failures into errors in ErrorCollector.addError().
Cherry-picking to mainline-prod for consistency with other branches.
It makes more sense to pass assumption failures through this path
unchanged (unlike ErrorCollector.checkSucceeds) and converting them to
errors breaks tests which use ErrorCollector in a wrapper Rule.
Upstream issue: https://github.com/junit-team/junit4/issues/1703
Bug: 129054170
Test: m checkbuild
Change-Id: I578a2676e52882c7d25d99061310ea38101883f6
Merged-In: I578a2676e52882c7d25d99061310ea38101883f6
(cherry picked from commit d3857e49835c77c9f8000af18904d05b43b24ce1)
diff --git a/README.version b/README.version
index ebab252..430e5e8 100644
--- a/README.version
+++ b/README.version
@@ -6,3 +6,4 @@
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 @@
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 @@
} else {
errors.add(error);
}
+ */
+ // END Android-changed: Don't convert assumption failures to errors. b/181123057
+ errors.add(error);
}
/**
