From 7c1305e245396a4f0e79b3c0ce97d9c1c4fb09fb Mon Sep 17 00:00:00 2001 From: rjust Date: Mon, 9 Sep 2024 14:31:58 -0700 Subject: [PATCH] Two more patches for newer Collections versions. --- .../compile-errors/compile-26-27.diff | 26 +++++++++++++++++++ .../compile-errors/compile-28-28.diff | 13 ++++++++++ 2 files changed, 39 insertions(+) create mode 100644 framework/projects/Collections/compile-errors/compile-26-27.diff create mode 100644 framework/projects/Collections/compile-errors/compile-28-28.diff diff --git a/framework/projects/Collections/compile-errors/compile-26-27.diff b/framework/projects/Collections/compile-errors/compile-26-27.diff new file mode 100644 index 000000000..fa0744817 --- /dev/null +++ b/framework/projects/Collections/compile-errors/compile-26-27.diff @@ -0,0 +1,26 @@ +diff --git a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java +index 5042dd2b..b35ec769 100644 +--- a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java ++++ b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java +@@ -239,7 +239,7 @@ public class FluentIterableTest { + assertEquals(expectedSum, sum.get()); + + try { +- FluentIterable.of(iterableA).forEach(null); ++ FluentIterable.of(iterableA).forEach((Closure)null); + fail("expecting NullPointerException"); + } catch (NullPointerException npe) { + // expected +diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java +index ab1e1033..3d72ef79 100644 +--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java ++++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java +@@ -1085,7 +1085,7 @@ public abstract class AbstractCollectionTest extends AbstractObjectTest { + verify(); + + try { +- array = getCollection().toArray(null); ++ array = getCollection().toArray((Object[])null); + fail("toArray(null) should raise NPE"); + } catch (final NullPointerException e) { + // expected diff --git a/framework/projects/Collections/compile-errors/compile-28-28.diff b/framework/projects/Collections/compile-errors/compile-28-28.diff new file mode 100644 index 000000000..bc6ab32ef --- /dev/null +++ b/framework/projects/Collections/compile-errors/compile-28-28.diff @@ -0,0 +1,13 @@ +diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java +index ab1e1033..3d72ef79 100644 +--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java ++++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java +@@ -1085,7 +1085,7 @@ public abstract class AbstractCollectionTest extends AbstractObjectTest { + verify(); + + try { +- array = getCollection().toArray(null); ++ array = getCollection().toArray((Object[])null); + fail("toArray(null) should raise NPE"); + } catch (final NullPointerException e) { + // expected