diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-21 13:11:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-21 13:11:02 +0000 |
| commit | cf4566a71d1ceff9434d496a1a618cf8c03b0ae3 (patch) | |
| tree | c55c3ad54ff76e561545974e1e0e828a4fcca7b3 | |
| parent | 1647dd701f16e1ec4092476406763683dec44960 (diff) | |
| parent | 140c3e8c6d7f61c9a6571063a3518deb52793ccc (diff) | |
| download | junit-master.tar.gz | |
Merge "Fix compile error on JDK 18 and later" into main am: 9a33f4130b am: 9153ebaf70 am: 140c3e8c6dHEADmastermain
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>
| -rw-r--r-- | README.version | 1 | ||||
| -rw-r--r-- | src/main/java/org/junit/runner/Result.java | 2 |
2 files changed, 2 insertions, 1 deletions
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); |