(commons-collections) branch master updated: Parameterize testCopy()

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory 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 730d972cd Parameterize testCopy()
730d972cd is described below

commit 730d972cdebb13dd3a896eb5b90ebc9e1f594d5b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Oct 5 10:05:36 2024 -0400

    Parameterize testCopy()
---
 .../bloomfilter/AbstractBloomFilterTest.java       | 40 +++++++++++++---------
 .../bloomfilter/WrappedBloomFilterTest.java        |  6 ++++
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilterTest.java
 
b/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilterTest.java
index aef3ae1ec..c29d1ed24 100644
--- 
a/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilterTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilterTest.java
@@ -202,23 +202,6 @@ public abstract class AbstractBloomFilterTest<T extends 
BloomFilter> {
         assertEquals(0, bf1.cardinality());
     }
 
-    @Test
-    public void testCopy() {
-        final BloomFilter bf1 = createFilter(getTestShape(), 
TestingHashers.FROM1);
-        assertNotEquals(0, bf1.cardinality());
-        final BloomFilter copy = bf1.copy();
-        assertNotSame(bf1, copy);
-        assertArrayEquals(bf1.asBitMapArray(), copy.asBitMapArray());
-        assertArrayEquals(bf1.asIndexArray(), copy.asIndexArray());
-        assertEquals(bf1.cardinality(), copy.cardinality());
-        assertEquals(bf1.characteristics(), copy.characteristics());
-        assertEquals(bf1.estimateN(), copy.estimateN());
-        assertEquals(bf1.getClass(), copy.getClass());
-        assertEquals(bf1.getShape(), copy.getShape());
-        assertEquals(bf1.isEmpty(), copy.isEmpty());
-        assertEquals(bf1.isFull(), copy.isFull());
-    }
-
     @Test
     public final void testContains() {
         BloomFilter bf1 = createFilter(getTestShape(), TestingHashers.FROM1);
@@ -256,6 +239,29 @@ public abstract class AbstractBloomFilterTest<T extends 
BloomFilter> {
         assertTrue(bf4.contains(bf1));
     }
 
+    @Test
+    public void testCopy() {
+        testCopy(true);
+    }
+
+    protected void testCopy(final boolean assertClass) {
+        final BloomFilter bf1 = createFilter(getTestShape(), 
TestingHashers.FROM1);
+        assertNotEquals(0, bf1.cardinality());
+        final BloomFilter copy = bf1.copy();
+        assertNotSame(bf1, copy);
+        assertArrayEquals(bf1.asBitMapArray(), copy.asBitMapArray());
+        assertArrayEquals(bf1.asIndexArray(), copy.asIndexArray());
+        assertEquals(bf1.cardinality(), copy.cardinality());
+        assertEquals(bf1.characteristics(), copy.characteristics());
+        assertEquals(bf1.estimateN(), copy.estimateN());
+        if (assertClass) {
+            assertEquals(bf1.getClass(), copy.getClass());
+        }
+        assertEquals(bf1.getShape(), copy.getShape());
+        assertEquals(bf1.isEmpty(), copy.isEmpty());
+        assertEquals(bf1.isFull(), copy.isFull());
+    }
+
     @Test
     public void testEmptyAfterMergeWithNothing() {
         // test the case where is empty after merge
diff --git 
a/src/test/java/org/apache/commons/collections4/bloomfilter/WrappedBloomFilterTest.java
 
b/src/test/java/org/apache/commons/collections4/bloomfilter/WrappedBloomFilterTest.java
index e5947a90a..a9138b5f3 100644
--- 
a/src/test/java/org/apache/commons/collections4/bloomfilter/WrappedBloomFilterTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/bloomfilter/WrappedBloomFilterTest.java
@@ -55,4 +55,10 @@ public class WrappedBloomFilterTest extends 
AbstractBloomFilterTest<WrappedBloom
         };
         assertEquals(characteristics, underTest.characteristics());
     }
+
+    @Override
+    public void testCopy() {
+        testCopy(false);
+    }
+
 }