From b09d5fb69d170c40d84161268673decf7461c73d Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 21 Dec 2023 10:27:35 +0000 Subject: Fix compile error on JDK 18 and later This is taken from https://github.com/junit-team/junit4/commit/0eb5ce72848d730da5bd6d42902fdd6a8a42055d There is no recent release of JUnit4 that would contain the fix. Bug: 313924276 Test: m EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN=true Change-Id: I51ac7b680559cfe1cb831a7a38f5daf469b4f242 --- README.version | 1 + src/main/java/org/junit/runner/Result.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.version b/README.version index 430e5e8..32adc06 100644 --- a/README.version +++ b/README.version @@ -7,3 +7,4 @@ Local Changes: 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 @@ public class Result implements Serializable { } @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); -- cgit v1.2.3