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 a951781b6 Normalize test class names to *Test
a951781b6 is described below
commit a951781b6c03e323de960c5e845d673bd19ad33d
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jun 9 09:54:57 2025 -0400
Normalize test class names to *Test
---
.../commons/collections4/bag/AbstractBagTest.java | 12 ++++----
.../collections4/bidimap/AbstractBidiMapTest.java | 28 +++++++++----------
.../bidimap/AbstractOrderedBidiMapTest.java | 4 +--
.../collections4/list/AbstractListTest.java | 4 +--
.../commons/collections4/map/AbstractMapTest.java | 32 +++++++++++-----------
.../commons/collections4/map/Flat3MapTest.java | 4 +--
.../commons/collections4/map/LinkedMapTest.java | 4 +--
.../collections4/map/ListOrderedMap2Test.java | 4 +--
.../collections4/map/ListOrderedMapTest.java | 8 +++---
.../multimap/AbstractMultiValuedMapTest.java | 32 +++++++++++-----------
.../multiset/AbstractMultiSetTest.java | 12 ++++----
.../collections4/set/AbstractNavigableSetTest.java | 12 ++++----
.../collections4/set/AbstractSortedSetTest.java | 12 ++++----
13 files changed, 84 insertions(+), 84 deletions(-)
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 17a0f5efb..821e6858f 100644
--- a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
@@ -68,7 +68,7 @@ import org.junit.jupiter.api.Test;
*/
public abstract class AbstractBagTest<T> extends AbstractCollectionTest<T> {
- public class TestBagUniqueSet extends AbstractSetTest<T> {
+ public class BagUniqueSetTest extends AbstractSetTest<T> {
@Override
public T[] getFullElements() {
@@ -118,15 +118,15 @@ public abstract class AbstractBagTest<T> extends
AbstractCollectionTest<T> {
@Override
public void resetEmpty() {
AbstractBagTest.this.resetEmpty();
-
TestBagUniqueSet.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
- TestBagUniqueSet.this.setConfirmed(new
HashSet<>(AbstractBagTest.this.getConfirmed()));
+
BagUniqueSetTest.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
+ BagUniqueSetTest.this.setConfirmed(new
HashSet<>(AbstractBagTest.this.getConfirmed()));
}
@Override
public void resetFull() {
AbstractBagTest.this.resetFull();
-
TestBagUniqueSet.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
- TestBagUniqueSet.this.setConfirmed(new
HashSet<>(AbstractBagTest.this.getConfirmed()));
+
BagUniqueSetTest.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
+ BagUniqueSetTest.this.setConfirmed(new
HashSet<>(AbstractBagTest.this.getConfirmed()));
}
@Override
@@ -150,7 +150,7 @@ public abstract class AbstractBagTest<T> extends
AbstractCollectionTest<T> {
* @return a {@link AbstractSetTest} instance for testing the bag's unique
set
*/
public BulkTest bulkTestBagUniqueSet() {
- return new TestBagUniqueSet();
+ return new BagUniqueSetTest();
}
/**
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 d5452511d..5cd60984a 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
@@ -46,9 +46,9 @@ import org.junit.jupiter.api.Test;
*/
public abstract class AbstractBidiMapTest<K, V> extends
AbstractIterableMapTest<K, V> {
- public class TestBidiMapEntrySet extends TestMapEntrySet {
+ public class BidiMapEntrySetTest extends MapEntrySetTest {
- public TestBidiMapEntrySet() {
+ public BidiMapEntrySetTest() {
}
@Test
@@ -61,15 +61,15 @@ public abstract class AbstractBidiMapTest<K, V> extends
AbstractIterableMapTest<
resetFull();
// explicitly get entries as sample values/keys are connected for
some maps
// such as BeanMap
- Iterator<Map.Entry<K, V>> it =
TestBidiMapEntrySet.this.getCollection().iterator();
+ Iterator<Map.Entry<K, V>> it =
BidiMapEntrySetTest.this.getCollection().iterator();
final Map.Entry<K, V> entry1 = getEntry(it, key1);
- it = TestBidiMapEntrySet.this.getCollection().iterator();
+ it = BidiMapEntrySetTest.this.getCollection().iterator();
final Map.Entry<K, V> entry2 = getEntry(it, key2);
- Iterator<Map.Entry<K, V>> itConfirmed =
TestBidiMapEntrySet.this.getConfirmed().iterator();
+ Iterator<Map.Entry<K, V>> itConfirmed =
BidiMapEntrySetTest.this.getConfirmed().iterator();
final Map.Entry<K, V> entryConfirmed1 = getEntry(itConfirmed,
key1);
- itConfirmed = TestBidiMapEntrySet.this.getConfirmed().iterator();
+ itConfirmed = BidiMapEntrySetTest.this.getConfirmed().iterator();
final Map.Entry<K, V> entryConfirmed2 = getEntry(itConfirmed,
key2);
- TestBidiMapEntrySet.this.verify();
+ BidiMapEntrySetTest.this.verify();
if (!isSetValueSupported()) {
assertThrows(UnsupportedOperationException.class, () ->
entry1.setValue(newValue1));
@@ -97,7 +97,7 @@ public abstract class AbstractBidiMapTest<K, V> extends
AbstractIterableMapTest<
assertEquals(newValue1,
AbstractBidiMapTest.this.getMap().get(entry2.getKey()));
assertFalse(AbstractBidiMapTest.this.getMap().containsKey(key1));
assertFalse(AbstractBidiMapTest.this.getMap().containsValue(newValue2));
- TestBidiMapEntrySet.this.verify();
+ BidiMapEntrySetTest.this.verify();
// check for ConcurrentModification
it.next(); // if you fail here, maybe you should be throwing an
IAE, see above
@@ -108,7 +108,7 @@ public abstract class AbstractBidiMapTest<K, V> extends
AbstractIterableMapTest<
}
- public class TestBidiMapIterator extends AbstractMapIteratorTest<K, V> {
+ public class BidiMapIteratorTest extends AbstractMapIteratorTest<K, V> {
@Override
public V[] addSetValues() {
@@ -157,11 +157,11 @@ public abstract class AbstractBidiMapTest<K, V> extends
AbstractIterableMapTest<
}
- public class TestInverseBidiMap extends AbstractBidiMapTest<V, K> {
+ public class InverseBidiMapTest extends AbstractBidiMapTest<V, K> {
final AbstractBidiMapTest<K, V> main;
- public TestInverseBidiMap(final AbstractBidiMapTest<K, V> main) {
+ public InverseBidiMapTest(final AbstractBidiMapTest<K, V> main) {
this.main = main;
}
@@ -237,16 +237,16 @@ public abstract class AbstractBidiMapTest<K, V> extends
AbstractIterableMapTest<
}
public BulkTest bulkTestBidiMapIterator() {
- return new TestBidiMapIterator();
+ return new BidiMapIteratorTest();
}
public BulkTest bulkTestInverseMap() {
- return new TestInverseBidiMap(this);
+ return new InverseBidiMapTest(this);
}
@Override
public BulkTest bulkTestMapEntrySet() {
- return new TestBidiMapEntrySet();
+ return new BidiMapEntrySetTest();
}
private void doTestGetKey(final BidiMap<?, ?> map, final Object key, final
Object value) {
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 01d2e9e14..0b87aa6a5 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
*/
public abstract class AbstractOrderedBidiMapTest<K, V> extends
AbstractBidiMapTest<K, V> {
- public class TestBidiOrderedMapIterator extends AbstractMapIteratorTest<K,
V> {
+ public class BidiOrderedMapIteratorTest extends AbstractMapIteratorTest<K,
V> {
@Override
public V[] addSetValues() {
@@ -88,7 +88,7 @@ public abstract class AbstractOrderedBidiMapTest<K, V>
extends AbstractBidiMapTe
}
public BulkTest bulkTestOrderedMapIterator() {
- return new TestBidiOrderedMapIterator();
+ return new BidiOrderedMapIteratorTest();
}
/**
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 68dc3f387..0319a1df6 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -131,7 +131,7 @@ public abstract class AbstractListTest<E> extends
AbstractCollectionTest<E> {
}
}
- public class TestListIterator extends AbstractListIteratorTest<E> {
+ public class ListIteratorTest extends AbstractListIteratorTest<E> {
@Override
public E addSetValue() {
@@ -199,7 +199,7 @@ public abstract class AbstractListTest<E> extends
AbstractCollectionTest<E> {
}
public BulkTest bulkTestListIterator() {
- return new TestListIterator();
+ return new ListIteratorTest();
}
/**
diff --git
a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index b7ccf6d44..6e94bb30d 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -138,7 +138,7 @@ import org.junit.jupiter.api.Test;
*/
public abstract class AbstractMapTest<M extends Map<K, V>, K, V> extends
AbstractObjectTest {
- public class TestMapEntrySet extends AbstractSetTest<Map.Entry<K, V>> {
+ public class MapEntrySetTest extends AbstractSetTest<Map.Entry<K, V>> {
@Override
public boolean areEqualElementsDistinguishable() {
@@ -230,14 +230,14 @@ public abstract class AbstractMapTest<M extends Map<K,
V>, K, V> extends Abstrac
public void resetEmpty() {
AbstractMapTest.this.resetEmpty();
setCollection(AbstractMapTest.this.getMap().entrySet());
-
TestMapEntrySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
+
MapEntrySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
}
@Override
public void resetFull() {
AbstractMapTest.this.resetFull();
setCollection(AbstractMapTest.this.getMap().entrySet());
-
TestMapEntrySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
+
MapEntrySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
}
@Test
@@ -265,13 +265,13 @@ public abstract class AbstractMapTest<M extends Map<K,
V>, K, V> extends Abstrac
resetFull();
// explicitly get entries as sample values/keys are connected for
some maps
// such as BeanMap
- Iterator<Map.Entry<K, V>> it =
TestMapEntrySet.this.getCollection().iterator();
+ Iterator<Map.Entry<K, V>> it =
MapEntrySetTest.this.getCollection().iterator();
final Map.Entry<K, V> entry1 = getEntry(it, key1);
- it = TestMapEntrySet.this.getCollection().iterator();
+ it = MapEntrySetTest.this.getCollection().iterator();
final Map.Entry<K, V> entry2 = getEntry(it, key2);
- Iterator<Map.Entry<K, V>> itConfirmed =
TestMapEntrySet.this.getConfirmed().iterator();
+ Iterator<Map.Entry<K, V>> itConfirmed =
MapEntrySetTest.this.getConfirmed().iterator();
final Map.Entry<K, V> entryConfirmed1 = getEntry(itConfirmed,
key1);
- itConfirmed = TestMapEntrySet.this.getConfirmed().iterator();
+ itConfirmed = MapEntrySetTest.this.getConfirmed().iterator();
final Map.Entry<K, V> entryConfirmed2 = getEntry(itConfirmed,
key2);
verify();
@@ -322,7 +322,7 @@ public abstract class AbstractMapTest<M extends Map<K, V>,
K, V> extends Abstrac
}
}
- public class TestMapKeySet extends AbstractSetTest<K> {
+ public class MapKeySetTest extends AbstractSetTest<K> {
@Override
public K[] getFullElements() {
@@ -373,14 +373,14 @@ public abstract class AbstractMapTest<M extends Map<K,
V>, K, V> extends Abstrac
public void resetEmpty() {
AbstractMapTest.this.resetEmpty();
setCollection(AbstractMapTest.this.getMap().keySet());
-
TestMapKeySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
+
MapKeySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
}
@Override
public void resetFull() {
AbstractMapTest.this.resetFull();
setCollection(AbstractMapTest.this.getMap().keySet());
-
TestMapKeySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
+
MapKeySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
}
@Override
@@ -399,7 +399,7 @@ public abstract class AbstractMapTest<M extends Map<K, V>,
K, V> extends Abstrac
// to the confirmed, that the already-constructed collection views
// are still equal to the confirmed's collection views.
- public class TestMapValues extends AbstractCollectionTest<V> {
+ public class MapValuesTest extends AbstractCollectionTest<V> {
@Override
public boolean areEqualElementsDistinguishable() {
@@ -469,14 +469,14 @@ public abstract class AbstractMapTest<M extends Map<K,
V>, K, V> extends Abstrac
public void resetEmpty() {
AbstractMapTest.this.resetEmpty();
setCollection(map.values());
-
TestMapValues.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
+
MapValuesTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
}
@Override
public void resetFull() {
AbstractMapTest.this.resetFull();
setCollection(map.values());
-
TestMapValues.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
+
MapValuesTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
}
@Override
@@ -554,7 +554,7 @@ public abstract class AbstractMapTest<M extends Map<K, V>,
K, V> extends Abstrac
* @return a {@link AbstractSetTest} instance for testing the map's entry
set
*/
public BulkTest bulkTestMapEntrySet() {
- return new TestMapEntrySet();
+ return new MapEntrySetTest();
}
/**
@@ -564,7 +564,7 @@ public abstract class AbstractMapTest<M extends Map<K, V>,
K, V> extends Abstrac
* @return a {@link AbstractSetTest} instance for testing the map's key set
*/
public BulkTest bulkTestMapKeySet() {
- return new TestMapKeySet();
+ return new MapKeySetTest();
}
/**
@@ -574,7 +574,7 @@ public abstract class AbstractMapTest<M extends Map<K, V>,
K, V> extends Abstrac
* @return a {@link AbstractCollectionTest} instance for testing the map's
values collection
*/
public BulkTest bulkTestMapValues() {
- return new TestMapValues();
+ return new MapValuesTest();
}
/**
diff --git
a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 1d053da5c..1737d72bc 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -47,7 +47,7 @@ import org.junit.jupiter.api.Test;
*/
public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
- public class TestFlatMapIterator extends AbstractMapIteratorTest<K, V> {
+ public class FlatMapIteratorTest extends AbstractMapIteratorTest<K, V> {
@Override
public V[] addSetValues() {
@@ -105,7 +105,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
@Override
public BulkTest bulkTestMapIterator() {
- return new TestFlatMapIterator();
+ return new FlatMapIteratorTest();
}
@Override
diff --git
a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
index d98c21568..f77a24ce9 100644
--- a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test;
*/
public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
- public class TestListView extends AbstractListTest<K> {
+ public class ListViewTest extends AbstractListTest<K> {
@Override
public K[] getFullElements() {
@@ -85,7 +85,7 @@ public class LinkedMapTest<K, V> extends
AbstractOrderedMapTest<K, V> {
}
public BulkTest bulkTestListView() {
- return new TestListView();
+ return new ListViewTest();
}
@Override
diff --git
a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
index 2bc38372b..02a252cc6 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
*/
public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
- public class TestListView extends AbstractListTest<K> {
+ public class ListViewTest extends AbstractListTest<K> {
@Override
public K[] getFullElements() {
@@ -81,7 +81,7 @@ public class ListOrderedMap2Test<K, V> extends
AbstractOrderedMapTest<K, V> {
}
public BulkTest bulkTestListView() {
- return new TestListView();
+ return new ListViewTest();
}
@Override
diff --git
a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
index 2288ae7ea..558cb3921 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test;
*/
public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
- public class TestKeyListView extends AbstractListTest<K> {
+ public class KeyListViewTest extends AbstractListTest<K> {
@Override
public K[] getFullElements() {
@@ -85,7 +85,7 @@ public class ListOrderedMapTest<K, V> extends
AbstractOrderedMapTest<K, V> {
}
- public class TestValueListView extends AbstractListTest<V> {
+ public class ValueListViewTest extends AbstractListTest<V> {
@Override
public V[] getFullElements() {
@@ -130,11 +130,11 @@ public class ListOrderedMapTest<K, V> extends
AbstractOrderedMapTest<K, V> {
}
public BulkTest bulkTestKeyListView() {
- return new TestKeyListView();
+ return new KeyListViewTest();
}
public BulkTest bulkTestValueListView() {
- return new TestValueListView();
+ return new ValueListViewTest();
}
@Override
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
index 1e19fc8c3..01be31f22 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
@@ -64,7 +64,7 @@ import org.junit.jupiter.api.Test;
*/
public abstract class AbstractMultiValuedMapTest<K, V> extends
AbstractObjectTest {
- public class TestMultiValuedMapAsMap extends AbstractMapTest<Map<K,
Collection<V>>, K, Collection<V>> {
+ public class MultiValuedMapAsMapTest extends AbstractMapTest<Map<K,
Collection<V>>, K, Collection<V>> {
@Override
public boolean areEqualElementsDistinguishable() {
@@ -175,7 +175,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
}
}
- public class TestMultiValuedMapEntries extends
AbstractCollectionTest<Entry<K, V>> {
+ public class MultiValuedMapEntriesTest extends
AbstractCollectionTest<Entry<K, V>> {
@SuppressWarnings("unchecked")
@Override
@@ -235,19 +235,19 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
public void resetEmpty() {
AbstractMultiValuedMapTest.this.resetEmpty();
setCollection(AbstractMultiValuedMapTest.this.getMap().entries());
-
TestMultiValuedMapEntries.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().entries());
+
MultiValuedMapEntriesTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().entries());
}
@Override
public void resetFull() {
AbstractMultiValuedMapTest.this.resetFull();
setCollection(AbstractMultiValuedMapTest.this.getMap().entries());
-
TestMultiValuedMapEntries.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().entries());
+
MultiValuedMapEntriesTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().entries());
}
}
- public class TestMultiValuedMapKeys extends AbstractMultiSetTest<K> {
+ public class MultiValuedMapKeysTest extends AbstractMultiSetTest<K> {
@Override
public K[] getFullElements() {
@@ -293,18 +293,18 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
public void resetEmpty() {
AbstractMultiValuedMapTest.this.resetEmpty();
setCollection(AbstractMultiValuedMapTest.this.getMap().keys());
-
TestMultiValuedMapKeys.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
+
MultiValuedMapKeysTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
}
@Override
public void resetFull() {
AbstractMultiValuedMapTest.this.resetFull();
setCollection(AbstractMultiValuedMapTest.this.getMap().keys());
-
TestMultiValuedMapKeys.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
+
MultiValuedMapKeysTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
}
}
- public class TestMultiValuedMapKeySet extends AbstractSetTest<K> {
+ public class MultiValuedMapKeySetTest extends AbstractSetTest<K> {
@SuppressWarnings("unchecked")
@Override
@@ -348,7 +348,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
}
}
- public class TestMultiValuedMapValues extends AbstractCollectionTest<V> {
+ public class MultiValuedMapValuesTest extends AbstractCollectionTest<V> {
@Override
public V[] getFullElements() {
@@ -406,14 +406,14 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
public void resetEmpty() {
AbstractMultiValuedMapTest.this.resetEmpty();
setCollection(AbstractMultiValuedMapTest.this.getMap().values());
-
TestMultiValuedMapValues.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().values());
+
MultiValuedMapValuesTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().values());
}
@Override
public void resetFull() {
AbstractMultiValuedMapTest.this.resetFull();
setCollection(AbstractMultiValuedMapTest.this.getMap().values());
-
TestMultiValuedMapValues.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().values());
+
MultiValuedMapValuesTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().values());
}
}
@@ -432,7 +432,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
}
public BulkTest bulkTestAsMap() {
- return new TestMultiValuedMapAsMap();
+ return new MultiValuedMapAsMapTest();
}
// Bulk Tests
@@ -446,7 +446,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
* values collection
*/
public BulkTest bulkTestMultiValuedMapEntries() {
- return new TestMultiValuedMapEntries();
+ return new MultiValuedMapEntriesTest();
}
/**
@@ -459,7 +459,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
* collection
*/
public BulkTest bulkTestMultiValuedMapKeys() {
- return new TestMultiValuedMapKeys();
+ return new MultiValuedMapKeysTest();
}
/**
@@ -471,7 +471,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
* @return a {@link AbstractSetTest} instance for testing the map's key set
*/
public BulkTest bulkTestMultiValuedMapKeySet() {
- return new TestMultiValuedMapKeySet();
+ return new MultiValuedMapKeySetTest();
}
/**
@@ -484,7 +484,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
* values collection
*/
public BulkTest bulkTestMultiValuedMapValues() {
- return new TestMultiValuedMapValues();
+ return new MultiValuedMapValuesTest();
}
@Override
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index ad6421959..2d286d5c0 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -62,7 +62,7 @@ import org.junit.jupiter.api.Test;
*/
public abstract class AbstractMultiSetTest<T> extends
AbstractCollectionTest<T> {
- public class TestMultiSetUniqueSet extends AbstractSetTest<T> {
+ public class MultiSetUniqueSetTest extends AbstractSetTest<T> {
@Override
public T[] getFullElements() {
@@ -112,15 +112,15 @@ public abstract class AbstractMultiSetTest<T> extends
AbstractCollectionTest<T>
@Override
public void resetEmpty() {
AbstractMultiSetTest.this.resetEmpty();
-
TestMultiSetUniqueSet.this.setCollection(AbstractMultiSetTest.this.getCollection().uniqueSet());
- TestMultiSetUniqueSet.this.setConfirmed(new
HashSet<>(AbstractMultiSetTest.this.getConfirmed()));
+
MultiSetUniqueSetTest.this.setCollection(AbstractMultiSetTest.this.getCollection().uniqueSet());
+ MultiSetUniqueSetTest.this.setConfirmed(new
HashSet<>(AbstractMultiSetTest.this.getConfirmed()));
}
@Override
public void resetFull() {
AbstractMultiSetTest.this.resetFull();
-
TestMultiSetUniqueSet.this.setCollection(AbstractMultiSetTest.this.getCollection().uniqueSet());
- TestMultiSetUniqueSet.this.setConfirmed(new
HashSet<>(AbstractMultiSetTest.this.getConfirmed()));
+
MultiSetUniqueSetTest.this.setCollection(AbstractMultiSetTest.this.getCollection().uniqueSet());
+ MultiSetUniqueSetTest.this.setConfirmed(new
HashSet<>(AbstractMultiSetTest.this.getConfirmed()));
}
@Override
@@ -138,7 +138,7 @@ public abstract class AbstractMultiSetTest<T> extends
AbstractCollectionTest<T>
* @return a {@link AbstractSetTest} instance for testing the multiset's
unique set
*/
public BulkTest bulkTestMultiSetUniqueSet() {
- return new TestMultiSetUniqueSet();
+ return new MultiSetUniqueSetTest();
}
/**
diff --git
a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
index 327865dc2..9ca93f229 100644
---
a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections4.BulkTest;
*/
public abstract class AbstractNavigableSetTest<E> extends
AbstractSortedSetTest<E> {
- public class TestNavigableSetSubSet extends AbstractNavigableSetTest<E> {
+ public class NavigableSetSubSetTest extends AbstractNavigableSetTest<E> {
static final int TYPE_SUBSET = 0;
static final int TYPE_TAILSET = 1;
@@ -49,7 +49,7 @@ public abstract class AbstractNavigableSetTest<E> extends
AbstractSortedSetTest<
private final boolean inclusive;
@SuppressWarnings("unchecked")
- public TestNavigableSetSubSet(final int bound, final boolean head,
final boolean inclusive) {
+ public NavigableSetSubSetTest(final int bound, final boolean head,
final boolean inclusive) {
if (head) {
this.type = TYPE_HEADSET;
this.inclusive = inclusive;
@@ -76,7 +76,7 @@ public abstract class AbstractNavigableSetTest<E> extends
AbstractSortedSetTest<
} //type
@SuppressWarnings("unchecked")
- public TestNavigableSetSubSet(final int loBound, final int hiBound,
final boolean inclusive) {
+ public NavigableSetSubSetTest(final int loBound, final int hiBound,
final boolean inclusive) {
this.type = TYPE_SUBSET;
this.lowBound = loBound;
this.highBound = hiBound;
@@ -188,7 +188,7 @@ public abstract class AbstractNavigableSetTest<E> extends
AbstractSortedSetTest<
final int loBound = length / 3;
final int hiBound = loBound * 2;
- return new TestNavigableSetSubSet(hiBound, true, true);
+ return new NavigableSetSubSetTest(hiBound, true, true);
}
/**
@@ -204,7 +204,7 @@ public abstract class AbstractNavigableSetTest<E> extends
AbstractSortedSetTest<
final int loBound = length / 3;
final int hiBound = loBound * 2;
- return new TestNavigableSetSubSet(loBound, hiBound, false);
+ return new NavigableSetSubSetTest(loBound, hiBound, false);
}
/**
@@ -218,7 +218,7 @@ public abstract class AbstractNavigableSetTest<E> extends
AbstractSortedSetTest<
public BulkTest bulkTestNavigableSetTailSet() {
final int length = getFullElements().length;
final int loBound = length / 3;
- return new TestNavigableSetSubSet(loBound, false, false);
+ return new NavigableSetSubSetTest(loBound, false, false);
}
/**
diff --git
a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
index 2fdfd11c6..2ba54c057 100644
---
a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections4.BulkTest;
*/
public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
- public class TestSortedSetSubSet extends AbstractSortedSetTest<E> {
+ public class SortedSetSubSetTest extends AbstractSortedSetTest<E> {
static final int TYPE_SUBSET = 0;
static final int TYPE_TAILSET = 1;
@@ -48,7 +48,7 @@ public abstract class AbstractSortedSetTest<E> extends
AbstractSetTest<E> {
private final E[] otherElements;
@SuppressWarnings("unchecked")
- public TestSortedSetSubSet(final int bound, final boolean head) {
+ public SortedSetSubSetTest(final int bound, final boolean head) {
if (head) {
//System.out.println("HEADSET");
this.type = TYPE_HEADSET;
@@ -81,7 +81,7 @@ public abstract class AbstractSortedSetTest<E> extends
AbstractSetTest<E> {
} //type
@SuppressWarnings("unchecked")
- public TestSortedSetSubSet(final int loBound, final int hiBound) {
+ public SortedSetSubSetTest(final int loBound, final int hiBound) {
//System.out.println("SUBSET");
this.type = TYPE_SUBSET;
this.lowBound = loBound;
@@ -182,7 +182,7 @@ public abstract class AbstractSortedSetTest<E> extends
AbstractSetTest<E> {
final int loBound = length / 3;
final int hiBound = loBound * 2;
- return new TestSortedSetSubSet(hiBound, true);
+ return new SortedSetSubSetTest(hiBound, true);
}
/**
@@ -198,7 +198,7 @@ public abstract class AbstractSortedSetTest<E> extends
AbstractSetTest<E> {
final int loBound = length / 3;
final int hiBound = loBound * 2;
- return new TestSortedSetSubSet(loBound, hiBound);
+ return new SortedSetSubSetTest(loBound, hiBound);
}
@@ -213,7 +213,7 @@ public abstract class AbstractSortedSetTest<E> extends
AbstractSetTest<E> {
public BulkTest bulkTestSortedSetTailSet() {
final int length = getFullElements().length;
final int loBound = length / 3;
- return new TestSortedSetSubSet(loBound, false);
+ return new SortedSetSubSetTest(loBound, false);
}
/**
