Merge "Fix compile error on JDK 18 and later" into main am: 9a33f4130b am: 9153ebaf70 am: 140c3e8c6d
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2887826
Change-Id: Ia1e02c6ac71f7e2f05ff846a08dfe2510c2da547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/README.version b/README.version
index 430e5e8..32adc06 100644
--- a/README.version
+++ b/README.version
@@ -7,3 +7,4 @@
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
+ Fix compile error on JDK 18 and later (copied from https://github.com/junit-team/junit4/commit/0eb5ce72848d730da5bd6d42902fdd6a8a42055d)
diff --git a/src/main/java/org/junit/runner/Result.java b/src/main/java/org/junit/runner/Result.java
index 4b5f4a4..ff53b08 100644
--- a/src/main/java/org/junit/runner/Result.java
+++ b/src/main/java/org/junit/runner/Result.java
@@ -188,7 +188,7 @@
}
@SuppressWarnings("unchecked")
- private SerializedForm(ObjectInputStream.GetField fields) throws IOException {
+ private SerializedForm(ObjectInputStream.GetField fields) throws IOException, ClassNotFoundException {
fCount = (AtomicInteger) fields.get("fCount", null);
fIgnoreCount = (AtomicInteger) fields.get("fIgnoreCount", null);
assumptionFailureCount = (AtomicInteger) fields.get("assumptionFailureCount", null);
