diff --git a/pom.xml b/pom.xml index da4e565ec..db3670f25 100644 --- a/pom.xml +++ b/pom.xml @@ -447,7 +447,6 @@ maven-surefire-plugin - **/Test*.java **/*Test.java diff --git a/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java b/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java index f58856311..5b7ad4aeb 100644 --- a/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java +++ b/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java @@ -18,7 +18,7 @@ package org.apache.commons.collections; import java.util.TreeMap; -import org.apache.commons.collections.map.AbstractTestMap; +import org.apache.commons.collections.map.AbstractMapTest; /** * Tests TreeMap. @@ -27,7 +27,7 @@ import org.apache.commons.collections.map.AbstractTestMap; * * @author Jason van Zyl */ -public abstract class AbstractTreeMapTest extends AbstractTestMap { +public abstract class AbstractTreeMapTest extends AbstractMapTest { public AbstractTreeMapTest(String testName) { super(testName); diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java index caff28110..23f31d5dd 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java @@ -26,14 +26,14 @@ import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.iterators.AbstractMapIteratorTest; -import org.apache.commons.collections.map.AbstractTestIterableMap; +import org.apache.commons.collections.map.AbstractIterableMapTest; /** * Abstract test class for {@link BidiMap} methods and contracts. * * @version $Id$ */ -public abstract class AbstractBidiMapTest extends AbstractTestIterableMap { +public abstract class AbstractBidiMapTest extends AbstractIterableMapTest { public AbstractBidiMapTest(String testName) { super(testName); diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java index e895b9008..36e357c3f 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java @@ -29,7 +29,7 @@ import java.util.TreeSet; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.SortedBidiMap; -import org.apache.commons.collections.map.AbstractTestSortedMap; +import org.apache.commons.collections.map.AbstractSortedMapTest; /** * Abstract test class for {@link SortedBidiMap} methods and contracts. @@ -628,15 +628,15 @@ public abstract class AbstractSortedBidiMapTest, V exten //----------------------------------------------------------------------- public BulkTest bulkTestHeadMap() { - return new AbstractTestSortedMap.TestHeadMap(this); + return new AbstractSortedMapTest.TestHeadMap(this); } public BulkTest bulkTestTailMap() { - return new AbstractTestSortedMap.TestTailMap(this); + return new AbstractSortedMapTest.TestTailMap(this); } public BulkTest bulkTestSubMap() { - return new AbstractTestSortedMap.TestSubMap(this); + return new AbstractSortedMapTest.TestSubMap(this); } } diff --git a/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java index 41f8ddcb8..a670cb740 100644 --- a/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java +++ b/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java @@ -90,7 +90,7 @@ import org.apache.commons.collections.AbstractObjectTest; * {@link #confirmed}, the {@link #verify()} method is invoked to compare * the results. You may want to override {@link #verify()} to perform * additional verifications. For instance, when testing the collection - * views of a map, {@link org.apache.commons.collections.map.AbstractTestMap AbstractTestMap} + * views of a map, {@link org.apache.commons.collections.map.AbstractMapTest AbstractTestMap} * would override {@link #verify()} to make * sure the map is changed after the collection view is changed. *

diff --git a/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java b/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java index 001b7ce15..d6b72414c 100644 --- a/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java @@ -1504,7 +1504,7 @@ public class CursorableLinkedListTest extends AbstractLinkedListTest { @Override public String[] ignoredTests() { ArrayList list = new ArrayList(); - String prefix = "TestCursorableLinkedList"; + String prefix = "CursorableLinkedListTest"; String bulk = ".bulkTestSubList"; String[] ignored = new String[] { ".testEmptyListSerialization", diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java b/src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java rename to src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java index a88afbadb..bae69f10d 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java +++ b/src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java @@ -32,14 +32,14 @@ import org.apache.commons.collections.iterators.AbstractMapIteratorTest; * * @author Stephen Colebourne */ -public abstract class AbstractTestIterableMap extends AbstractTestMap { +public abstract class AbstractIterableMapTest extends AbstractMapTest { /** * JUnit constructor. * * @param testName the test name */ - public AbstractTestIterableMap(String testName) { + public AbstractIterableMapTest(String testName) { super(testName); } @@ -136,52 +136,52 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap makeEmptyIterator() { resetEmpty(); - return AbstractTestIterableMap.this.getMap().mapIterator(); + return AbstractIterableMapTest.this.getMap().mapIterator(); } @Override public MapIterator makeObject() { resetFull(); - return AbstractTestIterableMap.this.getMap().mapIterator(); + return AbstractIterableMapTest.this.getMap().mapIterator(); } @Override public Map getMap() { // assumes makeFullMapIterator() called first - return AbstractTestIterableMap.this.getMap(); + return AbstractIterableMapTest.this.getMap(); } @Override public Map getConfirmedMap() { // assumes makeFullMapIterator() called first - return AbstractTestIterableMap.this.getConfirmed(); + return AbstractIterableMapTest.this.getConfirmed(); } @Override public void verify() { super.verify(); - AbstractTestIterableMap.this.verify(); + AbstractIterableMapTest.this.verify(); } } diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java b/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/AbstractTestMap.java rename to src/test/java/org/apache/commons/collections/map/AbstractMapTest.java index 469ba804a..f9eac5f61 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java +++ b/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java @@ -125,7 +125,7 @@ import org.apache.commons.collections.set.AbstractSetTest; * @author Stephen Colebourne * @version $Revision$ */ -public abstract class AbstractTestMap extends AbstractObjectTest { +public abstract class AbstractMapTest extends AbstractObjectTest { /** * JDK1.2 has bugs in null handling of Maps, especially HashMap.Entry.toString @@ -165,7 +165,7 @@ public abstract class AbstractTestMap extends AbstractObjectTest { * * @param testName the test name */ - public AbstractTestMap(String testName) { + public AbstractMapTest(String testName) { super(testName); } @@ -1554,7 +1554,7 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public Set> makeObject() { - return AbstractTestMap.this.makeObject().entrySet(); + return AbstractMapTest.this.makeObject().entrySet(); } @Override @@ -1571,11 +1571,11 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public boolean isRemoveSupported() { // Entry set should only support remove if map does - return AbstractTestMap.this.isRemoveSupported(); + return AbstractMapTest.this.isRemoveSupported(); } public boolean isGetStructuralModify() { - return AbstractTestMap.this.isGetStructuralModify(); + return AbstractMapTest.this.isGetStructuralModify(); } @Override @@ -1585,16 +1585,16 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public void resetFull() { - AbstractTestMap.this.resetFull(); - setCollection(AbstractTestMap.this.getMap().entrySet()); - TestMapEntrySet.this.setConfirmed(AbstractTestMap.this.getConfirmed().entrySet()); + AbstractMapTest.this.resetFull(); + setCollection(AbstractMapTest.this.getMap().entrySet()); + TestMapEntrySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet()); } @Override public void resetEmpty() { - AbstractTestMap.this.resetEmpty(); - setCollection(AbstractTestMap.this.getMap().entrySet()); - TestMapEntrySet.this.setConfirmed(AbstractTestMap.this.getConfirmed().entrySet()); + AbstractMapTest.this.resetEmpty(); + setCollection(AbstractMapTest.this.getMap().entrySet()); + TestMapEntrySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet()); } public void testMapEntrySetIteratorEntry() { @@ -1603,10 +1603,10 @@ public abstract class AbstractTestMap extends AbstractObjectTest { int count = 0; while (it.hasNext()) { Map.Entry entry = it.next(); - assertEquals(true, AbstractTestMap.this.getMap().containsKey(entry.getKey())); - assertEquals(true, AbstractTestMap.this.getMap().containsValue(entry.getValue())); + assertEquals(true, AbstractMapTest.this.getMap().containsKey(entry.getKey())); + assertEquals(true, AbstractMapTest.this.getMap().containsValue(entry.getValue())); if (isGetStructuralModify() == false) { - assertEquals(AbstractTestMap.this.getMap().get(entry.getKey()), entry.getValue()); + assertEquals(AbstractMapTest.this.getMap().get(entry.getKey()), entry.getValue()); } count++; } @@ -1643,25 +1643,25 @@ public abstract class AbstractTestMap extends AbstractObjectTest { entry1.setValue(newValue1); entryConfirmed1.setValue(newValue1); assertEquals(newValue1, entry1.getValue()); - assertEquals(true, AbstractTestMap.this.getMap().containsKey(entry1.getKey())); - assertEquals(true, AbstractTestMap.this.getMap().containsValue(newValue1)); - assertEquals(newValue1, AbstractTestMap.this.getMap().get(entry1.getKey())); + assertEquals(true, AbstractMapTest.this.getMap().containsKey(entry1.getKey())); + assertEquals(true, AbstractMapTest.this.getMap().containsValue(newValue1)); + assertEquals(newValue1, AbstractMapTest.this.getMap().get(entry1.getKey())); verify(); entry1.setValue(newValue1); entryConfirmed1.setValue(newValue1); assertEquals(newValue1, entry1.getValue()); - assertEquals(true, AbstractTestMap.this.getMap().containsKey(entry1.getKey())); - assertEquals(true, AbstractTestMap.this.getMap().containsValue(newValue1)); - assertEquals(newValue1, AbstractTestMap.this.getMap().get(entry1.getKey())); + assertEquals(true, AbstractMapTest.this.getMap().containsKey(entry1.getKey())); + assertEquals(true, AbstractMapTest.this.getMap().containsValue(newValue1)); + assertEquals(newValue1, AbstractMapTest.this.getMap().get(entry1.getKey())); verify(); entry2.setValue(newValue2); entryConfirmed2.setValue(newValue2); assertEquals(newValue2, entry2.getValue()); - assertEquals(true, AbstractTestMap.this.getMap().containsKey(entry2.getKey())); - assertEquals(true, AbstractTestMap.this.getMap().containsValue(newValue2)); - assertEquals(newValue2, AbstractTestMap.this.getMap().get(entry2.getKey())); + assertEquals(true, AbstractMapTest.this.getMap().containsKey(entry2.getKey())); + assertEquals(true, AbstractMapTest.this.getMap().containsValue(newValue2)); + assertEquals(newValue2, AbstractMapTest.this.getMap().get(entry2.getKey())); verify(); } @@ -1693,7 +1693,7 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public void verify() { super.verify(); - AbstractTestMap.this.verify(); + AbstractMapTest.this.verify(); } } @@ -1727,17 +1727,17 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public Set makeObject() { - return AbstractTestMap.this.makeObject().keySet(); + return AbstractMapTest.this.makeObject().keySet(); } @Override public Set makeFullCollection() { - return AbstractTestMap.this.makeFullMap().keySet(); + return AbstractMapTest.this.makeFullMap().keySet(); } @Override public boolean isNullSupported() { - return AbstractTestMap.this.isAllowNullKey(); + return AbstractMapTest.this.isAllowNullKey(); } @Override @@ -1747,7 +1747,7 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public boolean isRemoveSupported() { - return AbstractTestMap.this.isRemoveSupported(); + return AbstractMapTest.this.isRemoveSupported(); } @Override @@ -1757,22 +1757,22 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public void resetEmpty() { - AbstractTestMap.this.resetEmpty(); - setCollection(AbstractTestMap.this.getMap().keySet()); - TestMapKeySet.this.setConfirmed(AbstractTestMap.this.getConfirmed().keySet()); + AbstractMapTest.this.resetEmpty(); + setCollection(AbstractMapTest.this.getMap().keySet()); + TestMapKeySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet()); } @Override public void resetFull() { - AbstractTestMap.this.resetFull(); - setCollection(AbstractTestMap.this.getMap().keySet()); - TestMapKeySet.this.setConfirmed(AbstractTestMap.this.getConfirmed().keySet()); + AbstractMapTest.this.resetFull(); + setCollection(AbstractMapTest.this.getMap().keySet()); + TestMapKeySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().keySet()); } @Override public void verify() { super.verify(); - AbstractTestMap.this.verify(); + AbstractMapTest.this.verify(); } } @@ -1806,17 +1806,17 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public Collection makeObject() { - return AbstractTestMap.this.makeObject().values(); + return AbstractMapTest.this.makeObject().values(); } @Override public Collection makeFullCollection() { - return AbstractTestMap.this.makeFullMap().values(); + return AbstractMapTest.this.makeFullMap().values(); } @Override public boolean isNullSupported() { - return AbstractTestMap.this.isAllowNullKey(); + return AbstractMapTest.this.isAllowNullKey(); } @Override @@ -1826,7 +1826,7 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public boolean isRemoveSupported() { - return AbstractTestMap.this.isRemoveSupported(); + return AbstractMapTest.this.isRemoveSupported(); } @Override @@ -1855,22 +1855,22 @@ public abstract class AbstractTestMap extends AbstractObjectTest { @Override public void resetFull() { - AbstractTestMap.this.resetFull(); + AbstractMapTest.this.resetFull(); setCollection(map.values()); - TestMapValues.this.setConfirmed(AbstractTestMap.this.getConfirmed().values()); + TestMapValues.this.setConfirmed(AbstractMapTest.this.getConfirmed().values()); } @Override public void resetEmpty() { - AbstractTestMap.this.resetEmpty(); + AbstractMapTest.this.resetEmpty(); setCollection(map.values()); - TestMapValues.this.setConfirmed(AbstractTestMap.this.getConfirmed().values()); + TestMapValues.this.setConfirmed(AbstractMapTest.this.getConfirmed().values()); } @Override public void verify() { super.verify(); - AbstractTestMap.this.verify(); + AbstractMapTest.this.verify(); } // TODO: should test that a remove on the values collection view diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java b/src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java rename to src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java index b29262a6f..eabafdf3c 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java +++ b/src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java @@ -38,14 +38,14 @@ import org.apache.commons.collections.iterators.AbstractOrderedMapIteratorTest; * * @author Stephen Colebourne */ -public abstract class AbstractTestOrderedMap extends AbstractTestIterableMap { +public abstract class AbstractOrderedMapTest extends AbstractIterableMapTest { /** * JUnit constructor. * * @param testName the test name */ - public AbstractTestOrderedMap(String testName) { + public AbstractOrderedMapTest(String testName) { super(testName); } @@ -201,47 +201,47 @@ public abstract class AbstractTestOrderedMap extends AbstractTestIterableM @Override public boolean supportsRemove() { - return AbstractTestOrderedMap.this.isRemoveSupported(); + return AbstractOrderedMapTest.this.isRemoveSupported(); } @Override public boolean isGetStructuralModify() { - return AbstractTestOrderedMap.this.isGetStructuralModify(); + return AbstractOrderedMapTest.this.isGetStructuralModify(); } @Override public boolean supportsSetValue() { - return AbstractTestOrderedMap.this.isSetValueSupported(); + return AbstractOrderedMapTest.this.isSetValueSupported(); } @Override public OrderedMapIterator makeEmptyIterator() { resetEmpty(); - return AbstractTestOrderedMap.this.getMap().mapIterator(); + return AbstractOrderedMapTest.this.getMap().mapIterator(); } @Override public OrderedMapIterator makeObject() { resetFull(); - return AbstractTestOrderedMap.this.getMap().mapIterator(); + return AbstractOrderedMapTest.this.getMap().mapIterator(); } @Override public OrderedMap getMap() { // assumes makeFullMapIterator() called first - return AbstractTestOrderedMap.this.getMap(); + return AbstractOrderedMapTest.this.getMap(); } @Override public Map getConfirmedMap() { // assumes makeFullMapIterator() called first - return AbstractTestOrderedMap.this.getConfirmed(); + return AbstractOrderedMapTest.this.getConfirmed(); } @Override public void verify() { super.verify(); - AbstractTestOrderedMap.this.verify(); + AbstractOrderedMapTest.this.verify(); } } diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestSortedMap.java b/src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/AbstractTestSortedMap.java rename to src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java index 1be98e976..34ab09a3b 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractTestSortedMap.java +++ b/src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java @@ -33,14 +33,14 @@ import org.apache.commons.collections.BulkTest; * * @author Stephen Colebourne */ -public abstract class AbstractTestSortedMap extends AbstractTestMap { +public abstract class AbstractSortedMapTest extends AbstractMapTest { /** * JUnit constructor. * * @param testName the test name */ - public AbstractTestSortedMap(String testName) { + public AbstractSortedMapTest(String testName) { super(testName); } @@ -112,13 +112,13 @@ public abstract class AbstractTestSortedMap extends AbstractTestMap return new TestSubMap(this); } - public static abstract class TestViewMap extends AbstractTestSortedMap { - protected final AbstractTestMap main; + public static abstract class TestViewMap extends AbstractSortedMapTest { + protected final AbstractMapTest main; protected final List subSortedKeys = new ArrayList(); protected final List subSortedValues = new ArrayList(); protected final List subSortedNewValues = new ArrayList(); - public TestViewMap(String name, AbstractTestMap main) { + public TestViewMap(String name, AbstractMapTest main) { super(name); this.main = main; } @@ -215,7 +215,7 @@ public abstract class AbstractTestSortedMap extends AbstractTestMap static final int SUBSIZE = 6; final K toKey; - public TestHeadMap(AbstractTestMap main) { + public TestHeadMap(AbstractMapTest main) { super("SortedMap.HeadMap", main); Map sm = main.makeFullMap(); for (Iterator> it = sm.entrySet().iterator(); it.hasNext();) { @@ -268,7 +268,7 @@ public abstract class AbstractTestSortedMap extends AbstractTestMap final K fromKey; final K invalidKey; - public TestTailMap(AbstractTestMap main) { + public TestTailMap(AbstractMapTest main) { super("SortedMap.TailMap", main); Map sm = main.makeFullMap(); for (Iterator> it = sm.entrySet().iterator(); it.hasNext();) { @@ -322,7 +322,7 @@ public abstract class AbstractTestSortedMap extends AbstractTestMap final K fromKey; final K toKey; - public TestSubMap(AbstractTestMap main) { + public TestSubMap(AbstractMapTest main) { super("SortedMap.SubMap", main); Map sm = main.makeFullMap(); for (Iterator> it = sm.entrySet().iterator(); it.hasNext();) { diff --git a/src/test/java/org/apache/commons/collections/map/TestCaseInsensitiveMap.java b/src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/TestCaseInsensitiveMap.java rename to src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java index a42f90be8..df17e5fcc 100644 --- a/src/test/java/org/apache/commons/collections/map/TestCaseInsensitiveMap.java +++ b/src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java @@ -31,14 +31,14 @@ import org.apache.commons.collections.BulkTest; * * @author Commons-Collections team */ -public class TestCaseInsensitiveMap extends AbstractTestIterableMap { +public class CaseInsensitiveMapTest extends AbstractIterableMapTest { - public TestCaseInsensitiveMap(String testName) { + public CaseInsensitiveMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestCaseInsensitiveMap.class); + return BulkTest.makeSuite(CaseInsensitiveMapTest.class); } @Override diff --git a/src/test/java/org/apache/commons/collections/map/TestCompositeMap.java b/src/test/java/org/apache/commons/collections/map/CompositeMapTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/map/TestCompositeMap.java rename to src/test/java/org/apache/commons/collections/map/CompositeMapTest.java index 5f6bd7967..8c1b1e1cc 100644 --- a/src/test/java/org/apache/commons/collections/map/TestCompositeMap.java +++ b/src/test/java/org/apache/commons/collections/map/CompositeMapTest.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Collection; /** - * Extension of {@link AbstractTestMap} for exercising the + * Extension of {@link AbstractMapTest} for exercising the * {@link CompositeMap} implementation. * * @since Commons Collections 3.0 @@ -31,11 +31,11 @@ import java.util.Collection; * * @author Brian McCallister */ -public class TestCompositeMap extends AbstractTestIterableMap { +public class CompositeMapTest extends AbstractIterableMapTest { /** used as a flag in MapMutator tests */ private boolean pass = false; - public TestCompositeMap(String testName) { + public CompositeMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestDefaultedMap.java b/src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/TestDefaultedMap.java rename to src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java index 7f59a8906..f03cc2d21 100644 --- a/src/test/java/org/apache/commons/collections/map/TestDefaultedMap.java +++ b/src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java @@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer; import org.apache.commons.collections.functors.ConstantFactory; /** - * Extension of {@link AbstractTestMap} for exercising the + * Extension of {@link AbstractMapTest} for exercising the * {@link DefaultedMap} implementation. * * @since Commons Collections 3.2 @@ -34,11 +34,11 @@ import org.apache.commons.collections.functors.ConstantFactory; * * @author Stephen Colebourne */ -public class TestDefaultedMap extends AbstractTestIterableMap { +public class DefaultedMapTest extends AbstractIterableMapTest { protected final Factory nullFactory = FactoryUtils.nullFactory(); - public TestDefaultedMap(String testName) { + public DefaultedMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestFixedSizeMap.java b/src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java similarity index 91% rename from src/test/java/org/apache/commons/collections/map/TestFixedSizeMap.java rename to src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java index 74f4235b5..48d2a9049 100644 --- a/src/test/java/org/apache/commons/collections/map/TestFixedSizeMap.java +++ b/src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.commons.collections.IterableMap; /** - * Extension of {@link AbstractTestMap} for exercising the {@link FixedSizeMap} + * Extension of {@link AbstractMapTest} for exercising the {@link FixedSizeMap} * implementation. * * @since Commons Collections 3.0 @@ -30,9 +30,9 @@ import org.apache.commons.collections.IterableMap; * * @author Stephen Colebourne */ -public class TestFixedSizeMap extends AbstractTestIterableMap { +public class FixedSizeMapTest extends AbstractIterableMapTest { - public TestFixedSizeMap(String testName) { + public FixedSizeMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestFixedSizeSortedMap.java b/src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/map/TestFixedSizeSortedMap.java rename to src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java index 532af410e..1eeed30aa 100644 --- a/src/test/java/org/apache/commons/collections/map/TestFixedSizeSortedMap.java +++ b/src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java @@ -24,7 +24,7 @@ import junit.framework.Test; import org.apache.commons.collections.BulkTest; /** - * Extension of {@link AbstractTestSortedMap} for exercising the {@link FixedSizeSortedMap} + * Extension of {@link AbstractSortedMapTest} for exercising the {@link FixedSizeSortedMap} * implementation. * * @since Commons Collections 3.0 @@ -32,14 +32,14 @@ import org.apache.commons.collections.BulkTest; * * @author Stephen Colebourne */ -public class TestFixedSizeSortedMap extends AbstractTestSortedMap { +public class FixedSizeSortedMapTest extends AbstractSortedMapTest { - public TestFixedSizeSortedMap(String testName) { + public FixedSizeSortedMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestFixedSizeSortedMap.class); + return BulkTest.makeSuite(FixedSizeSortedMapTest.class); } //----------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java b/src/test/java/org/apache/commons/collections/map/Flat3MapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/TestFlat3Map.java rename to src/test/java/org/apache/commons/collections/map/Flat3MapTest.java index 1a9dbc03e..275a74256 100644 --- a/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java +++ b/src/test/java/org/apache/commons/collections/map/Flat3MapTest.java @@ -36,7 +36,7 @@ import org.apache.commons.collections.iterators.AbstractMapIteratorTest; * * @author Stephen Colebourne */ -public class TestFlat3Map extends AbstractTestIterableMap { +public class Flat3MapTest extends AbstractIterableMapTest { private static final Integer ONE = new Integer(1); private static final Integer TWO = new Integer(2); @@ -45,12 +45,12 @@ public class TestFlat3Map extends AbstractTestIterableMap { private static final String TWENTY = "20"; private static final String THIRTY = "30"; - public TestFlat3Map(String testName) { + public Flat3MapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestFlat3Map.class); + return BulkTest.makeSuite(Flat3MapTest.class); } @Override @@ -350,47 +350,47 @@ public class TestFlat3Map extends AbstractTestIterableMap { @Override public V[] addSetValues() { - return TestFlat3Map.this.getNewSampleValues(); + return Flat3MapTest.this.getNewSampleValues(); } @Override public boolean supportsRemove() { - return TestFlat3Map.this.isRemoveSupported(); + return Flat3MapTest.this.isRemoveSupported(); } @Override public boolean supportsSetValue() { - return TestFlat3Map.this.isSetValueSupported(); + return Flat3MapTest.this.isSetValueSupported(); } @Override public MapIterator makeEmptyIterator() { resetEmpty(); - return TestFlat3Map.this.getMap().mapIterator(); + return Flat3MapTest.this.getMap().mapIterator(); } @Override public MapIterator makeObject() { resetFull(); - return TestFlat3Map.this.getMap().mapIterator(); + return Flat3MapTest.this.getMap().mapIterator(); } @Override public IterableMap getMap() { // assumes makeFullMapIterator() called first - return TestFlat3Map.this.getMap(); + return Flat3MapTest.this.getMap(); } @Override public Map getConfirmedMap() { // assumes makeFullMapIterator() called first - return TestFlat3Map.this.getConfirmed(); + return Flat3MapTest.this.getConfirmed(); } @Override public void verify() { super.verify(); - TestFlat3Map.this.verify(); + Flat3MapTest.this.verify(); } } diff --git a/src/test/java/org/apache/commons/collections/map/TestHashedMap.java b/src/test/java/org/apache/commons/collections/map/HashedMapTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/map/TestHashedMap.java rename to src/test/java/org/apache/commons/collections/map/HashedMapTest.java index 92fdb3fa2..42b66cb7f 100644 --- a/src/test/java/org/apache/commons/collections/map/TestHashedMap.java +++ b/src/test/java/org/apache/commons/collections/map/HashedMapTest.java @@ -26,14 +26,14 @@ import org.apache.commons.collections.BulkTest; * * @author Stephen Colebourne */ -public class TestHashedMap extends AbstractTestIterableMap { +public class HashedMapTest extends AbstractIterableMapTest { - public TestHashedMap(String testName) { + public HashedMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestHashedMap.class); + return BulkTest.makeSuite(HashedMapTest.class); } @Override diff --git a/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/java/org/apache/commons/collections/map/IdentityMapTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/map/TestIdentityMap.java rename to src/test/java/org/apache/commons/collections/map/IdentityMapTest.java index 23f1e7f45..179a4fc09 100644 --- a/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java +++ b/src/test/java/org/apache/commons/collections/map/IdentityMapTest.java @@ -33,19 +33,19 @@ import org.apache.commons.collections.IterableMap; * * @author Stephen Colebourne */ -public class TestIdentityMap extends AbstractObjectTest { +public class IdentityMapTest extends AbstractObjectTest { private static final Integer I1A = new Integer(1); private static final Integer I1B = new Integer(1); private static final Integer I2A = new Integer(2); private static final Integer I2B = new Integer(2); - public TestIdentityMap(String testName) { + public IdentityMapTest(String testName) { super(testName); } public static Test suite() { - return new TestSuite(TestIdentityMap.class); + return new TestSuite(IdentityMapTest.class); // return BulkTest.makeSuite(TestIdentityMap.class); // causes race condition! } diff --git a/src/test/java/org/apache/commons/collections/map/TestLRUMap.java b/src/test/java/org/apache/commons/collections/map/LRUMapTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/map/TestLRUMap.java rename to src/test/java/org/apache/commons/collections/map/LRUMapTest.java index d80a084d5..6bdf94e7e 100644 --- a/src/test/java/org/apache/commons/collections/map/TestLRUMap.java +++ b/src/test/java/org/apache/commons/collections/map/LRUMapTest.java @@ -35,14 +35,14 @@ import org.apache.commons.collections.ResettableIterator; * * @author Stephen Colebourne */ -public class TestLRUMap extends AbstractTestOrderedMap { +public class LRUMapTest extends AbstractOrderedMapTest { - public TestLRUMap(String testName) { + public LRUMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestLRUMap.class); + return BulkTest.makeSuite(LRUMapTest.class); } @Override diff --git a/src/test/java/org/apache/commons/collections/map/TestLazyMap.java b/src/test/java/org/apache/commons/collections/map/LazyMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/TestLazyMap.java rename to src/test/java/org/apache/commons/collections/map/LazyMapTest.java index 9ab6df157..98986c6d5 100644 --- a/src/test/java/org/apache/commons/collections/map/TestLazyMap.java +++ b/src/test/java/org/apache/commons/collections/map/LazyMapTest.java @@ -27,7 +27,7 @@ import org.apache.commons.collections.Transformer; import org.junit.Test; /** - * Extension of {@link AbstractTestMap} for exercising the + * Extension of {@link AbstractMapTest} for exercising the * {@link LazyMap} implementation. * * @since Commons Collections 3.0 @@ -36,11 +36,11 @@ import org.junit.Test; * @author Phil Steitz */ @SuppressWarnings("boxing") -public class TestLazyMap extends AbstractTestIterableMap { +public class LazyMapTest extends AbstractIterableMapTest { private static final Factory oneFactory = FactoryUtils.constantFactory(1); - public TestLazyMap(String testName) { + public LazyMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestLazySortedMap.java b/src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/TestLazySortedMap.java rename to src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java index 77cf477d3..b21419f16 100644 --- a/src/test/java/org/apache/commons/collections/map/TestLazySortedMap.java +++ b/src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java @@ -30,7 +30,7 @@ import org.apache.commons.collections.TransformerUtils; import org.junit.Test; /** - * Extension of {@link TestLazyMap} for exercising the + * Extension of {@link LazyMapTest} for exercising the * {@link LazySortedMap} implementation. * * @since Commons Collections 3.0 @@ -39,11 +39,11 @@ import org.junit.Test; * @author Phil Steitz */ @SuppressWarnings("boxing") -public class TestLazySortedMap extends AbstractTestSortedMap { +public class LazySortedMapTest extends AbstractSortedMapTest { private static final Factory oneFactory = FactoryUtils.constantFactory(1); - public TestLazySortedMap(String testName) { + public LazySortedMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestLinkedMap.java b/src/test/java/org/apache/commons/collections/map/LinkedMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/TestLinkedMap.java rename to src/test/java/org/apache/commons/collections/map/LinkedMapTest.java index 8193f4e80..414045496 100644 --- a/src/test/java/org/apache/commons/collections/map/TestLinkedMap.java +++ b/src/test/java/org/apache/commons/collections/map/LinkedMapTest.java @@ -35,14 +35,14 @@ import org.apache.commons.collections.list.AbstractListTest; * * @author Stephen Colebourne */ -public class TestLinkedMap extends AbstractTestOrderedMap { +public class LinkedMapTest extends AbstractOrderedMapTest { - public TestLinkedMap(String testName) { + public LinkedMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestLinkedMap.class); + return BulkTest.makeSuite(LinkedMapTest.class); } @Override @@ -238,17 +238,17 @@ public class TestLinkedMap extends AbstractTestOrderedMap { @Override public List makeObject() { - return TestLinkedMap.this.makeObject().asList(); + return LinkedMapTest.this.makeObject().asList(); } @Override public List makeFullCollection() { - return TestLinkedMap.this.makeFullMap().asList(); + return LinkedMapTest.this.makeFullMap().asList(); } @Override public K[] getFullElements() { - return TestLinkedMap.this.getSampleKeys(); + return LinkedMapTest.this.getSampleKeys(); } @Override public boolean isAddSupported() { @@ -264,7 +264,7 @@ public class TestLinkedMap extends AbstractTestOrderedMap { } @Override public boolean isNullSupported() { - return TestLinkedMap.this.isAllowNullKey(); + return LinkedMapTest.this.isAllowNullKey(); } @Override public boolean isTestSerialization() { diff --git a/src/test/java/org/apache/commons/collections/map/TestListOrderedMap2.java b/src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java similarity index 92% rename from src/test/java/org/apache/commons/collections/map/TestListOrderedMap2.java rename to src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java index 44bd249db..5a0fcc017 100644 --- a/src/test/java/org/apache/commons/collections/map/TestListOrderedMap2.java +++ b/src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java @@ -26,7 +26,7 @@ import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.list.AbstractListTest; /** - * Extension of {@link AbstractTestOrderedMap} for exercising the {@link ListOrderedMap} + * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap} * implementation. * * @since Commons Collections 3.1 @@ -34,14 +34,14 @@ import org.apache.commons.collections.list.AbstractListTest; * * @author Stephen Colebourne */ -public class TestListOrderedMap2 extends AbstractTestOrderedMap { +public class ListOrderedMap2Test extends AbstractOrderedMapTest { - public TestListOrderedMap2(String testName) { + public ListOrderedMap2Test(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestListOrderedMap2.class); + return BulkTest.makeSuite(ListOrderedMap2Test.class); } @Override @@ -169,17 +169,17 @@ public class TestListOrderedMap2 extends AbstractTestOrderedMap { @Override public List makeObject() { - return TestListOrderedMap2.this.makeObject().asList(); + return ListOrderedMap2Test.this.makeObject().asList(); } @Override public List makeFullCollection() { - return TestListOrderedMap2.this.makeFullMap().asList(); + return ListOrderedMap2Test.this.makeFullMap().asList(); } @Override public K[] getFullElements() { - return TestListOrderedMap2.this.getSampleKeys(); + return ListOrderedMap2Test.this.getSampleKeys(); } @Override public boolean isAddSupported() { @@ -195,7 +195,7 @@ public class TestListOrderedMap2 extends AbstractTestOrderedMap { } @Override public boolean isNullSupported() { - return TestListOrderedMap2.this.isAllowNullKey(); + return ListOrderedMap2Test.this.isAllowNullKey(); } @Override public boolean isTestSerialization() { diff --git a/src/test/java/org/apache/commons/collections/map/TestListOrderedMap.java b/src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/TestListOrderedMap.java rename to src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java index 97fa53c48..77a3802f3 100644 --- a/src/test/java/org/apache/commons/collections/map/TestListOrderedMap.java +++ b/src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java @@ -30,7 +30,7 @@ import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections.list.AbstractListTest; /** - * Extension of {@link AbstractTestOrderedMap} for exercising the {@link ListOrderedMap} + * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap} * implementation. * * @since Commons Collections 3.0 @@ -39,14 +39,14 @@ import org.apache.commons.collections.list.AbstractListTest; * @author Stephen Colebourne * @author Matt Benson */ -public class TestListOrderedMap extends AbstractTestOrderedMap { +public class ListOrderedMapTest extends AbstractOrderedMapTest { - public TestListOrderedMap(String testName) { + public ListOrderedMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestListOrderedMap.class); + return BulkTest.makeSuite(ListOrderedMapTest.class); } @Override @@ -405,16 +405,16 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { @Override public List makeObject() { - return TestListOrderedMap.this.makeObject().keyList(); + return ListOrderedMapTest.this.makeObject().keyList(); } @Override public List makeFullCollection() { - return TestListOrderedMap.this.makeFullMap().keyList(); + return ListOrderedMapTest.this.makeFullMap().keyList(); } @Override public K[] getFullElements() { - return TestListOrderedMap.this.getSampleKeys(); + return ListOrderedMapTest.this.getSampleKeys(); } @Override public boolean isAddSupported() { @@ -430,7 +430,7 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { } @Override public boolean isNullSupported() { - return TestListOrderedMap.this.isAllowNullKey(); + return ListOrderedMapTest.this.isAllowNullKey(); } @Override public boolean isTestSerialization() { @@ -446,16 +446,16 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { @Override public List makeObject() { - return TestListOrderedMap.this.makeObject().valueList(); + return ListOrderedMapTest.this.makeObject().valueList(); } @Override public List makeFullCollection() { - return TestListOrderedMap.this.makeFullMap().valueList(); + return ListOrderedMapTest.this.makeFullMap().valueList(); } @Override public V[] getFullElements() { - return TestListOrderedMap.this.getSampleValues(); + return ListOrderedMapTest.this.getSampleValues(); } @Override public boolean isAddSupported() { @@ -471,7 +471,7 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { } @Override public boolean isNullSupported() { - return TestListOrderedMap.this.isAllowNullKey(); + return ListOrderedMapTest.this.isAllowNullKey(); } @Override public boolean isTestSerialization() { diff --git a/src/test/java/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/map/TestMultiKeyMap.java rename to src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java index 66e7477fa..1bbe8a16b 100644 --- a/src/test/java/org/apache/commons/collections/map/TestMultiKeyMap.java +++ b/src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java @@ -30,7 +30,7 @@ import org.apache.commons.collections.keyvalue.MultiKey; * * @author Stephen Colebourne */ -public class TestMultiKeyMap extends AbstractTestIterableMap, V> { +public class MultiKeyMapTest extends AbstractIterableMapTest, V> { static final Integer I1 = new Integer(1); static final Integer I2 = new Integer(2); @@ -41,12 +41,12 @@ public class TestMultiKeyMap extends AbstractTestIterableMap extends AbstractObjectTest { +public class MultiValueMapTest extends AbstractObjectTest { - public TestMultiValueMap(String testName) { + public MultiValueMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestPassiveExpiringMap.java b/src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/map/TestPassiveExpiringMap.java rename to src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java index 2817ca542..e19ddfd80 100644 --- a/src/test/java/org/apache/commons/collections/map/TestPassiveExpiringMap.java +++ b/src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java @@ -9,8 +9,8 @@ import junit.framework.Test; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.map.PassiveExpiringMap.ExpirationPolicy; -public class TestPassiveExpiringMap - extends AbstractTestMap { +public class PassiveExpiringMapTest + extends AbstractMapTest { private static class TestExpirationPolicy implements ExpirationPolicy { @@ -32,10 +32,10 @@ public class TestPassiveExpiringMap } public static Test suite() { - return BulkTest.makeSuite(TestPassiveExpiringMap.class); + return BulkTest.makeSuite(PassiveExpiringMapTest.class); } - public TestPassiveExpiringMap(String testName) { + public PassiveExpiringMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestPredicatedMap.java b/src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/TestPredicatedMap.java rename to src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java index e331410c8..2ab28e7ce 100644 --- a/src/test/java/org/apache/commons/collections/map/TestPredicatedMap.java +++ b/src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java @@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate; import org.apache.commons.collections.functors.TruePredicate; /** - * Extension of {@link AbstractTestMap} for exercising the + * Extension of {@link AbstractMapTest} for exercising the * {@link PredicatedMap} implementation. * * @since Commons Collections 3.0 @@ -33,7 +33,7 @@ import org.apache.commons.collections.functors.TruePredicate; * * @author Phil Steitz */ -public class TestPredicatedMap extends AbstractTestIterableMap { +public class PredicatedMapTest extends AbstractIterableMapTest { protected static final Predicate truePredicate = TruePredicate.truePredicate(); @@ -43,7 +43,7 @@ public class TestPredicatedMap extends AbstractTestIterableMap { } }; - public TestPredicatedMap(String testName) { + public PredicatedMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestPredicatedSortedMap.java b/src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/map/TestPredicatedSortedMap.java rename to src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java index 9d2ae96a2..01b17349d 100644 --- a/src/test/java/org/apache/commons/collections/map/TestPredicatedSortedMap.java +++ b/src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java @@ -27,7 +27,7 @@ import org.apache.commons.collections.Predicate; import org.apache.commons.collections.functors.TruePredicate; /** - * Extension of {@link TestPredicatedMap} for exercising the + * Extension of {@link PredicatedMapTest} for exercising the * {@link PredicatedSortedMap} implementation. * * @since Commons Collections 3.0 @@ -35,7 +35,7 @@ import org.apache.commons.collections.functors.TruePredicate; * * @author Phil Steitz */ -public class TestPredicatedSortedMap extends AbstractTestSortedMap { +public class PredicatedSortedMapTest extends AbstractSortedMapTest { protected static final Predicate truePredicate = TruePredicate.truePredicate(); @@ -45,7 +45,7 @@ public class TestPredicatedSortedMap extends AbstractTestSortedMap { } }; - public TestPredicatedSortedMap(String testName) { + public PredicatedSortedMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestReferenceIdentityMap.java b/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/map/TestReferenceIdentityMap.java rename to src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java index aff73768a..93828dca4 100644 --- a/src/test/java/org/apache/commons/collections/map/TestReferenceIdentityMap.java +++ b/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java @@ -35,19 +35,19 @@ import org.apache.commons.collections.map.AbstractReferenceMap.ReferenceStrength * @author Stephen Colebourne * @author Guilhem Lavaux */ -public class TestReferenceIdentityMap extends AbstractTestIterableMap { +public class ReferenceIdentityMapTest extends AbstractIterableMapTest { private static final Integer I1A = new Integer(1); private static final Integer I1B = new Integer(1); private static final Integer I2A = new Integer(2); private static final Integer I2B = new Integer(2); - public TestReferenceIdentityMap(String testName) { + public ReferenceIdentityMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestReferenceIdentityMap.class); + return BulkTest.makeSuite(ReferenceIdentityMapTest.class); } @Override diff --git a/src/test/java/org/apache/commons/collections/map/TestReferenceMap.java b/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/map/TestReferenceMap.java rename to src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java index beea126d9..0eb5feafb 100644 --- a/src/test/java/org/apache/commons/collections/map/TestReferenceMap.java +++ b/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java @@ -32,14 +32,14 @@ import org.apache.commons.collections.map.AbstractReferenceMap.ReferenceStrength * @author Paul Jack * @author Guilhem Lavaux */ -public class TestReferenceMap extends AbstractTestIterableMap { +public class ReferenceMapTest extends AbstractIterableMapTest { - public TestReferenceMap(String testName) { + public ReferenceMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestReferenceMap.class); + return BulkTest.makeSuite(ReferenceMapTest.class); } @Override diff --git a/src/test/java/org/apache/commons/collections/map/TestSingletonMap.java b/src/test/java/org/apache/commons/collections/map/SingletonMapTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/map/TestSingletonMap.java rename to src/test/java/org/apache/commons/collections/map/SingletonMapTest.java index 060f5a4dc..8312262c3 100644 --- a/src/test/java/org/apache/commons/collections/map/TestSingletonMap.java +++ b/src/test/java/org/apache/commons/collections/map/SingletonMapTest.java @@ -31,18 +31,18 @@ import org.apache.commons.collections.OrderedMap; * * @author Stephen Colebourne */ -public class TestSingletonMap extends AbstractTestOrderedMap { +public class SingletonMapTest extends AbstractOrderedMapTest { private static final Integer ONE = new Integer(1); private static final Integer TWO = new Integer(2); private static final String TEN = "10"; - public TestSingletonMap(String testName) { + public SingletonMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestSingletonMap.class); + return BulkTest.makeSuite(SingletonMapTest.class); } //----------------------------------------------------------------------- @@ -58,8 +58,8 @@ public class TestSingletonMap extends AbstractTestOrderedMap { // the ridiculous map above still doesn't pass these tests // but its not relevant, so we ignore them return new String[] { - "TestSingletonMap.bulkTestMapIterator.testEmptyMapIterator", - "TestSingletonMap.bulkTestOrderedMapIterator.testEmptyMapIterator", + "SingletonMapTest.bulkTestMapIterator.testEmptyMapIterator", + "SingletonMapTest.bulkTestOrderedMapIterator.testEmptyMapIterator", }; } diff --git a/src/test/java/org/apache/commons/collections/map/TestStaticBucketMap.java b/src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/map/TestStaticBucketMap.java rename to src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java index 166b48450..deccde92f 100644 --- a/src/test/java/org/apache/commons/collections/map/TestStaticBucketMap.java +++ b/src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java @@ -28,14 +28,14 @@ import org.apache.commons.collections.BulkTest; * * @author Michael A. Smith */ -public class TestStaticBucketMap extends AbstractTestIterableMap { +public class StaticBucketMapTest extends AbstractIterableMapTest { - public TestStaticBucketMap(String name) { + public StaticBucketMapTest(String name) { super(name); } public static Test suite() { - return BulkTest.makeSuite(TestStaticBucketMap.class); + return BulkTest.makeSuite(StaticBucketMapTest.class); } @Override @@ -53,7 +53,7 @@ public class TestStaticBucketMap extends AbstractTestIterableMap { @Override public String[] ignoredTests() { - String pre = "TestStaticBucketMap.bulkTestMap"; + String pre = "StaticBucketMapTest.bulkTestMap"; String post = ".testCollectionIteratorFailFast"; return new String[] { pre + "EntrySet" + post, diff --git a/src/test/java/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/java/org/apache/commons/collections/map/TransformedMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/TestTransformedMap.java rename to src/test/java/org/apache/commons/collections/map/TransformedMapTest.java index ad9fab094..8f58371db 100644 --- a/src/test/java/org/apache/commons/collections/map/TestTransformedMap.java +++ b/src/test/java/org/apache/commons/collections/map/TransformedMapTest.java @@ -26,7 +26,7 @@ import org.apache.commons.collections.TransformerUtils; import org.apache.commons.collections.collection.TransformedCollectionTest; /** - * Extension of {@link AbstractTestMap} for exercising the {@link TransformedMap} + * Extension of {@link AbstractMapTest} for exercising the {@link TransformedMap} * implementation. * * @since Commons Collections 3.0 @@ -34,9 +34,9 @@ import org.apache.commons.collections.collection.TransformedCollectionTest; * * @author Stephen Colebourne */ -public class TestTransformedMap extends AbstractTestIterableMap { +public class TransformedMapTest extends AbstractIterableMapTest { - public TestTransformedMap(String testName) { + public TransformedMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestTransformedSortedMap.java b/src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/TestTransformedSortedMap.java rename to src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java index 2a5ef9fce..dafdb3ae2 100644 --- a/src/test/java/org/apache/commons/collections/map/TestTransformedSortedMap.java +++ b/src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java @@ -29,7 +29,7 @@ import org.apache.commons.collections.TransformerUtils; import org.apache.commons.collections.collection.TransformedCollectionTest; /** - * Extension of {@link AbstractTestSortedMap} for exercising the {@link TransformedSortedMap} + * Extension of {@link AbstractSortedMapTest} for exercising the {@link TransformedSortedMap} * implementation. * * @since Commons Collections 3.0 @@ -37,14 +37,14 @@ import org.apache.commons.collections.collection.TransformedCollectionTest; * * @author Stephen Colebourne */ -public class TestTransformedSortedMap extends AbstractTestSortedMap { +public class TransformedSortedMapTest extends AbstractSortedMapTest { - public TestTransformedSortedMap(String testName) { + public TransformedSortedMapTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestTransformedSortedMap.class); + return BulkTest.makeSuite(TransformedSortedMapTest.class); } //----------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections/map/TestUnmodifiableMap.java b/src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/map/TestUnmodifiableMap.java rename to src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java index 190975ae6..8c258e26a 100644 --- a/src/test/java/org/apache/commons/collections/map/TestUnmodifiableMap.java +++ b/src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java @@ -23,7 +23,7 @@ import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.Unmodifiable; /** - * Extension of {@link AbstractTestMap} for exercising the + * Extension of {@link AbstractMapTest} for exercising the * {@link UnmodifiableMap} implementation. * * @since Commons Collections 3.0 @@ -31,9 +31,9 @@ import org.apache.commons.collections.Unmodifiable; * * @author Phil Steitz */ -public class TestUnmodifiableMap extends AbstractTestIterableMap { +public class UnmodifiableMapTest extends AbstractIterableMapTest { - public TestUnmodifiableMap(String testName) { + public UnmodifiableMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java b/src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java rename to src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java index 913fec2e2..a387d19b9 100644 --- a/src/test/java/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java +++ b/src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java @@ -22,7 +22,7 @@ import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.Unmodifiable; /** - * Extension of {@link AbstractTestOrderedMap} for exercising the + * Extension of {@link AbstractOrderedMapTest} for exercising the * {@link UnmodifiableOrderedMap} implementation. * * @since Commons Collections 3.0 @@ -30,9 +30,9 @@ import org.apache.commons.collections.Unmodifiable; * * @author Stephen Colebourne */ -public class TestUnmodifiableOrderedMap extends AbstractTestOrderedMap { +public class UnmodifiableOrderedMapTest extends AbstractOrderedMapTest { - public TestUnmodifiableOrderedMap(String testName) { + public UnmodifiableOrderedMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java b/src/test/java/org/apache/commons/collections/map/UnmodifiableSortedMapTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java rename to src/test/java/org/apache/commons/collections/map/UnmodifiableSortedMapTest.java index e5f1850e0..878862780 100644 --- a/src/test/java/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java +++ b/src/test/java/org/apache/commons/collections/map/UnmodifiableSortedMapTest.java @@ -22,7 +22,7 @@ import java.util.TreeMap; import org.apache.commons.collections.Unmodifiable; /** - * Extension of {@link AbstractTestSortedMap} for exercising the + * Extension of {@link AbstractSortedMapTest} for exercising the * {@link UnmodifiableSortedMap} implementation. * * @since Commons Collections 3.0 @@ -30,9 +30,9 @@ import org.apache.commons.collections.Unmodifiable; * * @author Stephen Colebourne */ -public class TestUnmodifiableSortedMap extends AbstractTestSortedMap { +public class UnmodifiableSortedMapTest extends AbstractSortedMapTest { - public TestUnmodifiableSortedMap(String testName) { + public UnmodifiableSortedMapTest(String testName) { super(testName); }