Skip to content

Commit a951781

Browse files
garydgregorygarydgregory
committed
Normalize test class names to *Test
1 parent 3d737b0 commit a951781

13 files changed

+84
-84
lines changed

‎src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
*/
6969
public abstract class AbstractBagTest<T> extends AbstractCollectionTest<T> {
7070

71-
public class TestBagUniqueSet extends AbstractSetTest<T> {
71+
public class BagUniqueSetTest extends AbstractSetTest<T> {
7272

7373
@Override
7474
public T[] getFullElements() {
@@ -118,15 +118,15 @@ public Set<T> makeObject() {
118118
@Override
119119
public void resetEmpty() {
120120
AbstractBagTest.this.resetEmpty();
121-
TestBagUniqueSet.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
122-
TestBagUniqueSet.this.setConfirmed(new HashSet<>(AbstractBagTest.this.getConfirmed()));
121+
BagUniqueSetTest.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
122+
BagUniqueSetTest.this.setConfirmed(new HashSet<>(AbstractBagTest.this.getConfirmed()));
123123
}
124124

125125
@Override
126126
public void resetFull() {
127127
AbstractBagTest.this.resetFull();
128-
TestBagUniqueSet.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
129-
TestBagUniqueSet.this.setConfirmed(new HashSet<>(AbstractBagTest.this.getConfirmed()));
128+
BagUniqueSetTest.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
129+
BagUniqueSetTest.this.setConfirmed(new HashSet<>(AbstractBagTest.this.getConfirmed()));
130130
}
131131

132132
@Override
@@ -150,7 +150,7 @@ public AbstractBagTest() {
150150
* @return a {@link AbstractSetTest} instance for testing the bag's unique set
151151
*/
152152
public BulkTest bulkTestBagUniqueSet() {
153-
return new TestBagUniqueSet();
153+
return new BagUniqueSetTest();
154154
}
155155

156156
/**

‎src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
*/
4747
public abstract class AbstractBidiMapTest<K, V> extends AbstractIterableMapTest<K, V> {
4848

49-
public class TestBidiMapEntrySet extends TestMapEntrySet {
49+
public class BidiMapEntrySetTest extends MapEntrySetTest {
5050

51-
public TestBidiMapEntrySet() {
51+
public BidiMapEntrySetTest() {
5252
}
5353

5454
@Test
@@ -61,15 +61,15 @@ void testMapEntrySetIteratorEntrySetValueCrossCheck() {
6161
resetFull();
6262
// explicitly get entries as sample values/keys are connected for some maps
6363
// such as BeanMap
64-
Iterator<Map.Entry<K, V>> it = TestBidiMapEntrySet.this.getCollection().iterator();
64+
Iterator<Map.Entry<K, V>> it = BidiMapEntrySetTest.this.getCollection().iterator();
6565
final Map.Entry<K, V> entry1 = getEntry(it, key1);
66-
it = TestBidiMapEntrySet.this.getCollection().iterator();
66+
it = BidiMapEntrySetTest.this.getCollection().iterator();
6767
final Map.Entry<K, V> entry2 = getEntry(it, key2);
68-
Iterator<Map.Entry<K, V>> itConfirmed = TestBidiMapEntrySet.this.getConfirmed().iterator();
68+
Iterator<Map.Entry<K, V>> itConfirmed = BidiMapEntrySetTest.this.getConfirmed().iterator();
6969
final Map.Entry<K, V> entryConfirmed1 = getEntry(itConfirmed, key1);
70-
itConfirmed = TestBidiMapEntrySet.this.getConfirmed().iterator();
70+
itConfirmed = BidiMapEntrySetTest.this.getConfirmed().iterator();
7171
final Map.Entry<K, V> entryConfirmed2 = getEntry(itConfirmed, key2);
72-
TestBidiMapEntrySet.this.verify();
72+
BidiMapEntrySetTest.this.verify();
7373

7474
if (!isSetValueSupported()) {
7575
assertThrows(UnsupportedOperationException.class, () -> entry1.setValue(newValue1));
@@ -97,7 +97,7 @@ void testMapEntrySetIteratorEntrySetValueCrossCheck() {
9797
assertEquals(newValue1, AbstractBidiMapTest.this.getMap().get(entry2.getKey()));
9898
assertFalse(AbstractBidiMapTest.this.getMap().containsKey(key1));
9999
assertFalse(AbstractBidiMapTest.this.getMap().containsValue(newValue2));
100-
TestBidiMapEntrySet.this.verify();
100+
BidiMapEntrySetTest.this.verify();
101101

102102
// check for ConcurrentModification
103103
it.next(); // if you fail here, maybe you should be throwing an IAE, see above
@@ -108,7 +108,7 @@ void testMapEntrySetIteratorEntrySetValueCrossCheck() {
108108

109109
}
110110

111-
public class TestBidiMapIterator extends AbstractMapIteratorTest<K, V> {
111+
public class BidiMapIteratorTest extends AbstractMapIteratorTest<K, V> {
112112

113113
@Override
114114
public V[] addSetValues() {
@@ -157,11 +157,11 @@ public void verify() {
157157

158158
}
159159

160-
public class TestInverseBidiMap extends AbstractBidiMapTest<V, K> {
160+
public class InverseBidiMapTest extends AbstractBidiMapTest<V, K> {
161161

162162
final AbstractBidiMapTest<K, V> main;
163163

164-
public TestInverseBidiMap(final AbstractBidiMapTest<K, V> main) {
164+
public InverseBidiMapTest(final AbstractBidiMapTest<K, V> main) {
165165
this.main = main;
166166
}
167167

@@ -237,16 +237,16 @@ public BidiMap<V, K> makeObject() {
237237
}
238238

239239
public BulkTest bulkTestBidiMapIterator() {
240-
return new TestBidiMapIterator();
240+
return new BidiMapIteratorTest();
241241
}
242242

243243
public BulkTest bulkTestInverseMap() {
244-
return new TestInverseBidiMap(this);
244+
return new InverseBidiMapTest(this);
245245
}
246246

247247
@Override
248248
public BulkTest bulkTestMapEntrySet() {
249-
return new TestBidiMapEntrySet();
249+
return new BidiMapEntrySetTest();
250250
}
251251

252252
private void doTestGetKey(final BidiMap<?, ?> map, final Object key, final Object value) {

‎src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*/
3939
public abstract class AbstractOrderedBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
4040

41-
public class TestBidiOrderedMapIterator extends AbstractMapIteratorTest<K, V> {
41+
public class BidiOrderedMapIteratorTest extends AbstractMapIteratorTest<K, V> {
4242

4343
@Override
4444
public V[] addSetValues() {
@@ -88,7 +88,7 @@ public void verify() {
8888
}
8989

9090
public BulkTest bulkTestOrderedMapIterator() {
91-
return new TestBidiOrderedMapIterator();
91+
return new BidiOrderedMapIteratorTest();
9292
}
9393

9494
/**

‎src/test/java/org/apache/commons/collections4/list/AbstractListTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void verify() {
131131
}
132132
}
133133

134-
public class TestListIterator extends AbstractListIteratorTest<E> {
134+
public class ListIteratorTest extends AbstractListIteratorTest<E> {
135135

136136
@Override
137137
public E addSetValue() {
@@ -199,7 +199,7 @@ private void backwardTest(final ListIterator<E> iter, int i) {
199199
}
200200

201201
public BulkTest bulkTestListIterator() {
202-
return new TestListIterator();
202+
return new ListIteratorTest();
203203
}
204204

205205
/**

‎src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
*/
139139
public abstract class AbstractMapTest<M extends Map<K, V>, K, V> extends AbstractObjectTest {
140140

141-
public class TestMapEntrySet extends AbstractSetTest<Map.Entry<K, V>> {
141+
public class MapEntrySetTest extends AbstractSetTest<Map.Entry<K, V>> {
142142

143143
@Override
144144
public boolean areEqualElementsDistinguishable() {
@@ -230,14 +230,14 @@ public Set<Map.Entry<K, V>> makeObject() {
230230
public void resetEmpty() {
231231
AbstractMapTest.this.resetEmpty();
232232
setCollection(AbstractMapTest.this.getMap().entrySet());
233-
TestMapEntrySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
233+
MapEntrySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
234234
}
235235

236236
@Override
237237
public void resetFull() {
238238
AbstractMapTest.this.resetFull();
239239
setCollection(AbstractMapTest.this.getMap().entrySet());
240-
TestMapEntrySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
240+
MapEntrySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
241241
}
242242

243243
@Test
@@ -265,13 +265,13 @@ void testMapEntrySetIteratorEntrySetValue() {
265265
resetFull();
266266
// explicitly get entries as sample values/keys are connected for some maps
267267
// such as BeanMap
268-
Iterator<Map.Entry<K, V>> it = TestMapEntrySet.this.getCollection().iterator();
268+
Iterator<Map.Entry<K, V>> it = MapEntrySetTest.this.getCollection().iterator();
269269
final Map.Entry<K, V> entry1 = getEntry(it, key1);
270-
it = TestMapEntrySet.this.getCollection().iterator();
270+
it = MapEntrySetTest.this.getCollection().iterator();
271271
final Map.Entry<K, V> entry2 = getEntry(it, key2);
272-
Iterator<Map.Entry<K, V>> itConfirmed = TestMapEntrySet.this.getConfirmed().iterator();
272+
Iterator<Map.Entry<K, V>> itConfirmed = MapEntrySetTest.this.getConfirmed().iterator();
273273
final Map.Entry<K, V> entryConfirmed1 = getEntry(itConfirmed, key1);
274-
itConfirmed = TestMapEntrySet.this.getConfirmed().iterator();
274+
itConfirmed = MapEntrySetTest.this.getConfirmed().iterator();
275275
final Map.Entry<K, V> entryConfirmed2 = getEntry(itConfirmed, key2);
276276
verify();
277277

@@ -322,7 +322,7 @@ public void verify() {
322322
}
323323
}
324324

325-
public class TestMapKeySet extends AbstractSetTest<K> {
325+
public class MapKeySetTest extends AbstractSetTest<K> {
326326

327327
@Override
328328
public K[] getFullElements() {
@@ -373,14 +373,14 @@ public Set<K> makeObject() {
373373
public void resetEmpty() {
374374
AbstractMapTest.this.resetEmpty();
375375
setCollection(AbstractMapTest.this.getMap().keySet());
376-
TestMapKeySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
376+
MapKeySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
377377
}
378378

379379
@Override
380380
public void resetFull() {
381381
AbstractMapTest.this.resetFull();
382382
setCollection(AbstractMapTest.this.getMap().keySet());
383-
TestMapKeySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
383+
MapKeySetTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet());
384384
}
385385

386386
@Override
@@ -399,7 +399,7 @@ public void verify() {
399399
// to the confirmed, that the already-constructed collection views
400400
// are still equal to the confirmed's collection views.
401401

402-
public class TestMapValues extends AbstractCollectionTest<V> {
402+
public class MapValuesTest extends AbstractCollectionTest<V> {
403403

404404
@Override
405405
public boolean areEqualElementsDistinguishable() {
@@ -469,14 +469,14 @@ public Collection<V> makeObject() {
469469
public void resetEmpty() {
470470
AbstractMapTest.this.resetEmpty();
471471
setCollection(map.values());
472-
TestMapValues.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
472+
MapValuesTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
473473
}
474474

475475
@Override
476476
public void resetFull() {
477477
AbstractMapTest.this.resetFull();
478478
setCollection(map.values());
479-
TestMapValues.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
479+
MapValuesTest.this.setConfirmed(AbstractMapTest.this.getConfirmed().values());
480480
}
481481

482482
@Override
@@ -554,7 +554,7 @@ public boolean areEqualElementsDistinguishable() {
554554
* @return a {@link AbstractSetTest} instance for testing the map's entry set
555555
*/
556556
public BulkTest bulkTestMapEntrySet() {
557-
return new TestMapEntrySet();
557+
return new MapEntrySetTest();
558558
}
559559

560560
/**
@@ -564,7 +564,7 @@ public BulkTest bulkTestMapEntrySet() {
564564
* @return a {@link AbstractSetTest} instance for testing the map's key set
565565
*/
566566
public BulkTest bulkTestMapKeySet() {
567-
return new TestMapKeySet();
567+
return new MapKeySetTest();
568568
}
569569

570570
/**
@@ -574,7 +574,7 @@ public BulkTest bulkTestMapKeySet() {
574574
* @return a {@link AbstractCollectionTest} instance for testing the map's values collection
575575
*/
576576
public BulkTest bulkTestMapValues() {
577-
return new TestMapValues();
577+
return new MapValuesTest();
578578
}
579579

580580
/**

‎src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*/
4848
public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
4949

50-
public class TestFlatMapIterator extends AbstractMapIteratorTest<K, V> {
50+
public class FlatMapIteratorTest extends AbstractMapIteratorTest<K, V> {
5151

5252
@Override
5353
public V[] addSetValues() {
@@ -105,7 +105,7 @@ public void verify() {
105105

106106
@Override
107107
public BulkTest bulkTestMapIterator() {
108-
return new TestFlatMapIterator();
108+
return new FlatMapIteratorTest();
109109
}
110110

111111
@Override

‎src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
4343

44-
public class TestListView extends AbstractListTest<K> {
44+
public class ListViewTest extends AbstractListTest<K> {
4545

4646
@Override
4747
public K[] getFullElements() {
@@ -85,7 +85,7 @@ public List<K> makeObject() {
8585
}
8686

8787
public BulkTest bulkTestListView() {
88-
return new TestListView();
88+
return new ListViewTest();
8989
}
9090

9191
@Override

‎src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838
public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
3939

40-
public class TestListView extends AbstractListTest<K> {
40+
public class ListViewTest extends AbstractListTest<K> {
4141

4242
@Override
4343
public K[] getFullElements() {
@@ -81,7 +81,7 @@ public List<K> makeObject() {
8181
}
8282

8383
public BulkTest bulkTestListView() {
84-
return new TestListView();
84+
return new ListViewTest();
8585
}
8686

8787
@Override

‎src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
4343

44-
public class TestKeyListView extends AbstractListTest<K> {
44+
public class KeyListViewTest extends AbstractListTest<K> {
4545

4646
@Override
4747
public K[] getFullElements() {
@@ -85,7 +85,7 @@ public List<K> makeObject() {
8585

8686
}
8787

88-
public class TestValueListView extends AbstractListTest<V> {
88+
public class ValueListViewTest extends AbstractListTest<V> {
8989

9090
@Override
9191
public V[] getFullElements() {
@@ -130,11 +130,11 @@ public List<V> makeObject() {
130130
}
131131

132132
public BulkTest bulkTestKeyListView() {
133-
return new TestKeyListView();
133+
return new KeyListViewTest();
134134
}
135135

136136
public BulkTest bulkTestValueListView() {
137-
return new TestValueListView();
137+
return new ValueListViewTest();
138138
}
139139

140140
@Override

0 commit comments

Comments
 (0)