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 9e7f5ac13 [COLLECTIONS-777] Migrate to JUnit 5
9e7f5ac13 is described below
commit 9e7f5ac132c31f2f4a6e8171b051a382519275a9
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Nov 11 09:58:30 2024 -0500
[COLLECTIONS-777] Migrate to JUnit 5
Remove unused method
---
.../org/apache/commons/collections4/BulkTest.java | 37 ----------------------
.../collections4/bidimap/DualHashBidiMapTest.java | 8 -----
.../bidimap/DualLinkedHashBidiMapTest.java | 8 -----
.../collections4/bidimap/DualTreeBidiMap2Test.java | 9 ------
.../collections4/bidimap/DualTreeBidiMapTest.java | 9 ------
.../collections4/bidimap/TreeBidiMapTest.java | 8 -----
.../bidimap/UnmodifiableBidiMapTest.java | 8 -----
.../bidimap/UnmodifiableOrderedBidiMapTest.java | 8 -----
.../bidimap/UnmodifiableSortedBidiMapTest.java | 6 ----
.../list/CursorableLinkedListTest.java | 28 ----------------
.../commons/collections4/map/SingletonMapTest.java | 10 ------
.../collections4/map/StaticBucketMapTest.java | 11 -------
.../collections4/map/TransformedSortedMapTest.java | 5 ---
.../collections4/trie/UnmodifiableTrieTest.java | 8 -----
14 files changed, 163 deletions(-)
diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java
b/src/test/java/org/apache/commons/collections4/BulkTest.java
index 113fb2bef..ea0579aaa 100644
--- a/src/test/java/org/apache/commons/collections4/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -66,43 +66,6 @@ public class BulkTest {
return name;
}
- /**
- * Returns an array of test names to ignore.<P>
- *
- * If a test that's defined by this {@code BulkTest} or
- * by one of its bulk test methods has a name that's in the returned
- * array, then that simple test will not be executed.<P>
- *
- * A test's name is formed by taking the class name of the
- * root {@code BulkTest}, eliminating the package name, then
- * appending the names of any bulk test methods that were invoked
- * to get to the simple test, and then appending the simple test
- * method name. The method names are delimited by periods:
- *
- * <pre>
- * HashMapTest.bulkTestEntrySet.testClear
- * </pre>
- *
- * is the name of one of the simple tests defined in the sample classes
- * described above. If the sample {@code HashMapTest} class
- * included this method:
- *
- * <pre>
- * public String[] ignoredTests() {
- * return new String[] { "HashMapTest.bulkTestEntrySet.testClear" };
- * }
- * </pre>
- *
- * then the entry set's clear method wouldn't be tested, but the key
- * set's clear method would.
- *
- * @return an array of the names of tests to ignore, or null if
- * no tests should be ignored
- */
- public String[] ignoredTests() {
- return null;
- }
-
/**
* Returns the display name of this {@code BulkTest}.
*
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
index 975106e2b..a4df2a7e1 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
@@ -31,14 +31,6 @@ public class DualHashBidiMapTest<K, V> extends
AbstractBidiMapTest<K, V> {
return AbstractCollectionTest.UNORDERED;
}
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- return new String[] {
"DualHashBidiMapTest.bulkTestInverseMap.bulkTestInverseMap" };
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
index f3eb7caea..64bb47806 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
@@ -29,14 +29,6 @@ public class DualLinkedHashBidiMapTest<K, V> extends
AbstractBidiMapTest<K, V> {
return "4";
}
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- return new String[] {
"DualLinkedHashBidiMapTest.bulkTestInverseMap.bulkTestInverseMap" };
- }
-
/**
* {@inheritDoc}
*/
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 a8091f056..5e96b5537 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
@@ -60,15 +60,6 @@ public class DualTreeBidiMap2Test<K extends Comparable<K>, V
extends Comparable<
return "4.Test2";
}
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- final String recursiveTest =
"DualTreeBidiMap2Test.bulkTestInverseMap.bulkTestInverseMap";
- return new String[] { recursiveTest };
- }
-
@Override
public boolean isAllowNullValueGet() {
// TODO Is this a bug or a feature?
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
index cb48f5dff..5050d1cbf 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
@@ -25,15 +25,6 @@ public class DualTreeBidiMapTest<K extends Comparable<K>, V
extends Comparable<V
super();
}
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- final String recursiveTest =
"DualTreeBidiMapTest.bulkTestInverseMap.bulkTestInverseMap";
- return new String[] { recursiveTest };
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
index 54f77094c..577991900 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
@@ -30,14 +30,6 @@ public class TreeBidiMapTest<K extends Comparable<K>, V
extends Comparable<V>> e
return "4";
}
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- return new String[]
{"TreeBidiMapTest.bulkTestInverseMap.bulkTestInverseMap"};
- }
-
@Override
public boolean isAllowNullKey() {
return false;
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
index 69f4a4be9..f7405c49d 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
@@ -41,14 +41,6 @@ public class UnmodifiableBidiMapTest<K, V> extends
AbstractBidiMapTest<K, V> {
return AbstractCollectionTest.UNORDERED;
}
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- return new String[]
{"UnmodifiableBidiMapTest.bulkTestInverseMap.bulkTestInverseMap"};
- }
-
@Override
public boolean isPutAddSupported() {
return false;
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
index 47f66049a..2ddb33ba9 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
@@ -32,14 +32,6 @@ import org.junit.jupiter.api.Test;
*/
public class UnmodifiableOrderedBidiMapTest<K extends Comparable<K>, V extends
Comparable<V>> extends AbstractOrderedBidiMapTest<K, V> {
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- return new String[]
{"UnmodifiableOrderedBidiMapTest.bulkTestInverseMap.bulkTestInverseMap"};
- }
-
@Override
public boolean isAllowNullKey() {
return false;
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
index 197706fed..eb3bc9695 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
@@ -36,12 +36,6 @@ public class UnmodifiableSortedBidiMapTest<K extends
Comparable<K>, V extends Co
super();
}
- @Override
- public String[] ignoredTests() {
- // Override to prevent infinite recursion of tests.
- return new String[]
{"UnmodifiableSortedBidiMapTest.bulkTestInverseMap.bulkTestInverseMap"};
- }
-
@Override
public boolean isAllowNullKey() {
return false;
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 1d8370d2d..7740327f9 100644
---
a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
+++
b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
@@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.ArrayList;
import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.Iterator;
@@ -50,33 +49,6 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
return "4";
}
- /**
- * Ignore the serialization tests for sublists and sub-sublists.
- *
- * @return an array of sublist serialization test names
- */
- @Override
- public String[] ignoredTests() {
- final ArrayList<String> list = new ArrayList<>();
- final String prefix = "CursorableLinkedListTest";
- final String bulk = ".bulkTestSubList";
- final String[] ignored = {
- ".testEmptyListSerialization",
- ".testFullListSerialization",
- ".testEmptyListCompatibility",
- ".testFullListCompatibility",
- ".testSimpleSerialization",
- ".testCanonicalEmptyCollectionExists",
- ".testCanonicalFullCollectionExists",
- ".testSerializeDeserializeThenCompare"
- };
- for (final String element : ignored) {
- list.add(prefix + bulk + element);
- list.add(prefix + bulk + bulk + element);
- }
- return list.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
- }
-
@Override
public CursorableLinkedList<E> makeObject() {
return new CursorableLinkedList<>();
diff --git
a/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
index ab8f5d9c6..739f14f5f 100644
--- a/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
@@ -62,16 +62,6 @@ public class SingletonMapTest<K, V> extends
AbstractOrderedMapTest<K, V> {
return (V[]) new Object[] { TWO };
}
- @Override
- public String[] ignoredTests() {
- // the ridiculous map above still doesn't pass these tests
- // but it's not relevant, so we ignore them
- return new String[] {
- "SingletonMapTest.bulkTestMapIterator.testEmptyMapIterator",
- "SingletonMapTest.bulkTestOrderedMapIterator.testEmptyMapIterator",
- };
- }
-
@Override
public boolean isPutAddSupported() {
return false;
diff --git
a/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
index 0629ac613..ab068f663 100644
--- a/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
@@ -32,17 +32,6 @@ import org.junit.jupiter.api.Test;
*/
public class StaticBucketMapTest<K, V> extends AbstractIterableMapTest<K, V> {
- @Override
- public String[] ignoredTests() {
- final String pre = "StaticBucketMapTest.bulkTestMap";
- final String post = ".testCollectionIteratorFailFast";
- return new String[] {
- pre + "EntrySet" + post,
- pre + "KeySet" + post,
- pre + "Values" + post
- };
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
index a32881a29..c3119c579 100644
---
a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
@@ -45,11 +45,6 @@ public class TransformedSortedMapTest<K, V> extends
AbstractSortedMapTest<K, V>
return "4";
}
- @Override
- public String[] ignoredTests() {
- return null;
- }
-
@Override
public boolean isSubMapViewsSerializable() {
// TreeMap sub map views have a bug in deserialization.
diff --git
a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
index 88fdfbfca..094b90a59 100644
---
a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
+++
b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
@@ -38,14 +38,6 @@ public class UnmodifiableTrieTest<V> extends
AbstractSortedMapTest<String, V> {
return "4";
}
- /**
- * Override to prevent infinite recursion of tests.
- */
- @Override
- public String[] ignoredTests() {
- return null;
- }
-
@Override
public boolean isPutAddSupported() {
return false;
