This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new 0d5bbc2d9 Reduce copy-pasta in tests.
0d5bbc2d9 is described below
commit 0d5bbc2d96636041e67f8ad332759193ee92ab31
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Jun 27 13:49:02 2026 +0000
Reduce copy-pasta in tests.
---
.../apache/commons/collections4/AbstractObjectTest.java | 4 ++--
.../commons/collections4/bidimap/DualTreeBidiMap2Test.java | 14 ++------------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git
a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
index b364f60cc..8fd26da50 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
@@ -141,13 +141,13 @@ public abstract class AbstractObjectTest extends BulkTest
{
return oStream.readObject();
}
- protected Object serializeDeserialize(final Object obj) throws
IOException, ClassNotFoundException {
+ protected <T> T serializeDeserialize(final T obj) throws IOException,
ClassNotFoundException {
final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
try (ObjectOutputStream out = new ObjectOutputStream(buffer)) {
out.writeObject(obj);
}
try (ObjectInputStream in = new ObjectInputStream(new
ByteArrayInputStream(buffer.toByteArray()))) {
- return in.readObject();
+ return (T) in.readObject();
}
}
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
index 4432dc49a..f8b030530 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
@@ -76,18 +76,8 @@ public class DualTreeBidiMap2Test<K extends Comparable<K>, V
extends Comparable<
@Test
void testCollections364() throws Exception {
- final DualTreeBidiMap<String, Integer> original = new
DualTreeBidiMap<>(
- String.CASE_INSENSITIVE_ORDER, new IntegerComparator());
- final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- final ObjectOutputStream out = new ObjectOutputStream(buffer);
- out.writeObject(original);
- out.close();
-
- final ObjectInputStream in = new ObjectInputStream(new
ByteArrayInputStream(buffer.toByteArray()));
- @SuppressWarnings("unchecked")
- final DualTreeBidiMap<String, Integer> deserialized =
(DualTreeBidiMap<String, Integer>) in.readObject();
- in.close();
-
+ final DualTreeBidiMap<String, Integer> original = new
DualTreeBidiMap<>(String.CASE_INSENSITIVE_ORDER, new IntegerComparator());
+ final DualTreeBidiMap<String, Integer> deserialized =
serializeDeserialize(original);
assertNotNull(original.comparator());
assertNotNull(deserialized.comparator());
assertEquals(original.comparator().getClass(),
deserialized.comparator().getClass());