From aa13ed385ba9c697c2f594e2aac5fe10d4f512f7 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 11 Nov 2024 08:50:52 -0500 Subject: [PATCH] [COLLECTIONS-777] Migrate to JUnit 5 Remove JUnit 3 constructors --- .../collections4/AbstractArrayListTest.java | 4 ---- .../collections4/AbstractLinkedListTest.java | 4 ---- .../collections4/AbstractObjectTest.java | 9 -------- .../collections4/AbstractTreeMapTest.java | 4 ---- .../commons/collections4/ArrayStackTest.java | 4 ---- .../apache/commons/collections4/BulkTest.java | 23 ++++++++----------- .../collections4/bag/AbstractBagTest.java | 10 +------- .../bag/AbstractSortedBagTest.java | 4 ---- .../collections4/bag/CollectionBagTest.java | 7 ------ .../bag/CollectionSortedBagTest.java | 7 ------ .../commons/collections4/bag/HashBagTest.java | 4 ---- .../collections4/bag/PredicatedBagTest.java | 4 ---- .../bag/PredicatedSortedBagTest.java | 4 ---- .../collections4/bag/SynchronizedBagTest.java | 4 ---- .../collections4/bag/TransformedBagTest.java | 4 ---- .../bag/TransformedSortedBagTest.java | 4 ---- .../commons/collections4/bag/TreeBagTest.java | 4 ---- .../collections4/bag/UnmodifiableBagTest.java | 4 ---- .../bag/UnmodifiableSortedBagTest.java | 4 ---- .../bidimap/AbstractBidiMapTest.java | 12 ---------- .../AbstractOrderedBidiMapDecoratorTest.java | 4 ---- .../bidimap/AbstractOrderedBidiMapTest.java | 11 --------- .../bidimap/AbstractSortedBidiMapTest.java | 3 +-- .../bidimap/DualHashBidiMapTest.java | 4 ---- .../bidimap/DualLinkedHashBidiMapTest.java | 4 ---- .../bidimap/DualTreeBidiMap2Test.java | 2 +- .../bidimap/DualTreeBidiMapTest.java | 2 +- .../collections4/bidimap/TreeBidiMapTest.java | 4 ---- .../bidimap/UnmodifiableBidiMapTest.java | 4 ---- .../UnmodifiableOrderedBidiMapTest.java | 4 ---- .../UnmodifiableSortedBidiMapTest.java | 2 +- .../collection/AbstractCollectionTest.java | 9 -------- .../collection/CompositeCollectionTest.java | 4 ---- .../collection/IndexedCollectionTest.java | 4 ---- .../collection/PredicatedCollectionTest.java | 4 ---- .../SynchronizedCollectionTest.java | 4 ---- .../collection/TransformedCollectionTest.java | 4 ---- .../UnmodifiableBoundedCollectionTest.java | 4 ---- .../UnmodifiableCollectionTest.java | 4 ---- .../comparators/AbstractComparatorTest.java | 9 -------- .../AbstractNullComparatorTest.java | 11 --------- .../comparators/BooleanComparatorTest.java | 4 ---- .../comparators/ComparableComparatorTest.java | 4 ---- .../comparators/ComparatorChainTest.java | 4 ---- .../comparators/FixedOrderComparatorTest.java | 8 ------- .../comparators/ReverseComparatorTest.java | 4 ---- .../TransformingComparatorTest.java | 16 ------------- .../iterators/AbstractIteratorTest.java | 9 -------- .../iterators/AbstractListIteratorTest.java | 9 -------- .../iterators/AbstractMapIteratorTest.java | 9 -------- .../AbstractOrderedMapIteratorTest.java | 9 -------- .../iterators/ArrayIterator2Test.java | 4 ---- .../iterators/ArrayIteratorTest.java | 4 ---- .../iterators/ArrayListIterator2Test.java | 3 --- .../iterators/ArrayListIteratorTest.java | 3 --- .../iterators/BoundedIteratorTest.java | 4 ---- .../CartesianProductIteratorTest.java | 4 ---- .../iterators/CollatingIteratorTest.java | 11 --------- .../iterators/FilterIteratorTest.java | 5 ---- .../iterators/IteratorChainTest.java | 4 ---- .../iterators/IteratorIterableTest.java | 4 ---- .../iterators/LazyIteratorChainTest.java | 4 ---- .../iterators/ListIteratorWrapper2Test.java | 4 ---- .../iterators/ListIteratorWrapperTest.java | 5 ---- .../iterators/NodeListIteratorTest.java | 7 ------ .../iterators/ObjectArrayIteratorTest.java | 4 ---- .../ObjectArrayListIterator2Test.java | 4 ---- .../ObjectArrayListIteratorTest.java | 3 --- .../iterators/ObjectGraphIteratorTest.java | 4 ---- .../iterators/PeekingIteratorTest.java | 4 ---- .../iterators/PermutationIteratorTest.java | 4 ---- .../iterators/PushbackIteratorTest.java | 4 ---- .../iterators/ReverseListIteratorTest.java | 4 ---- .../iterators/SingletonIterator2Test.java | 4 ---- .../iterators/SingletonIteratorTest.java | 4 ---- .../iterators/SingletonListIteratorTest.java | 4 ---- .../iterators/SkippingIteratorTest.java | 4 ---- .../iterators/UniqueFilterIteratorTest.java | 4 ---- .../iterators/UnmodifiableIteratorTest.java | 4 ---- .../UnmodifiableListIteratorTest.java | 4 ---- .../UnmodifiableMapIteratorTest.java | 5 ---- .../UnmodifiableOrderedMapIteratorTest.java | 4 ---- .../iterators/ZippingIteratorTest.java | 11 --------- .../list/AbstractLinkedListTest.java | 4 ---- .../collections4/list/AbstractListTest.java | 14 ----------- .../list/CursorableLinkedListTest.java | 3 --- .../DefaultAbstractLinkedListJava21Test.java | 4 ---- .../collections4/list/FixedSizeListTest.java | 4 ---- .../collections4/list/GrowthListTest.java | 4 ---- .../collections4/list/LazyListTest.java | 4 ---- .../list/NodeCachingLinkedListTest.java | 4 ---- .../collections4/list/PredicatedListTest.java | 4 ---- .../collections4/list/SetUniqueListTest.java | 4 ---- .../list/TransformedListTest.java | 4 ---- .../collections4/list/TreeListTest.java | 4 ---- .../list/UnmodifiableListTest.java | 4 ---- ...bstractConcurrentReferenceHashMapTest.java | 4 ---- .../map/AbstractIterableMapTest.java | 12 ---------- .../collections4/map/AbstractMapTest.java | 19 --------------- .../map/AbstractOrderedMapTest.java | 12 ---------- .../map/AbstractSortedMapTest.java | 18 ++++----------- .../map/CaseInsensitiveMapTest.java | 4 ---- .../collections4/map/CompositeMapTest.java | 4 ---- .../map/ConcurrentHashMapSanityTest.java | 4 ---- .../collections4/map/DefaultedMapTest.java | 4 ---- .../collections4/map/FixedSizeMapTest.java | 4 ---- .../map/FixedSizeSortedMapTest.java | 4 ---- .../collections4/map/Flat3MapTest.java | 7 ------ .../collections4/map/HashMapSanityTest.java | 4 ---- .../collections4/map/HashedMapTest.java | 4 ---- .../commons/collections4/map/LRUMapTest.java | 4 ---- .../commons/collections4/map/LazyMapTest.java | 4 ---- .../collections4/map/LazySortedMapTest.java | 4 ---- .../collections4/map/LinkedMapTest.java | 8 ------- .../collections4/map/ListOrderedMap2Test.java | 8 ------- .../collections4/map/ListOrderedMapTest.java | 12 ---------- .../collections4/map/MultiKeyMapTest.java | 4 ---- .../collections4/map/MultiValueMapTest.java | 4 ---- .../map/PassiveExpiringMapTest.java | 4 ---- .../collections4/map/PredicatedMapTest.java | 4 ---- .../map/PredicatedSortedMapTest.java | 4 ---- .../map/ReferenceIdentityMapTest.java | 4 ---- .../collections4/map/ReferenceMapTest.java | 4 ---- .../collections4/map/SingletonMapTest.java | 4 ---- .../collections4/map/StaticBucketMapTest.java | 4 ---- .../collections4/map/TransformedMapTest.java | 4 ---- .../map/TransformedSortedMapTest.java | 4 ---- .../collections4/map/UnmodifiableMapTest.java | 4 ---- .../map/UnmodifiableOrderedMapTest.java | 4 ---- .../map/UnmodifiableSortedMapTest.java | 4 ---- .../multimap/AbstractMultiValuedMapTest.java | 22 ------------------ .../multimap/ArrayListValuedHashMapTest.java | 4 ---- .../ArrayListValuedLinkedHashMapTest.java | 4 ---- .../multimap/HashSetValuedHashMapTest.java | 4 ---- .../LinkedHashSetValuedLinkedHashMapTest.java | 4 ---- .../TransformedMultiValuedMapTest.java | 4 ---- .../UnmodifiableMultiValuedMapTest.java | 4 ---- .../multiset/AbstractMultiSetTest.java | 13 ----------- .../multiset/HashMultiSetTest.java | 4 ---- .../multiset/PredicatedMultiSetTest.java | 4 ---- .../multiset/SynchronizedMultiSetTest.java | 4 ---- .../multiset/UnmodifiableMultiSetTest.java | 4 ---- .../collections4/queue/AbstractQueueTest.java | 9 -------- .../queue/CircularFifoQueueTest.java | 4 ---- .../queue/PredicatedQueueTest.java | 4 ---- .../queue/SynchronizedQueueTest.java | 4 ---- .../queue/TransformedQueueTest.java | 4 ---- .../queue/UnmodifiableQueueTest.java | 4 ---- .../set/AbstractNavigableSetTest.java | 11 --------- .../collections4/set/AbstractSetTest.java | 9 -------- .../set/AbstractSortedSetTest.java | 11 --------- .../collections4/set/CompositeSetTest.java | 4 ---- .../collections4/set/ListOrderedSet2Test.java | 4 ---- .../collections4/set/ListOrderedSetTest.java | 4 ---- .../collections4/set/MapBackedSet2Test.java | 4 ---- .../collections4/set/MapBackedSetTest.java | 4 ---- .../set/PredicatedNavigableSetTest.java | 4 ---- .../collections4/set/PredicatedSetTest.java | 4 ---- .../set/PredicatedSortedSetTest.java | 4 ---- .../set/TransformedNavigableSetTest.java | 4 ---- .../collections4/set/TransformedSetTest.java | 4 ---- .../set/TransformedSortedSetTest.java | 4 ---- .../set/UnmodifiableNavigableSetTest.java | 4 ---- .../collections4/set/UnmodifiableSetTest.java | 4 ---- .../set/UnmodifiableSortedSetTest.java | 4 ---- .../splitmap/TransformedSplitMapTest.java | 4 ---- .../collections4/trie/PatriciaTrie2Test.java | 4 ---- .../collections4/trie/PatriciaTrieTest.java | 4 ---- .../trie/UnmodifiableTrieTest.java | 4 ---- 169 files changed, 18 insertions(+), 896 deletions(-) diff --git a/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java index bded5ecc5..ac65cdebf 100644 --- a/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java @@ -30,10 +30,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractArrayListTest extends AbstractListTest { - public AbstractArrayListTest(final String testName) { - super(testName); - } - /** * {@inheritDoc} */ diff --git a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java index 241326499..79bdc9bbd 100644 --- a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java @@ -40,10 +40,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractLinkedListTest extends AbstractListTest { - public AbstractLinkedListTest(final String testName) { - super(testName); - } - /** * Returns the {@link #collection} field cast to a {@link LinkedList}. * diff --git a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java index c159c9e80..9ebbed282 100644 --- a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java @@ -49,15 +49,6 @@ public abstract class AbstractObjectTest extends BulkTest { /** Current major release for Collections */ public static final int COLLECTIONS_MAJOR_VERSION = 4; - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractObjectTest(final String testName) { - super(testName); - } - protected String getCanonicalEmptyCollectionName(final Object object) { final StringBuilder retval = new StringBuilder(); retval.append(TEST_DATA_PATH); diff --git a/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java index 3efd919ff..c3bda4056 100644 --- a/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java @@ -32,10 +32,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractTreeMapTest extends AbstractMapTest, K, V> { - public AbstractTreeMapTest(final String testName) { - super(testName); - } - @Override public boolean isAllowNullKey() { return false; diff --git a/src/test/java/org/apache/commons/collections4/ArrayStackTest.java b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java index 3c34cce7e..758ca9177 100644 --- a/src/test/java/org/apache/commons/collections4/ArrayStackTest.java +++ b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java @@ -31,10 +31,6 @@ import org.junit.jupiter.api.Test; @SuppressWarnings("deprecation") // we test a deprecated class public class ArrayStackTest extends AbstractArrayListTest { - public ArrayStackTest() { - super(ArrayStackTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java b/src/test/java/org/apache/commons/collections4/BulkTest.java index 5c5a823ac..2041eba5a 100644 --- a/src/test/java/org/apache/commons/collections4/BulkTest.java +++ b/src/test/java/org/apache/commons/collections4/BulkTest.java @@ -16,21 +16,18 @@ */ package org.apache.commons.collections4; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** - * A {@link TestCase} that can define both simple and bulk test methods. + * A {@code TestCase} that can define both simple and bulk test methods. *

* A simple test method is the type of test traditionally - * supplied by {@link TestCase}. To define a simple test, create a public + * supplied by {@code TestCase}. To define a simple test, create a public * no-argument method whose name starts with "test". You can specify * the name of simple test in the constructor of {@code BulkTest}; - * a subsequent call to {@link TestCase#run} will run that simple test. + * a subsequent call to {@code TestCase#run} will run that simple test. *

* A bulk test method, on the other hand, returns a new instance * of {@code BulkTest}, which can itself define new simple and bulk - * test methods. By using the {@link #makeSuite} method, you can + * test methods. By using the {@code #makeSuite} method, you can * automatically create a hierarchical suite of tests and child bulk tests. *

* For instance, consider the following two classes: @@ -121,11 +118,11 @@ import junit.framework.TestSuite; * A subclass can override a superclass's bulk test by * returning {@code null} from the bulk test method. If you only * want to override specific simple tests within a bulk test, use the - * {@link #ignoredTests} method.

+ * {@code #ignoredTests} method.

* * Note that if you want to use the bulk test methods, you must - * define your {@code suite()} method to use {@link #makeSuite}. - * The ordinary {@link TestSuite} constructor doesn't know how to + * define your {@code suite()} method to use {@code #makeSuite}. + * The ordinary {@code TestSuite} constructor doesn't know how to * interpret bulk test methods. */ public class BulkTest implements Cloneable { @@ -160,11 +157,9 @@ public class BulkTest implements Cloneable { /** * Constructs a new {@code BulkTest} instance that will run the * specified simple test. - * - * @param name the name of the simple test method to run */ - public BulkTest(final String name) { - this.name = name; + public BulkTest() { + this.name = getClass().getSimpleName(); this.verboseName = getClass().getName(); } diff --git a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java index 31236a413..7c55ecd15 100644 --- a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java @@ -39,7 +39,6 @@ import org.apache.commons.collections4.BulkTest; import org.apache.commons.collections4.collection.AbstractCollectionTest; import org.apache.commons.collections4.set.AbstractSetTest; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; /** @@ -71,10 +70,6 @@ public abstract class AbstractBagTest extends AbstractCollectionTest { public class TestBagUniqueSet extends AbstractSetTest { - public TestBagUniqueSet() { - super(StringUtils.EMPTY); - } - @Override public T[] getFullElements() { return AbstractBagTest.this.getFullElements(); @@ -142,11 +137,8 @@ public abstract class AbstractBagTest extends AbstractCollectionTest { /** * JUnit constructor. - * - * @param testName the test class name */ - public AbstractBagTest(final String testName) { - super(testName); + public AbstractBagTest() { } /** diff --git a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java index eb49dd068..d49fac93a 100644 --- a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java @@ -29,10 +29,6 @@ import org.apache.commons.collections4.SortedBag; */ public abstract class AbstractSortedBagTest extends AbstractBagTest { - public AbstractSortedBagTest(final String testName) { - super(testName); - } - /** * Returns the {@link #collection} field cast to a {@link SortedBag}. * diff --git a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java index 93a3be1de..aa0375f47 100644 --- a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java @@ -41,13 +41,6 @@ import org.junit.jupiter.api.Test; */ public class CollectionBagTest extends AbstractCollectionTest { - /** - * JUnit constructor. - */ - public CollectionBagTest() { - super(CollectionBagTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java index 08c8d5d00..18733040a 100644 --- a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java @@ -37,13 +37,6 @@ import org.junit.jupiter.api.Test; */ public class CollectionSortedBagTest extends AbstractCollectionTest { - /** - * JUnit constructor. - */ - public CollectionSortedBagTest() { - super(CollectionSortedBagTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java index 7a0d359b2..1f640f9e4 100644 --- a/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java @@ -24,10 +24,6 @@ import org.apache.commons.collections4.Bag; */ public class HashBagTest extends AbstractBagTest { - public HashBagTest() { - super(HashBagTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java index 5ca627a0b..05bb1524b 100644 --- a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java @@ -36,10 +36,6 @@ public class PredicatedBagTest extends AbstractBagTest { protected Predicate truePredicate = TruePredicate.truePredicate(); - public PredicatedBagTest() { - super(PredicatedBagTest.class.getSimpleName()); - } - protected Bag decorateBag(final HashBag bag, final Predicate predicate) { return PredicatedBag.predicatedBag(bag, predicate); } diff --git a/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java index 0c35f5858..cb4b28905 100644 --- a/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java @@ -37,10 +37,6 @@ public class PredicatedSortedBagTest extends AbstractSortedBagTest { protected Predicate truePredicate = TruePredicate.truePredicate(); - public PredicatedSortedBagTest() { - super(PredicatedSortedBagTest.class.getSimpleName()); - } - protected SortedBag decorateBag(final SortedBag bag, final Predicate predicate) { return PredicatedSortedBag.predicatedSortedBag(bag, predicate); } diff --git a/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java index 483bce8f5..ce17a42cb 100644 --- a/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java @@ -23,10 +23,6 @@ import org.apache.commons.collections4.Bag; */ public class SynchronizedBagTest extends AbstractBagTest { - public SynchronizedBagTest() { - super(SynchronizedBagTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java index 2b643a473..38e7c2566 100644 --- a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java @@ -31,10 +31,6 @@ import org.junit.jupiter.api.Test; */ public class TransformedBagTest extends AbstractBagTest { - public TransformedBagTest() { - super(TransformedBagTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java index 6a1626e12..342a64363 100644 --- a/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java @@ -30,10 +30,6 @@ import org.junit.jupiter.api.Test; */ public class TransformedSortedBagTest extends AbstractSortedBagTest { - public TransformedSortedBagTest() { - super(TransformedSortedBagTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java index 92ff50f17..d27265c52 100644 --- a/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java @@ -29,10 +29,6 @@ import org.junit.jupiter.api.Test; */ public class TreeBagTest extends AbstractSortedBagTest { - public TreeBagTest() { - super(TreeBagTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java index bb1e973b8..73a2c7c61 100644 --- a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java @@ -33,10 +33,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableBagTest extends AbstractBagTest { - public UnmodifiableBagTest() { - super(UnmodifiableBagTest.class.getSimpleName()); - } - @Override public Bag getCollection() { return super.getCollection(); diff --git a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java index 6091529a3..934262b8c 100644 --- a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java @@ -33,10 +33,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableSortedBagTest extends AbstractSortedBagTest { - public UnmodifiableSortedBagTest() { - super(UnmodifiableSortedBagTest.class.getSimpleName()); - } - @Override public SortedBag getCollection() { return super.getCollection(); diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java index 74cbd0727..015017d02 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java @@ -110,10 +110,6 @@ public abstract class AbstractBidiMapTest extends AbstractIterableMapTest< public class TestBidiMapIterator extends AbstractMapIteratorTest { - public TestBidiMapIterator() { - super("TestBidiMapIterator"); - } - @Override public V[] addSetValues() { return getNewSampleValues(); @@ -240,14 +236,6 @@ public abstract class AbstractBidiMapTest extends AbstractIterableMapTest< } } - public AbstractBidiMapTest() { - super("Inverse"); - } - - public AbstractBidiMapTest(final String testName) { - super(testName); - } - public BulkTest bulkTestBidiMapIterator() { return new TestBidiMapIterator(); } diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java index 2d6483d6b..995a17a0d 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java @@ -55,10 +55,6 @@ public abstract class AbstractOrderedBidiMapDecoratorTest } } - public AbstractOrderedBidiMapDecoratorTest(final String testName) { - super(testName); - } - @Override public boolean isAllowNullKey() { return false; diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java index 887fad690..31fe48836 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java @@ -40,10 +40,6 @@ public abstract class AbstractOrderedBidiMapTest extends AbstractBidiMapTe public class TestBidiOrderedMapIterator extends AbstractMapIteratorTest { - public TestBidiOrderedMapIterator() { - super("TestBidiOrderedMapIterator"); - } - @Override public V[] addSetValues() { return getNewSampleValues(); @@ -91,13 +87,6 @@ public abstract class AbstractOrderedBidiMapTest extends AbstractBidiMapTe } - public AbstractOrderedBidiMapTest() { - } - - public AbstractOrderedBidiMapTest(final String testName) { - super(testName); - } - public BulkTest bulkTestOrderedMapIterator() { return new TestBidiOrderedMapIterator(); } diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java index 2ec1a5d94..9e4f60389 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java @@ -45,8 +45,7 @@ public abstract class AbstractSortedBidiMapTest, V exten protected List sortedValues = new ArrayList<>(); protected SortedSet sortedNewValues = new TreeSet<>(); - public AbstractSortedBidiMapTest(final String testName) { - super(testName); + public AbstractSortedBidiMapTest() { sortedKeys = getAsList(getSampleKeys()); Collections.sort(sortedKeys); sortedKeys = Collections.unmodifiableList(sortedKeys); 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 109c27c65..975106e2b 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java @@ -26,10 +26,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest; */ public class DualHashBidiMapTest extends AbstractBidiMapTest { - public DualHashBidiMapTest() { - super(DualHashBidiMapTest.class.getSimpleName()); - } - @Override protected int getIterationBehaviour() { return AbstractCollectionTest.UNORDERED; 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 392fd00d7..f3eb7caea 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java @@ -24,10 +24,6 @@ package org.apache.commons.collections4.bidimap; */ public class DualLinkedHashBidiMapTest extends AbstractBidiMapTest { - public DualLinkedHashBidiMapTest() { - super(DualLinkedHashBidiMapTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; 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 5329b861e..a8091f056 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java @@ -52,7 +52,7 @@ public class DualTreeBidiMap2Test, V extends Comparable< } public DualTreeBidiMap2Test() { - super(DualTreeBidiMap2Test.class.getSimpleName()); + super(); } @Override 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 f6cc5349f..cb48f5dff 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java @@ -22,7 +22,7 @@ package org.apache.commons.collections4.bidimap; public class DualTreeBidiMapTest, V extends Comparable> extends AbstractSortedBidiMapTest { public DualTreeBidiMapTest() { - super(DualTreeBidiMapTest.class.getSimpleName()); + super(); } /** 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 17fa5ee12..54f77094c 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java @@ -25,10 +25,6 @@ import org.apache.commons.collections4.BidiMap; */ public class TreeBidiMapTest, V extends Comparable> extends AbstractOrderedBidiMapTest { - public TreeBidiMapTest() { - super(TreeBidiMapTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; 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 397a59db7..69f4a4be9 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java @@ -36,10 +36,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableBidiMapTest extends AbstractBidiMapTest { - public UnmodifiableBidiMapTest() { - super(UnmodifiableBidiMapTest.class.getSimpleName()); - } - @Override protected int getIterationBehaviour() { return AbstractCollectionTest.UNORDERED; 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 882c60fb5..47f66049a 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java @@ -32,10 +32,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableOrderedBidiMapTest, V extends Comparable> extends AbstractOrderedBidiMapTest { - public UnmodifiableOrderedBidiMapTest() { - super(UnmodifiableOrderedBidiMapTest.class.getSimpleName()); - } - /** * Override to prevent infinite recursion of tests. */ 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 403b7a24d..197706fed 100644 --- a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test; public class UnmodifiableSortedBidiMapTest, V extends Comparable> extends AbstractSortedBidiMapTest { public UnmodifiableSortedBidiMapTest() { - super(UnmodifiableSortedBidiMapTest.class.getSimpleName()); + super(); } @Override 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 2734027c9..ec48d6714 100644 --- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java @@ -259,15 +259,6 @@ public abstract class AbstractCollectionTest extends AbstractObjectTest { */ private Collection confirmed; - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractCollectionTest(final String testName) { - super(testName); - } - /** * Specifies whether equal elements in the collection are, in fact, * distinguishable with information not readily available. That is, if a diff --git a/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java index 24017d669..ed576d61f 100644 --- a/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java @@ -43,10 +43,6 @@ public class CompositeCollectionTest extends AbstractCollectionTest { protected Collection two; - public CompositeCollectionTest() { - super(CompositeCollectionTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java index 1e6cbaf91..b6f5585fa 100644 --- a/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java @@ -45,10 +45,6 @@ public class IndexedCollectionTest extends AbstractCollectionTest { } } - public IndexedCollectionTest() { - super(IndexedCollectionTest.class.getSimpleName()); - } - protected Collection decorateCollection(final Collection collection) { return IndexedCollection.nonUniqueIndexedCollection(collection, new IntegerTransformer()); } diff --git a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java index cb334e3df..4ff2c0da9 100644 --- a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java @@ -39,10 +39,6 @@ public class PredicatedCollectionTest extends AbstractCollectionTest { protected Predicate testPredicate = String.class::isInstance; - public PredicatedCollectionTest() { - super(PredicatedCollectionTest.class.getSimpleName()); - } - protected Collection decorateCollection( final Collection collection, final Predicate predicate) { return PredicatedCollection.predicatedCollection(collection, predicate); diff --git a/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java index 7ca5104ab..b019d6cc6 100644 --- a/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java @@ -26,10 +26,6 @@ import java.util.Collection; */ public class SynchronizedCollectionTest extends AbstractCollectionTest { - public SynchronizedCollectionTest() { - super(SynchronizedCollectionTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java index 9b137b37d..23ee6d75e 100644 --- a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java @@ -54,10 +54,6 @@ public class TransformedCollectionTest extends AbstractCollectionTest { public static final Transformer STRING_TO_INTEGER_TRANSFORMER = new StringToInteger(); public static final Transformer TO_LOWER_CASE_TRANSFORMER = new ToLowerCase(); - public TransformedCollectionTest() { - super(TransformedCollectionTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java index 69a53256e..aac99ca29 100644 --- a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java @@ -35,10 +35,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableBoundedCollectionTest extends AbstractCollectionTest { - public UnmodifiableBoundedCollectionTest() { - super(UnmodifiableBoundedCollectionTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java index 18ca1cf1c..9316e90fc 100644 --- a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java @@ -34,10 +34,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableCollectionTest extends AbstractCollectionTest { - public UnmodifiableCollectionTest() { - super(UnmodifiableCollectionTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java index 3a6df5dfd..4902883eb 100644 --- a/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java @@ -39,15 +39,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractComparatorTest extends AbstractObjectTest { - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractComparatorTest(final String testName) { - super(testName); - } - public String getCanonicalComparatorName(final Object object) { final StringBuilder retval = new StringBuilder(); retval.append(TEST_DATA_PATH); diff --git a/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java index 75749b4b2..01c8f38de 100644 --- a/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java @@ -30,10 +30,6 @@ public abstract class AbstractNullComparatorTest extends AbstractComparatorTest< **/ public static class TestNullComparator1 extends AbstractNullComparatorTest { - public TestNullComparator1(final String testName) { - super(testName); - } - @Override public String getCanonicalComparatorName(final Object object) { return super.getCanonicalComparatorName(object) + "1"; @@ -72,10 +68,6 @@ public abstract class AbstractNullComparatorTest extends AbstractComparatorTest< **/ public static class TestNullComparator2 extends AbstractNullComparatorTest { - public TestNullComparator2(final String testName) { - super(testName); - } - @Override public String getCanonicalComparatorName(final Object object) { return super.getCanonicalComparatorName(object) + "2"; @@ -109,7 +101,4 @@ public abstract class AbstractNullComparatorTest extends AbstractComparatorTest< } - public AbstractNullComparatorTest(final String testName) { - super(testName); - } } diff --git a/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java index cbd115dd1..63a721e10 100644 --- a/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java @@ -37,10 +37,6 @@ import org.junit.jupiter.api.Test; @SuppressWarnings("boxing") public class BooleanComparatorTest extends AbstractComparatorTest { - public BooleanComparatorTest() { - super(BooleanComparatorTest.class.getSimpleName()); - } - protected void allTests(final boolean trueFirst, final BooleanComparator comp) { orderIndependentTests(comp); if (trueFirst) { diff --git a/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java index d8c9de717..edf062ab8 100644 --- a/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java @@ -26,10 +26,6 @@ import java.util.List; @SuppressWarnings("boxing") public class ComparableComparatorTest extends AbstractComparatorTest { - public ComparableComparatorTest() { - super(ComparableComparatorTest.class.getSimpleName()); - } - @Override public List getComparableObjectsOrdered() { final List list = new LinkedList<>(); diff --git a/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java index 64f7529cd..5c700836f 100644 --- a/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java @@ -93,10 +93,6 @@ public class ComparatorChainTest extends AbstractComparatorTest { "Buenos Aires" }; - // - // Set up and tear down - // - - public FixedOrderComparatorTest() { - super(FixedOrderComparatorTest.class.getSimpleName()); - } - /** Shuffles the keys and asserts that the comparator sorts them back to * their original order. */ diff --git a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java index 69f83f814..29c92c4d8 100644 --- a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java @@ -34,10 +34,6 @@ import org.junit.jupiter.api.Test; */ public class ReverseComparatorTest extends AbstractComparatorTest { - public ReverseComparatorTest() { - super(ReverseComparatorTest.class.getSimpleName()); - } - @Override public List getComparableObjectsOrdered() { final List list = new LinkedList<>(); diff --git a/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java index 776da0ac0..35e588985 100644 --- a/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java @@ -32,18 +32,6 @@ import org.junit.jupiter.api.Test; */ public class TransformingComparatorTest extends AbstractComparatorTest { - // - // Initialization and busywork - // - - public TransformingComparatorTest() { - super(TransformingComparatorTest.class.getSimpleName()); - } - - // - // Set up and tear down - // - @Override @SuppressWarnings("boxing") // OK in test code public List getComparableObjectsOrdered() { @@ -86,8 +74,4 @@ public class TransformingComparatorTest extends AbstractComparatorTest // writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/TransformingComparator.version4.obj"); // } - // - // The tests - // - } diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java index 6087a8387..ab435cd87 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java @@ -45,15 +45,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractIteratorTest extends AbstractObjectTest { - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractIteratorTest(final String testName) { - super(testName); - } - /** * Implement this method to return an iterator over an empty collection. * diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java index e8f9b3c0a..2b108e443 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java @@ -41,15 +41,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractListIteratorTest extends AbstractIteratorTest { - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractListIteratorTest(final String testName) { - super(testName); - } - /** * The value to be used in the add and set tests. * Default is null. diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java index 39b711e4e..292ecba96 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java @@ -45,15 +45,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractMapIteratorTest extends AbstractIteratorTest { - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractMapIteratorTest(final String testName) { - super(testName); - } - /** * The values to be used in the add and set tests. * Default is two strings. diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java index 9cee41ce5..147081c3b 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java @@ -46,15 +46,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractOrderedMapIteratorTest extends AbstractMapIteratorTest { - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractOrderedMapIteratorTest(final String testName) { - super(testName); - } - @Override public abstract OrderedMapIterator makeEmptyIterator(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java index 02c5e2546..35ac4bacf 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java @@ -35,10 +35,6 @@ public class ArrayIterator2Test extends AbstractIteratorTest { protected int[] testArray = { 2, 4, 6, 8 }; - public ArrayIterator2Test() { - super(ArrayIterator2Test.class.getSimpleName()); - } - public ArrayIterator makeArrayIterator(final Object array) { return new ArrayIterator<>(array); } diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java index e2d20cca9..db6db3c1a 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java @@ -36,10 +36,6 @@ public class ArrayIteratorTest extends AbstractIteratorTest { protected String[] testArray = { "One", "Two", "Three" }; - public ArrayIteratorTest() { - super(ArrayIteratorTest.class.getSimpleName()); - } - @Override public ArrayIterator makeEmptyIterator() { return new ArrayIterator<>(new Object[0]); diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java index 3ee3920ca..a0b7dd787 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java @@ -23,9 +23,6 @@ package org.apache.commons.collections4.iterators; */ public class ArrayListIterator2Test extends ArrayIterator2Test { - public ArrayListIterator2Test() { - } - public ArrayListIterator makeArrayListIterator(final Object array) { return new ArrayListIterator<>(array); } diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java index 8bfec1c95..955b7bb35 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java @@ -33,9 +33,6 @@ import org.junit.jupiter.api.Test; */ public class ArrayListIteratorTest extends ArrayIteratorTest { - public ArrayListIteratorTest() { - } - public ArrayListIterator makeArrayListIterator(final Object array) { return new ArrayListIterator<>(array); } diff --git a/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java index 6d268e04a..c6f5f1d81 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java @@ -46,10 +46,6 @@ public class BoundedIteratorTest extends AbstractIteratorTest { private List testList; - public BoundedIteratorTest() { - super(BoundedIteratorTest.class.getSimpleName()); - } - @Override public Iterator makeEmptyIterator() { return new BoundedIterator<>(Collections.emptyList().iterator(), 0, 10); diff --git a/src/test/java/org/apache/commons/collections4/iterators/CartesianProductIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/CartesianProductIteratorTest.java index 42f981e25..8f7d87220 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/CartesianProductIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/CartesianProductIteratorTest.java @@ -42,10 +42,6 @@ public class CartesianProductIteratorTest extends AbstractIteratorTest symbols; private List emptyList; - public CartesianProductIteratorTest() { - super(CartesianProductIteratorTest.class.getSimpleName()); - } - @Override public CartesianProductIterator makeEmptyIterator() { return new CartesianProductIterator<>(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java index 90e83f112..7a686d9b8 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java @@ -38,26 +38,17 @@ import org.junit.jupiter.api.Test; @SuppressWarnings("boxing") public class CollatingIteratorTest extends AbstractIteratorTest { - //------------------------------------------------------------ Conventional - private Comparator comparator; - //--------------------------------------------------------------- Lifecycle - private ArrayList evens; private ArrayList odds; private ArrayList fib; - public CollatingIteratorTest() { - super(CollatingIteratorTest.class.getSimpleName()); - } @Override public CollatingIterator makeEmptyIterator() { return new CollatingIterator<>(comparator); } - //---------------------------------------------------- TestIterator Methods - @Override public CollatingIterator makeObject() { final CollatingIterator iter = new CollatingIterator<>(comparator); @@ -90,8 +81,6 @@ public class CollatingIteratorTest extends AbstractIteratorTest { fib.add(21); } - //------------------------------------------------------------------- Tests - @Test public void testGetSetComparator() { final CollatingIterator iter = new CollatingIterator<>(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java index ed28a538e..dadb12270 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java @@ -56,11 +56,6 @@ public class FilterIteratorTest extends AbstractIteratorTest { private List list; private FilterIterator iterator; - /** Creates new TestFilterIterator */ - public FilterIteratorTest() { - super(FilterIteratorTest.class.getSimpleName()); - } - private void initIterator() { iterator = makeObject(); } diff --git a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java index ef02977ec..414f40bb8 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java @@ -45,10 +45,6 @@ public class IteratorChainTest extends AbstractIteratorTest { protected List list2; protected List list3; - public IteratorChainTest() { - super(IteratorChainTest.class.getSimpleName()); - } - public List getList1() { return list1; } diff --git a/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java index dac5841e8..5368ff193 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java @@ -32,10 +32,6 @@ import org.junit.jupiter.api.Test; */ public class IteratorIterableTest extends BulkTest { - public IteratorIterableTest() { - super(IteratorIterableTest.class.getSimpleName()); - } - private Iterator createIterator() { final List list = new ArrayList<>(); list.add(Integer.valueOf(0)); diff --git a/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java index 20df473c1..415cf437d 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java @@ -45,10 +45,6 @@ public class LazyIteratorChainTest extends AbstractIteratorTest { protected List list2; protected List list3; - public LazyIteratorChainTest() { - super(LazyIteratorChainTest.class.getSimpleName()); - } - @Override public LazyIteratorChain makeEmptyIterator() { return new LazyIteratorChain() { diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java index e3c381255..b4604f88d 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java @@ -42,10 +42,6 @@ public class ListIteratorWrapper2Test extends AbstractIteratorTest { protected List list1; - public ListIteratorWrapper2Test() { - super(ListIteratorWrapper2Test.class.getSimpleName()); - } - @Override public ResettableListIterator makeEmptyIterator() { final ArrayList list = new ArrayList<>(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java index 783368c7a..92cdf57e2 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java @@ -43,11 +43,6 @@ public class ListIteratorWrapperTest extends AbstractIteratorTest { protected List list1; - public ListIteratorWrapperTest() { - super(ListIteratorWrapperTest.class.getSimpleName()); - } - - @Override public ResettableListIterator makeEmptyIterator() { final ArrayList list = new ArrayList<>(); return new ListIteratorWrapper<>(list.iterator()); diff --git a/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java index c54ec547d..32ae56962 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java @@ -42,13 +42,6 @@ public class NodeListIteratorTest extends AbstractIteratorTest { // control, which constructor to use in makeObject() and makeEmptyIterator private boolean createIteratorWithStandardConstr = true; - /** - * Junit Constructor - */ - public NodeListIteratorTest() { - super(NodeListIteratorTest.class.getSimpleName()); - } - @Override public Iterator makeEmptyIterator() { final NodeList emptyNodeList = new NodeList() { diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java index fb4137cb2..65502d821 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java @@ -34,10 +34,6 @@ public class ObjectArrayIteratorTest extends AbstractIteratorTest { protected String[] testArray = { "One", "Two", "Three" }; - public ObjectArrayIteratorTest() { - super(ObjectArrayIteratorTest.class.getSimpleName()); - } - @SuppressWarnings("unchecked") public ObjectArrayIterator makeArrayIterator() { return new ObjectArrayIterator<>(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java index c47fb577a..2a3b6da30 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java @@ -25,10 +25,6 @@ public class ObjectArrayListIterator2Test extends AbstractListIteratorTest protected String[] testArray = { "One", "Two", "Three" }; - public ObjectArrayListIterator2Test() { - super(ObjectArrayListIterator2Test.class.getSimpleName()); - } - public ObjectArrayListIterator makeArrayListIterator(final E[] array) { return new ObjectArrayListIterator<>(array); } diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java index 0efd6d18b..bc1bce1d7 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java @@ -33,9 +33,6 @@ import org.junit.jupiter.api.Test; */ public class ObjectArrayListIteratorTest extends ObjectArrayIteratorTest { - public ObjectArrayListIteratorTest() { - } - public ObjectArrayListIterator makeArrayListIterator(final E[] array) { return new ObjectArrayListIterator<>(array); } diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java index 6a5fbaab8..a54a7bafa 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java @@ -136,10 +136,6 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest { protected List> iteratorList; - public ObjectGraphIteratorTest() { - super(ObjectGraphIteratorTest.class.getSimpleName()); - } - @Override public ObjectGraphIterator makeEmptyIterator() { final ArrayList list = new ArrayList<>(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java index b23126934..1906bd3aa 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java @@ -43,10 +43,6 @@ public class PeekingIteratorTest extends AbstractIteratorTest { private List testList; - public PeekingIteratorTest() { - super(PeekingIteratorTest.class.getSimpleName()); - } - @Override public Iterator makeEmptyIterator() { return PeekingIterator.peekingIterator(Collections.emptyList().iterator()); diff --git a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java index 83537d2e3..8ebbe7571 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java @@ -41,10 +41,6 @@ public class PermutationIteratorTest extends AbstractIteratorTest testList; - public PermutationIteratorTest() { - super(PermutationIteratorTest.class.getSimpleName()); - } - @Override public PermutationIterator makeEmptyIterator() { return new PermutationIterator<>(new ArrayList<>()); diff --git a/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java index 0d678d9e3..aeb5eb7b6 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java @@ -40,10 +40,6 @@ public class PushbackIteratorTest extends AbstractIteratorTest { private List testList; - public PushbackIteratorTest() { - super(PushbackIteratorTest.class.getSimpleName()); - } - @Override public Iterator makeEmptyIterator() { return PushbackIterator.pushbackIterator(Collections.emptyList().iterator()); diff --git a/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java index 2c5a16698..a1a73265a 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java @@ -40,10 +40,6 @@ public class ReverseListIteratorTest extends AbstractListIteratorTest { protected String[] testArray = { "One", "Two", "Three", "Four" }; - public ReverseListIteratorTest() { - super(ReverseListIteratorTest.class.getSimpleName()); - } - @Override public ListIterator makeEmptyIterator() { return new ReverseListIterator<>(new ArrayList<>()); diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java index e84ef9ad0..74af047a6 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java @@ -37,10 +37,6 @@ public class SingletonIterator2Test extends AbstractIteratorTest { private static final Object testValue = "foo"; - public SingletonIterator2Test() { - super(SingletonIterator2Test.class.getSimpleName()); - } - @Override @SuppressWarnings("unchecked") public SingletonIterator makeEmptyIterator() { diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java index e0f3f7b2f..e8f31abab 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java @@ -37,10 +37,6 @@ public class SingletonIteratorTest extends AbstractIteratorTest { private static final Object testValue = "foo"; - public SingletonIteratorTest() { - super(SingletonIteratorTest.class.getSimpleName()); - } - /** * Returns a SingletonIterator from which * the element has already been removed. diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java index c2716d884..8fcb02e0b 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java @@ -36,10 +36,6 @@ public class SingletonListIteratorTest extends AbstractListIteratorTest { private static final Object testValue = "foo"; - public SingletonListIteratorTest() { - super(SingletonListIteratorTest.class.getSimpleName()); - } - /** * Returns a SingletonListIterator from which * the element has already been removed. diff --git a/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java index c021af6b3..16c7a4385 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java @@ -45,10 +45,6 @@ public class SkippingIteratorTest extends AbstractIteratorTest { private List testList; - public SkippingIteratorTest() { - super(SkippingIteratorTest.class.getSimpleName()); - } - @Override public Iterator makeEmptyIterator() { return new SkippingIterator<>(Collections.emptyList().iterator(), 0); diff --git a/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java index a971592a3..7faefaad1 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java @@ -41,10 +41,6 @@ public class UniqueFilterIteratorTest extends AbstractIteratorTest { protected List list1; - public UniqueFilterIteratorTest() { - super(UniqueFilterIteratorTest.class.getSimpleName()); - } - @Override public UniqueFilterIterator makeEmptyIterator() { final ArrayList list = new ArrayList<>(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java index 890316ab2..91559e9c2 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java @@ -41,10 +41,6 @@ public class UnmodifiableIteratorTest extends AbstractIteratorTest { protected String[] testArray = { "One", "Two", "Three" }; protected List testList; - public UnmodifiableIteratorTest() { - super(UnmodifiableIteratorTest.class.getSimpleName()); - } - @Override public Iterator makeEmptyIterator() { return UnmodifiableIterator.unmodifiableIterator(Collections.emptyList().iterator()); diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java index 8b9f941b4..6e14d6e2f 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java @@ -41,10 +41,6 @@ public class UnmodifiableListIteratorTest extends AbstractListIteratorTest protected String[] testArray = {"One", "Two", "Three"}; protected List testList; - public UnmodifiableListIteratorTest() { - super(UnmodifiableListIteratorTest.class.getSimpleName()); - } - @Override public ListIterator makeEmptyIterator() { return UnmodifiableListIterator.unmodifiableListIterator(Collections.emptyList().listIterator()); diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java index 1dea7840f..2175b0b6d 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java @@ -38,11 +38,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableMapIteratorTest extends AbstractMapIteratorTest { - public UnmodifiableMapIteratorTest() { - super(UnmodifiableMapIteratorTest.class.getSimpleName()); - } - - @Override @SuppressWarnings("unchecked") public Map getConfirmedMap() { final Map testMap = new HashMap<>(); diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java index 70f8289e5..25a984d49 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java @@ -39,10 +39,6 @@ import org.junit.jupiter.api.Test; */ public class UnmodifiableOrderedMapIteratorTest extends AbstractOrderedMapIteratorTest { - public UnmodifiableOrderedMapIteratorTest() { - super(UnmodifiableOrderedMapIteratorTest.class.getSimpleName()); - } - @Override @SuppressWarnings("unchecked") public Map getConfirmedMap() { diff --git a/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java index 5b5a8ee2a..fca7207c5 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java @@ -32,17 +32,10 @@ import org.junit.jupiter.api.Test; @SuppressWarnings("boxing") public class ZippingIteratorTest extends AbstractIteratorTest { - //------------------------------------------------------------ Conventional - private ArrayList evens; - //--------------------------------------------------------------- Lifecycle - private ArrayList odds; private ArrayList fib; - public ZippingIteratorTest() { - super(ZippingIteratorTest.class.getSimpleName()); - } @Override @SuppressWarnings("unchecked") @@ -50,8 +43,6 @@ public class ZippingIteratorTest extends AbstractIteratorTest { return new ZippingIterator<>(IteratorUtils.emptyIterator()); } - //---------------------------------------------------- TestIterator Methods - @Override public ZippingIterator makeObject() { return new ZippingIterator<>(evens.iterator(), odds.iterator(), fib.iterator()); @@ -79,8 +70,6 @@ public class ZippingIteratorTest extends AbstractIteratorTest { fib.add(21); } - //------------------------------------------------------------------- Tests - @Test public void testIterateEven() { @SuppressWarnings("unchecked") diff --git a/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java index 5620ef02c..f42cc212c 100644 --- a/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java @@ -28,10 +28,6 @@ import org.junit.jupiter.api.Test; */ public abstract class AbstractLinkedListTest extends AbstractListTest { - public AbstractLinkedListTest(final String testName) { - super(testName); - } - protected void checkNodes() { final AbstractLinkedList list = getCollection(); for (int i = 0; i < list.size; i++) { diff --git a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java index a5be4c23f..b6bc782b8 100644 --- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java @@ -39,7 +39,6 @@ import java.util.NoSuchElementException; import org.apache.commons.collections4.BulkTest; import org.apache.commons.collections4.collection.AbstractCollectionTest; import org.apache.commons.collections4.iterators.AbstractListIteratorTest; -import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; /** @@ -64,7 +63,6 @@ public abstract class AbstractListTest extends AbstractCollectionTest { private final AbstractListTest outer; public BulkTestSubList(final AbstractListTest outer) { - super(StringUtils.EMPTY); this.outer = outer; } @@ -134,9 +132,6 @@ public abstract class AbstractListTest extends AbstractCollectionTest { } public class TestListIterator extends AbstractListIteratorTest { - public TestListIterator() { - super("TestListIterator"); - } @Override public E addSetValue() { @@ -171,15 +166,6 @@ public abstract class AbstractListTest extends AbstractCollectionTest { } } - /** - * JUnit constructor. - * - * @param testName the test class name - */ - public AbstractListTest(final String testName) { - super(testName); - } - /** * Traverses to the beginning of the given iterator. * 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 2615d9de0..1d8370d2d 100644 --- a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java @@ -44,9 +44,6 @@ import org.junit.jupiter.api.Test; public class CursorableLinkedListTest extends AbstractLinkedListTest { private CursorableLinkedList list; - public CursorableLinkedListTest() { - super(CursorableLinkedListTest.class.getSimpleName()); - } @Override public String getCompatibilityVersion() { diff --git a/src/test/java/org/apache/commons/collections4/list/DefaultAbstractLinkedListJava21Test.java b/src/test/java/org/apache/commons/collections4/list/DefaultAbstractLinkedListJava21Test.java index 4ffdcd6db..088a150f4 100644 --- a/src/test/java/org/apache/commons/collections4/list/DefaultAbstractLinkedListJava21Test.java +++ b/src/test/java/org/apache/commons/collections4/list/DefaultAbstractLinkedListJava21Test.java @@ -61,10 +61,6 @@ public class DefaultAbstractLinkedListJava21Test extends AbstractListTest } } - public DefaultAbstractLinkedListJava21Test() { - super(DefaultAbstractLinkedListJava21Test.class.getSimpleName()); - } - protected void checkNodes() { final AbstractLinkedListJava21 list = getCollection(); for (int i = 0; i < list.size; i++) { diff --git a/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java index 3ac265ab9..834af1d3f 100644 --- a/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java @@ -33,10 +33,6 @@ import org.junit.jupiter.api.Test; */ public class FixedSizeListTest extends AbstractListTest { - public FixedSizeListTest() { - super(FixedSizeListTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java index a8764c0c4..259ee5ecd 100644 --- a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java @@ -33,10 +33,6 @@ import org.junit.jupiter.api.function.Executable; */ public class GrowthListTest extends AbstractListTest { - public GrowthListTest() { - super(GrowthListTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/list/LazyListTest.java b/src/test/java/org/apache/commons/collections4/list/LazyListTest.java index 9b4a0eed3..f8a017777 100644 --- a/src/test/java/org/apache/commons/collections4/list/LazyListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/LazyListTest.java @@ -33,10 +33,6 @@ import org.junit.jupiter.api.Test; public class LazyListTest extends AbstractObjectTest { - public LazyListTest() { - super(LazyListTest.class.getSimpleName()); - } - @Override public Object makeObject() { final Factory dateFactory = LocalDateTime::now; diff --git a/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java index 155043948..5f58416a2 100644 --- a/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java @@ -94,10 +94,6 @@ public class NodeCachingLinkedListTest extends AbstractLinkedListTest { } - public NodeCachingLinkedListTest() { - super(NodeCachingLinkedListTest.class.getSimpleName()); - } - /** * {@inheritDoc} */ diff --git a/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java index 9831cde9c..981b8d419 100644 --- a/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java @@ -40,10 +40,6 @@ public class PredicatedListTest extends AbstractListTest { protected Predicate testPredicate = String.class::isInstance; - public PredicatedListTest() { - super(PredicatedListTest.class.getSimpleName()); - } - protected List decorateList(final List list, final Predicate predicate) { return PredicatedList.predicatedList(list, predicate); } diff --git a/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java index c13cba61b..fe0a30861 100644 --- a/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java @@ -54,10 +54,6 @@ public class SetUniqueListTest extends AbstractListTest { boolean extraVerify = true; - public SetUniqueListTest() { - super(SetUniqueListTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java index 36c382872..a0784baf3 100644 --- a/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java @@ -37,10 +37,6 @@ import org.junit.jupiter.api.Test; */ public class TransformedListTest extends AbstractListTest { - public TransformedListTest() { - super(TransformedListTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java index 7e85cb24b..0fe1ea24a 100644 --- a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java @@ -95,10 +95,6 @@ public class TreeListTest extends AbstractListTest { // benchmark(new NodeCachingLinkedList()); // } - public TreeListTest() { - super(TreeListTest.class.getSimpleName()); - } - @Override public TreeList makeObject() { return new TreeList<>(); diff --git a/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java index 7647dad34..59360c162 100644 --- a/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java @@ -37,10 +37,6 @@ public class UnmodifiableListTest extends AbstractListTest { protected ArrayList array; - public UnmodifiableListTest() { - super(UnmodifiableListTest.class.getSimpleName()); - } - @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractConcurrentReferenceHashMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractConcurrentReferenceHashMapTest.java index 9d2d2e7a5..ad08a4bcf 100644 --- a/src/test/java/org/apache/commons/collections4/map/AbstractConcurrentReferenceHashMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/AbstractConcurrentReferenceHashMapTest.java @@ -31,10 +31,6 @@ public abstract class AbstractConcurrentReferenceHashMapTest extends Abstr protected static final EnumSet