Author: tn Date: Fri Aug 24 19:36:22 2012 New Revision: 1377066 URL: http://svn.apache.org/viewvc?rev=1377066&view=rev Log: Renamed unit tests, removed unused LocalTestNode class.
Added: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestArrayList.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractObjectTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestObject.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ArrayStackTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestArrayStack.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BagUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBagUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BufferUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBufferUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestClosureUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestCollectionUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestEnumerationUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestExtendedProperties.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestFactoryUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestIteratorUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestListUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestMapUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSetUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java - copied, changed from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestTransformerUtils.java Removed: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestArrayList.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestObject.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/LocalTestNode.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestArrayStack.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBagUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBufferUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestClosureUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestCollectionUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestEnumerationUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestExtendedProperties.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestFactoryUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestIteratorUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestListUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestMapUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSetUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestTransformerUtils.java Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestArrayList.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestArrayList.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestArrayList.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java Fri Aug 24 19:36:22 2012 @@ -27,9 +27,9 @@ import org.apache.commons.collections.li * * @author Jason van Zyl */ -public abstract class AbstractTestArrayList<E> extends AbstractListTest<E> { +public abstract class AbstractArrayListTest<E> extends AbstractListTest<E> { - public AbstractTestArrayList(String testName) { + public AbstractArrayListTest(String testName) { super(testName); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java Fri Aug 24 19:36:22 2012 @@ -38,9 +38,9 @@ import org.apache.commons.collections.li * * @author Rich Dougherty */ -public abstract class AbstractTestLinkedList<T> extends AbstractListTest<T> { +public abstract class AbstractLinkedListTest<T> extends AbstractListTest<T> { - public AbstractTestLinkedList(String testName) { + public AbstractLinkedListTest(String testName) { super(testName); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractObjectTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestObject.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractObjectTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractObjectTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestObject.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestObject.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractObjectTest.java Fri Aug 24 19:36:22 2012 @@ -44,7 +44,7 @@ import java.io.Serializable; * @author Stephen Colebourne * @author Anonymous */ -public abstract class AbstractTestObject extends BulkTest { +public abstract class AbstractObjectTest extends BulkTest { /** Current major release for Collections */ public static final int COLLECTIONS_MAJOR_VERSION = 3; @@ -54,7 +54,7 @@ public abstract class AbstractTestObject * * @param testName the test class name */ - public AbstractTestObject(String testName) { + public AbstractObjectTest(String testName) { super(testName); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java Fri Aug 24 19:36:22 2012 @@ -27,9 +27,9 @@ import org.apache.commons.collections.ma * * @author Jason van Zyl */ -public abstract class AbstractTestTreeMap<K, V> extends AbstractTestMap<K, V> { +public abstract class AbstractTreeMapTest<K, V> extends AbstractTestMap<K, V> { - public AbstractTestTreeMap(String testName) { + public AbstractTreeMapTest(String testName) { super(testName); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java Fri Aug 24 19:36:22 2012 @@ -27,9 +27,9 @@ import java.util.List; * * @author Stephen Colebourne */ -public abstract class AbstractTestTypedCollection<T> extends BulkTest { +public abstract class AbstractTypedCollectionTest<T> extends BulkTest { - public AbstractTestTypedCollection(String name) { + public AbstractTypedCollectionTest(String name) { super(name); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ArrayStackTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestArrayStack.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ArrayStackTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ArrayStackTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestArrayStack.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestArrayStack.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ArrayStackTest.java Fri Aug 24 19:36:22 2012 @@ -27,14 +27,14 @@ import junit.framework.Test; * * @author Craig McClanahan */ -public class TestArrayStack<E> extends AbstractTestArrayList<E> { +public class ArrayStackTest<E> extends AbstractArrayListTest<E> { - public TestArrayStack(String testName) { + public ArrayStackTest(String testName) { super(testName); } public static Test suite() { - return BulkTest.makeSuite(TestArrayStack.class); + return BulkTest.makeSuite(ArrayStackTest.class); } @Override Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BagUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBagUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BagUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BagUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBagUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBagUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BagUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -37,15 +37,15 @@ import org.apache.commons.collections.fu * * @author Phil Steitz */ -public class TestBagUtils extends BulkTest { +public class BagUtilsTest extends BulkTest { - public TestBagUtils(String name) { + public BagUtilsTest(String name) { super(name); } public static Test suite() { - return BulkTest.makeSuite(TestBagUtils.class); + return BulkTest.makeSuite(BagUtilsTest.class); } //---------------------------------------------------------------------- Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BufferUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBufferUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BufferUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BufferUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBufferUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestBufferUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/BufferUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -27,15 +27,15 @@ import org.apache.commons.collections.bu * * @author Unknown */ -public class TestBufferUtils extends BulkTest { +public class BufferUtilsTest extends BulkTest { - public TestBufferUtils(String name) { + public BufferUtilsTest(String name) { super(name); } public static Test suite() { - return BulkTest.makeSuite(TestBufferUtils.class); + return BulkTest.makeSuite(BufferUtilsTest.class); } public void testNothing() { Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestClosureUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestClosureUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestClosureUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -38,14 +38,14 @@ import org.apache.commons.collections.fu * * @author Stephen Colebourne */ -public class TestClosureUtils extends TestCase { +public class ClosureUtilsTest extends TestCase { private static final Object cString = "Hello"; /** * Construct */ - public TestClosureUtils(String name) { + public ClosureUtilsTest(String name) { super(name); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestCollectionUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestCollectionUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestCollectionUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -50,7 +50,7 @@ import org.junit.Test; * @version $Revision$ */ @SuppressWarnings("boxing") -public class TestCollectionUtils extends MockTestCase { +public class CollectionUtilsTest extends MockTestCase { /** * Collection of {@link Integer}s Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestEnumerationUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestEnumerationUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestEnumerationUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -30,9 +30,9 @@ import junit.framework.Test; * @author <a href="mailto:ggreg...@seagullsw.com">Gary Gregory</a> * @version $Id$ */ -public class TestEnumerationUtils extends BulkTest { +public class EnumerationUtilsTest extends BulkTest { - public TestEnumerationUtils(String name) { + public EnumerationUtilsTest(String name) { super(name); } @@ -86,7 +86,7 @@ public class TestEnumerationUtils extend } public static Test suite() { - return BulkTest.makeSuite(TestEnumerationUtils.class); + return BulkTest.makeSuite(EnumerationUtilsTest.class); } } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestExtendedProperties.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestExtendedProperties.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestExtendedProperties.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java Fri Aug 24 19:36:22 2012 @@ -35,11 +35,11 @@ import junit.framework.TestCase; * @author Shinobu Kawai * @author <a href="mailto:h...@intermeta.de">Henning P. Schmiedehausen</a> */ -public class TestExtendedProperties extends TestCase { +public class ExtendedPropertiesTest extends TestCase { protected ExtendedProperties eprop = new ExtendedProperties(); - public TestExtendedProperties(String testName) { + public ExtendedPropertiesTest(String testName) { super(testName); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestFactoryUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestFactoryUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestFactoryUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -38,12 +38,12 @@ import org.junit.Test; * * @author Stephen Colebourne */ -public class TestFactoryUtils extends junit.framework.TestCase { +public class FactoryUtilsTest extends junit.framework.TestCase { /** * Construct */ - public TestFactoryUtils(String name) { + public FactoryUtilsTest(String name) { super(name); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestIteratorUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestIteratorUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestIteratorUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -38,14 +38,14 @@ import org.apache.commons.collections.it * * @author Unknown */ -public class TestIteratorUtils extends BulkTest { +public class IteratorUtilsTest extends BulkTest { - public TestIteratorUtils(String name) { + public IteratorUtilsTest(String name) { super(name); } public static Test suite() { - return BulkTest.makeSuite(TestIteratorUtils.class); + return BulkTest.makeSuite(IteratorUtilsTest.class); } public void testAsIterable() { Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestListUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestListUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestListUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -33,7 +33,7 @@ import org.apache.commons.collections.li * * @version $Id$ */ -public class TestListUtils extends BulkTest { +public class ListUtilsTest extends BulkTest { private static final String a = "a"; private static final String b = "b"; @@ -45,12 +45,12 @@ public class TestListUtils extends BulkT private String[] fullArray; private List<String> fullList; - public TestListUtils(String name) { + public ListUtilsTest(String name) { super(name); } public static Test suite() { - return BulkTest.makeSuite(TestListUtils.class); + return BulkTest.makeSuite(ListUtilsTest.class); } @Override Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestMapUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestMapUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestMapUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -50,14 +50,14 @@ import org.apache.commons.collections.co * @author Neil O'Toole */ @SuppressWarnings("boxing") -public class TestMapUtils extends BulkTest { +public class MapUtilsTest extends BulkTest { - public TestMapUtils(String name) { + public MapUtilsTest(String name) { super(name); } public static Test suite() { - return BulkTest.makeSuite(TestMapUtils.class); + return BulkTest.makeSuite(MapUtilsTest.class); } public Predicate<Object> getPredicate() { Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -50,7 +50,7 @@ import org.junit.Test; * @author Matt Benson */ @SuppressWarnings("boxing") -public class TestPredicateUtils extends AbstractPredicateTest { +public class PredicateUtilsTest extends AbstractPredicateTest { /** * Set up instance variables required by this test case. */ Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSetUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSetUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSetUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -34,14 +34,14 @@ import org.apache.commons.collections.se * @author Neil O'Toole * @author Matthew Hawthorne */ -public class TestSetUtils extends BulkTest { +public class SetUtilsTest extends BulkTest { - public TestSetUtils(String name) { + public SetUtilsTest(String name) { super(name); } public static Test suite() { - return BulkTest.makeSuite(TestSetUtils.class); + return BulkTest.makeSuite(SetUtilsTest.class); } public void testNothing() { Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -30,7 +30,7 @@ import org.apache.commons.collections.sp * @version $Id$ */ @SuppressWarnings("boxing") -public class TestSplitMapUtils extends BulkTest { +public class SplitMapUtilsTest extends BulkTest { private Map<String, Integer> backingMap; private TransformedMap<String, String, String, Integer> transformedMap; @@ -40,7 +40,7 @@ public class TestSplitMapUtils extends B } }; - public TestSplitMapUtils(String testName) { + public SplitMapUtilsTest(String testName) { super(testName); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java (from r1374402, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestTransformerUtils.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestTransformerUtils.java&r1=1374402&r2=1377066&rev=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestTransformerUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java Fri Aug 24 19:36:22 2012 @@ -42,7 +42,7 @@ import org.apache.commons.collections.fu * @author Stephen Colebourne * @author James Carman */ -public class TestTransformerUtils extends junit.framework.TestCase { +public class TransformerUtilsTest extends junit.framework.TestCase { private static final Object cObject = new Object(); private static final Object cString = "Hello"; @@ -51,7 +51,7 @@ public class TestTransformerUtils extend /** * Construct */ - public TestTransformerUtils(String name) { + public TransformerUtilsTest(String name) { super(name); } Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java Fri Aug 24 19:36:22 2012 @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; import org.apache.commons.collections.Bag; /** @@ -39,7 +39,7 @@ import org.apache.commons.collections.Ba * * @version $Id$ */ -public abstract class AbstractBagTest<T> extends AbstractTestObject { +public abstract class AbstractBagTest<T> extends AbstractObjectTest { // TODO: this class should really extend from TestCollection, but the bag // implementations currently do not conform to the Collection interface. Once // those are fixed or at least a strategy is made for resolving the issue, this Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java Fri Aug 24 19:36:22 2012 @@ -16,7 +16,7 @@ */ package org.apache.commons.collections.buffer; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; import org.apache.commons.collections.Buffer; import org.apache.commons.collections.BufferUnderflowException; @@ -27,13 +27,13 @@ import java.util.LinkedList; import java.util.Set; /** - * Extension of {@link AbstractTestObject} for exercising the + * Extension of {@link AbstractObjectTest} for exercising the * {@link BlockingBuffer} implementation. * * @since 3.0 * @version $Id$ */ -public class BlockingBufferTest<E> extends AbstractTestObject { +public class BlockingBufferTest<E> extends AbstractObjectTest { public BlockingBufferTest(String testName) { super(testName); Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java Fri Aug 24 19:36:22 2012 @@ -16,7 +16,7 @@ */ package org.apache.commons.collections.buffer; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; import org.apache.commons.collections.BoundedCollection; import org.apache.commons.collections.Buffer; import org.apache.commons.collections.BufferOverflowException; @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.Collections; import java.util.Arrays; -public class BoundedBufferTest<E> extends AbstractTestObject { +public class BoundedBufferTest<E> extends AbstractObjectTest { public BoundedBufferTest(String testName) { super(testName); Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java Fri Aug 24 19:36:22 2012 @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; /** * Abstract test class for {@link java.util.Collection} methods and contracts. @@ -125,7 +125,7 @@ import org.apache.commons.collections.Ab * @author Neil O'Toole * @author Stephen Colebourne */ -public abstract class AbstractCollectionTest<E> extends AbstractTestObject { +public abstract class AbstractCollectionTest<E> extends AbstractObjectTest { // // NOTE: Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java Fri Aug 24 19:36:22 2012 @@ -24,7 +24,7 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; import org.junit.Test; /** @@ -33,7 +33,7 @@ import org.junit.Test; * Concrete subclasses declare the comparator to be tested. * They also declare certain aspects of the tests. */ -public abstract class AbstractComparatorTest<T> extends AbstractTestObject { +public abstract class AbstractComparatorTest<T> extends AbstractObjectTest { /** * JUnit constructor. Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java Fri Aug 24 19:36:22 2012 @@ -19,7 +19,7 @@ package org.apache.commons.collections.i import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; /** * Abstract class for testing the Iterator interface. @@ -35,7 +35,7 @@ import org.apache.commons.collections.Ab * @author Morgan Delagrange * @author Stephen Colebourne */ -public abstract class AbstractTestIterator<E> extends AbstractTestObject { +public abstract class AbstractTestIterator<E> extends AbstractObjectTest { /** * JUnit constructor. Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java Fri Aug 24 19:36:22 2012 @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.collection.AbstractCollectionTest; @@ -125,7 +125,7 @@ import org.apache.commons.collections.se * @author Stephen Colebourne * @version $Revision$ */ -public abstract class AbstractTestMap<K, V> extends AbstractTestObject { +public abstract class AbstractTestMap<K, V> extends AbstractObjectTest { /** * JDK1.2 has bugs in null handling of Maps, especially HashMap.Entry.toString Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java Fri Aug 24 19:36:22 2012 @@ -23,7 +23,7 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; import org.apache.commons.collections.IterableMap; /** @@ -33,7 +33,7 @@ import org.apache.commons.collections.It * * @author Stephen Colebourne */ -public class TestIdentityMap<K, V> extends AbstractTestObject { +public class TestIdentityMap<K, V> extends AbstractObjectTest { private static final Integer I1A = new Integer(1); private static final Integer I1B = new Integer(1); Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java?rev=1377066&r1=1377065&r2=1377066&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java Fri Aug 24 19:36:22 2012 @@ -28,7 +28,7 @@ import java.util.Map; import org.apache.commons.collections.IteratorUtils; import org.apache.commons.collections.MultiMap; -import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.AbstractObjectTest; /** * TestMultiValueMap. @@ -37,7 +37,7 @@ import org.apache.commons.collections.Ab * @author Stephen Colebourne * @since Commons Collections 3.2 */ -public class TestMultiValueMap<K, V> extends AbstractTestObject { +public class TestMultiValueMap<K, V> extends AbstractObjectTest { public TestMultiValueMap(String testName) { super(testName);