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 399145ae9 Reduce copy-pasta in tests.
399145ae9 is described below
commit 399145ae9fbc841d6cf521c1619c12e71a345d83
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Jun 27 14:07:44 2026 +0000
Reduce copy-pasta in tests.
---
.../commons/collections4/MultiMapUtilsTest.java | 2 +-
.../list/CursorableLinkedListTest.java | 35 ++-------------------
.../commons/collections4/map/Flat3MapTest.java | 36 ++--------------------
.../collections4/map/PredicatedMapTest.java | 14 +--------
.../commons/collections4/map/ReferenceMapTest.java | 22 ++-----------
.../collections4/queue/CircularFifoQueueTest.java | 20 ++----------
6 files changed, 13 insertions(+), 116 deletions(-)
diff --git
a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
index 4fd57edff..c399ece0d 100644
--- a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.collections4;
+import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-import static org.easymock.EasyMock.createMock;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git
a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
index a100c7edd..d8bcc695a 100644
---
a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
+++
b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
@@ -1144,17 +1144,7 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
for (int i = 0; i < 10000; i++) {
list.add((E) Integer.valueOf(i));
}
-
- final java.io.ByteArrayOutputStream buf = new
java.io.ByteArrayOutputStream();
- final java.io.ObjectOutputStream out = new
java.io.ObjectOutputStream(buf);
- out.writeObject(list);
- out.flush();
- out.close();
-
- final java.io.ByteArrayInputStream bufin = new
java.io.ByteArrayInputStream(buf.toByteArray());
- final java.io.ObjectInputStream in = new
java.io.ObjectInputStream(bufin);
- final Object list2 = in.readObject();
-
+ final Object list2 = serializeDeserialize(list);
assertNotSame(list, list2);
assertEquals(list2, list);
assertEquals(list, list2);
@@ -1274,17 +1264,7 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
list.add((E) "C");
list.add((E) "D");
list.add((E) "E");
-
- final java.io.ByteArrayOutputStream buf = new
java.io.ByteArrayOutputStream();
- final java.io.ObjectOutputStream out = new
java.io.ObjectOutputStream(buf);
- out.writeObject(list);
- out.flush();
- out.close();
-
- final java.io.ByteArrayInputStream bufIn = new
java.io.ByteArrayInputStream(buf.toByteArray());
- final java.io.ObjectInputStream in = new
java.io.ObjectInputStream(bufIn);
- final Object list2 = in.readObject();
-
+ final Object list2 = serializeDeserialize(list);
assertNotSame(list, list2);
assertEquals(list2, list);
assertEquals(list, list2);
@@ -1298,16 +1278,7 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
list.add((E) "C");
list.add((E) "D");
list.add((E) "E");
- final java.io.ByteArrayOutputStream buf = new
java.io.ByteArrayOutputStream();
- final java.io.ObjectOutputStream out = new
java.io.ObjectOutputStream(buf);
- out.writeObject(list);
- out.flush();
- out.close();
-
- final java.io.ByteArrayInputStream bufin = new
java.io.ByteArrayInputStream(buf.toByteArray());
- final java.io.ObjectInputStream in = new
java.io.ObjectInputStream(bufin);
- final Object list2 = in.readObject();
-
+ final Object list2 = serializeDeserialize(list);
assertNotSame(list, list2);
assertEquals(list2, list);
assertEquals(list, list2);
diff --git
a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 3db36c669..5342389ac 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -24,10 +24,6 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -783,15 +779,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
@Test
void testSerialization0() throws Exception {
final Flat3Map<K, V> map = makeObject();
- final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- final ObjectOutputStream out = new ObjectOutputStream(bout);
- out.writeObject(map);
- final byte[] bytes = bout.toByteArray();
- out.close();
- final ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
- final ObjectInputStream in = new ObjectInputStream(bin);
- final Flat3Map<?, ?> ser = (Flat3Map<?, ?>) in.readObject();
- in.close();
+ final Flat3Map<?, ?> ser = serializeDeserialize(map);
assertEquals(0, map.size());
assertEquals(0, ser.size());
}
@@ -802,16 +790,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
final Flat3Map<K, V> map = makeObject();
map.put((K) ONE, (V) TEN);
map.put((K) TWO, (V) TWENTY);
-
- final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- final ObjectOutputStream out = new ObjectOutputStream(bout);
- out.writeObject(map);
- final byte[] bytes = bout.toByteArray();
- out.close();
- final ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
- final ObjectInputStream in = new ObjectInputStream(bin);
- final Flat3Map<?, ?> ser = (Flat3Map<?, ?>) in.readObject();
- in.close();
+ final Flat3Map<?, ?> ser = serializeDeserialize(map);
assertEquals(2, map.size());
assertEquals(2, ser.size());
assertTrue(ser.containsKey(ONE));
@@ -828,16 +807,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
map.put((K) TWO, (V) TWENTY);
map.put((K) TEN, (V) ONE);
map.put((K) TWENTY, (V) TWO);
-
- final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- final ObjectOutputStream out = new ObjectOutputStream(bout);
- out.writeObject(map);
- final byte[] bytes = bout.toByteArray();
- out.close();
- final ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
- final ObjectInputStream in = new ObjectInputStream(bin);
- final Flat3Map<?, ?> ser = (Flat3Map<?, ?>) in.readObject();
- in.close();
+ final Flat3Map<?, ?> ser = serializeDeserialize(map);
assertEquals(4, map.size());
assertEquals(4, ser.size());
assertTrue(ser.containsKey(ONE));
diff --git
a/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
index ca3b74cee..50e25d331 100644
--- a/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
@@ -21,11 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -74,15 +70,7 @@ public class PredicatedMapTest<K, V> extends
AbstractIterableMapTest<K, V> {
// a crafted stream can carry an entry that never passed put(); mimic
it by
// writing one straight into the decorated map
map.decorated().put(null, (V) "value");
- final ByteArrayOutputStream out = new ByteArrayOutputStream();
- try (ObjectOutputStream oos = new ObjectOutputStream(out)) {
- oos.writeObject(map);
- }
- assertThrows(InvalidObjectException.class, () -> {
- try (ObjectInputStream ois = new ObjectInputStream(new
ByteArrayInputStream(out.toByteArray()))) {
- ois.readObject();
- }
- });
+ assertThrows(InvalidObjectException.class, () ->
serializeDeserialize(map));
}
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
index 1f8889d1e..9bb7db596 100644
--- a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
@@ -24,12 +24,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -293,23 +289,11 @@ public class ReferenceMapTest<K, V> extends
AbstractIterableMapTest<K, V> {
*/
@Test
void testDataSizeAfterSerialization() throws IOException,
ClassNotFoundException {
-
final ReferenceMap<String, String> serializeMap = new
ReferenceMap<>(ReferenceStrength.WEAK, ReferenceStrength.WEAK, true);
serializeMap.put("KEY", "VALUE");
-
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try (ObjectOutputStream out = new ObjectOutputStream(baos)) {
- out.writeObject(serializeMap);
- }
-
- final ByteArrayInputStream bais = new
ByteArrayInputStream(baos.toByteArray());
- try (ObjectInputStream in = new ObjectInputStream(bais)) {
- @SuppressWarnings("unchecked")
- final ReferenceMap<String, String> deserializedMap =
(ReferenceMap<String, String>) in.readObject();
- assertEquals(1, deserializedMap.size());
- assertEquals(serializeMap.data.length,
deserializedMap.data.length);
- }
-
+ final ReferenceMap<String, String> deserializedMap =
serializeDeserialize(serializeMap);
+ assertEquals(1, deserializedMap.size());
+ assertEquals(serializeMap.data.length, deserializedMap.data.length);
}
/**
diff --git
a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
index 35340d6e2..fca917e22 100644
---
a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
+++
b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
@@ -21,10 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -415,26 +411,14 @@ public class CircularFifoQueueTest<E> extends
AbstractQueueTest<E> {
b.add((E) "a");
assertEquals(1, b.size());
assertTrue(b.contains("a"));
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- new ObjectOutputStream(bos).writeObject(b);
-
- final CircularFifoQueue<E> b2 = (CircularFifoQueue<E>) new
ObjectInputStream(
- new ByteArrayInputStream(bos.toByteArray())).readObject();
-
+ final CircularFifoQueue<E> b2 = serializeDeserialize(b);
assertEquals(1, b2.size());
assertTrue(b2.contains("a"));
b2.add((E) "b");
assertEquals(2, b2.size());
assertTrue(b2.contains("a"));
assertTrue(b2.contains("b"));
-
- bos = new ByteArrayOutputStream();
- new ObjectOutputStream(bos).writeObject(b2);
-
- final CircularFifoQueue<E> b3 = (CircularFifoQueue<E>) new
ObjectInputStream(
- new ByteArrayInputStream(bos.toByteArray())).readObject();
-
+ final CircularFifoQueue<E> b3 = serializeDeserialize(b2);
assertEquals(2, b3.size());
assertTrue(b3.contains("a"));
assertTrue(b3.contains("b"));
