[automerger skipped] Remove support for stuck threads am: 5f6d28a01e -s ours
am skip reason: Change-Id I4b37c2d09b5c68afde438c343b41fcdc788c578e with SHA-1 adac35f1ea is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c57c41a159d5b7554f80284e7815cece47a5a33
diff --git a/Android.bp b/Android.bp
index 34d70c3..d12e704 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,29 @@
//
//
+package {
+ default_applicable_licenses: ["external_junit_license"],
+}
+
+// Added automatically by a large-scale-change
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_junit_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-EPL",
+ ],
+ license_text: [
+ "LICENSE-junit.txt",
+ "NOTICE.txt",
+ ],
+}
+
java_library_static {
name: "junit",
host_supported: true,
@@ -21,11 +44,6 @@
srcs: ["src/main/java/**/*.java"],
sdk_version: "core_current",
static_libs: ["hamcrest"],
-
- // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from
- // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh.
- // See b/141970724.
- java_version: "1.8",
}
// Legacy junit-host jar until references are updated
diff --git a/METADATA b/METADATA
index 2a2d270..98e7e51 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@
value: "https://github.com/junit-team/junit4/archive/r4.12.tar.gz"
}
version: "r4.12"
+ license_type: RECIPROCAL
last_upgrade_date {
year: 2016
month: 12
diff --git a/OWNERS b/OWNERS
index d4956db..dd4649a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
paulduffin@google.com
-android-libcore-team+review@google.com
+jgaillard@google.com
+prb@google.com
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);
}
/**
