From 68768dbe425462f0214f33b0dc7768ee40a34983 Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 24 Aug 2012 19:36:22 +0000 Subject: [PATCH] Renamed unit tests, removed unused LocalTestNode class. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1377066 13f79535-47bb-0310-9956-ffa450edef68 --- ...ayList.java => AbstractArrayListTest.java} | 4 +- ...dList.java => AbstractLinkedListTest.java} | 4 +- ...estObject.java => AbstractObjectTest.java} | 4 +- ...tTreeMap.java => AbstractTreeMapTest.java} | 4 +- ....java => AbstractTypedCollectionTest.java} | 4 +- ...estArrayStack.java => ArrayStackTest.java} | 6 +- .../{TestBagUtils.java => BagUtilsTest.java} | 6 +- ...tBufferUtils.java => BufferUtilsTest.java} | 6 +- ...losureUtils.java => ClosureUtilsTest.java} | 4 +- ...ionUtils.java => CollectionUtilsTest.java} | 2 +- ...onUtils.java => EnumerationUtilsTest.java} | 6 +- ...rties.java => ExtendedPropertiesTest.java} | 4 +- ...actoryUtils.java => FactoryUtilsTest.java} | 4 +- ...ratorUtils.java => IteratorUtilsTest.java} | 6 +- ...{TestListUtils.java => ListUtilsTest.java} | 6 +- .../commons/collections/LocalTestNode.java | 125 ------------------ .../{TestMapUtils.java => MapUtilsTest.java} | 6 +- ...cateUtils.java => PredicateUtilsTest.java} | 2 +- .../{TestSetUtils.java => SetUtilsTest.java} | 6 +- ...itMapUtils.java => SplitMapUtilsTest.java} | 4 +- ...erUtils.java => TransformerUtilsTest.java} | 4 +- .../collections/bag/AbstractBagTest.java | 4 +- .../buffer/BlockingBufferTest.java | 6 +- .../collections/buffer/BoundedBufferTest.java | 4 +- .../collection/AbstractCollectionTest.java | 4 +- .../comparators/AbstractComparatorTest.java | 4 +- .../iterators/AbstractTestIterator.java | 4 +- .../collections/map/AbstractTestMap.java | 4 +- .../collections/map/TestIdentityMap.java | 4 +- .../collections/map/TestMultiValueMap.java | 4 +- 30 files changed, 65 insertions(+), 190 deletions(-) rename src/test/java/org/apache/commons/collections/{AbstractTestArrayList.java => AbstractArrayListTest.java} (94%) rename src/test/java/org/apache/commons/collections/{AbstractTestLinkedList.java => AbstractLinkedListTest.java} (98%) rename src/test/java/org/apache/commons/collections/{AbstractTestObject.java => AbstractObjectTest.java} (99%) rename src/test/java/org/apache/commons/collections/{AbstractTestTreeMap.java => AbstractTreeMapTest.java} (94%) rename src/test/java/org/apache/commons/collections/{AbstractTestTypedCollection.java => AbstractTypedCollectionTest.java} (95%) rename src/test/java/org/apache/commons/collections/{TestArrayStack.java => ArrayStackTest.java} (95%) rename src/test/java/org/apache/commons/collections/{TestBagUtils.java => BagUtilsTest.java} (98%) rename src/test/java/org/apache/commons/collections/{TestBufferUtils.java => BufferUtilsTest.java} (93%) rename src/test/java/org/apache/commons/collections/{TestClosureUtils.java => ClosureUtilsTest.java} (99%) rename src/test/java/org/apache/commons/collections/{TestCollectionUtils.java => CollectionUtilsTest.java} (99%) rename src/test/java/org/apache/commons/collections/{TestEnumerationUtils.java => EnumerationUtilsTest.java} (95%) rename src/test/java/org/apache/commons/collections/{TestExtendedProperties.java => ExtendedPropertiesTest.java} (99%) rename src/test/java/org/apache/commons/collections/{TestFactoryUtils.java => FactoryUtilsTest.java} (98%) rename src/test/java/org/apache/commons/collections/{TestIteratorUtils.java => IteratorUtilsTest.java} (99%) rename src/test/java/org/apache/commons/collections/{TestListUtils.java => ListUtilsTest.java} (98%) delete mode 100644 src/test/java/org/apache/commons/collections/LocalTestNode.java rename src/test/java/org/apache/commons/collections/{TestMapUtils.java => MapUtilsTest.java} (99%) rename src/test/java/org/apache/commons/collections/{TestPredicateUtils.java => PredicateUtilsTest.java} (99%) rename src/test/java/org/apache/commons/collections/{TestSetUtils.java => SetUtilsTest.java} (96%) rename src/test/java/org/apache/commons/collections/{TestSplitMapUtils.java => SplitMapUtilsTest.java} (98%) rename src/test/java/org/apache/commons/collections/{TestTransformerUtils.java => TransformerUtilsTest.java} (99%) diff --git a/src/test/java/org/apache/commons/collections/AbstractTestArrayList.java b/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/AbstractTestArrayList.java rename to src/test/java/org/apache/commons/collections/AbstractArrayListTest.java index af7ff0a89..6567e575a 100644 --- a/src/test/java/org/apache/commons/collections/AbstractTestArrayList.java +++ b/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java @@ -27,9 +27,9 @@ import org.apache.commons.collections.list.AbstractListTest; * * @author Jason van Zyl */ -public abstract class AbstractTestArrayList extends AbstractListTest { +public abstract class AbstractArrayListTest extends AbstractListTest { - public AbstractTestArrayList(String testName) { + public AbstractArrayListTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java b/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java rename to src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java index 878b8a385..e1c362dee 100644 --- a/src/test/java/org/apache/commons/collections/AbstractTestLinkedList.java +++ b/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java @@ -38,9 +38,9 @@ import org.apache.commons.collections.list.AbstractListTest; * * @author Rich Dougherty */ -public abstract class AbstractTestLinkedList extends AbstractListTest { +public abstract class AbstractLinkedListTest extends AbstractListTest { - public AbstractTestLinkedList(String testName) { + public AbstractLinkedListTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/AbstractTestObject.java b/src/test/java/org/apache/commons/collections/AbstractObjectTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/AbstractTestObject.java rename to src/test/java/org/apache/commons/collections/AbstractObjectTest.java index 7e4910a9f..f4c82870b 100644 --- a/src/test/java/org/apache/commons/collections/AbstractTestObject.java +++ b/src/test/java/org/apache/commons/collections/AbstractObjectTest.java @@ -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 extends BulkTest { * * @param testName the test class name */ - public AbstractTestObject(String testName) { + public AbstractObjectTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java b/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java rename to src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java index b7a9be4c5..f58856311 100644 --- a/src/test/java/org/apache/commons/collections/AbstractTestTreeMap.java +++ b/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java @@ -27,9 +27,9 @@ import org.apache.commons.collections.map.AbstractTestMap; * * @author Jason van Zyl */ -public abstract class AbstractTestTreeMap extends AbstractTestMap { +public abstract class AbstractTreeMapTest extends AbstractTestMap { - public AbstractTestTreeMap(String testName) { + public AbstractTreeMapTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java b/src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java rename to src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java index 9fe684aa0..e6e7b6ded 100644 --- a/src/test/java/org/apache/commons/collections/AbstractTestTypedCollection.java +++ b/src/test/java/org/apache/commons/collections/AbstractTypedCollectionTest.java @@ -27,9 +27,9 @@ import java.util.List; * * @author Stephen Colebourne */ -public abstract class AbstractTestTypedCollection extends BulkTest { +public abstract class AbstractTypedCollectionTest extends BulkTest { - public AbstractTestTypedCollection(String name) { + public AbstractTypedCollectionTest(String name) { super(name); } diff --git a/src/test/java/org/apache/commons/collections/TestArrayStack.java b/src/test/java/org/apache/commons/collections/ArrayStackTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/TestArrayStack.java rename to src/test/java/org/apache/commons/collections/ArrayStackTest.java index c2d2399e4..cb632b00f 100644 --- a/src/test/java/org/apache/commons/collections/TestArrayStack.java +++ b/src/test/java/org/apache/commons/collections/ArrayStackTest.java @@ -27,14 +27,14 @@ import junit.framework.Test; * * @author Craig McClanahan */ -public class TestArrayStack extends AbstractTestArrayList { +public class ArrayStackTest extends AbstractArrayListTest { - 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 diff --git a/src/test/java/org/apache/commons/collections/TestBagUtils.java b/src/test/java/org/apache/commons/collections/BagUtilsTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/TestBagUtils.java rename to src/test/java/org/apache/commons/collections/BagUtilsTest.java index febd2b787..a7b30cbd1 100644 --- a/src/test/java/org/apache/commons/collections/TestBagUtils.java +++ b/src/test/java/org/apache/commons/collections/BagUtilsTest.java @@ -37,15 +37,15 @@ import org.apache.commons.collections.functors.TruePredicate; * * @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); } //---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections/TestBufferUtils.java b/src/test/java/org/apache/commons/collections/BufferUtilsTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/TestBufferUtils.java rename to src/test/java/org/apache/commons/collections/BufferUtilsTest.java index 7373c36f7..5711dfaac 100644 --- a/src/test/java/org/apache/commons/collections/TestBufferUtils.java +++ b/src/test/java/org/apache/commons/collections/BufferUtilsTest.java @@ -27,15 +27,15 @@ import org.apache.commons.collections.buffer.PredicatedBuffer; * * @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() { diff --git a/src/test/java/org/apache/commons/collections/TestClosureUtils.java b/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/TestClosureUtils.java rename to src/test/java/org/apache/commons/collections/ClosureUtilsTest.java index 8cba8d6d6..20d28ce1f 100644 --- a/src/test/java/org/apache/commons/collections/TestClosureUtils.java +++ b/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java @@ -38,14 +38,14 @@ import org.apache.commons.collections.functors.TruePredicate; * * @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); } diff --git a/src/test/java/org/apache/commons/collections/TestCollectionUtils.java b/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/TestCollectionUtils.java rename to src/test/java/org/apache/commons/collections/CollectionUtilsTest.java index 4985e7a69..c2c5f1530 100644 --- a/src/test/java/org/apache/commons/collections/TestCollectionUtils.java +++ b/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java @@ -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 diff --git a/src/test/java/org/apache/commons/collections/TestEnumerationUtils.java b/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/TestEnumerationUtils.java rename to src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java index 4f9e02f69..b468d59a4 100644 --- a/src/test/java/org/apache/commons/collections/TestEnumerationUtils.java +++ b/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java @@ -30,9 +30,9 @@ import junit.framework.Test; * @author Gary Gregory * @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 extends BulkTest { } public static Test suite() { - return BulkTest.makeSuite(TestEnumerationUtils.class); + return BulkTest.makeSuite(EnumerationUtilsTest.class); } } diff --git a/src/test/java/org/apache/commons/collections/TestExtendedProperties.java b/src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/TestExtendedProperties.java rename to src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java index 360f8b083..71d864f10 100644 --- a/src/test/java/org/apache/commons/collections/TestExtendedProperties.java +++ b/src/test/java/org/apache/commons/collections/ExtendedPropertiesTest.java @@ -35,11 +35,11 @@ import junit.framework.TestCase; * @author Shinobu Kawai * @author Henning P. Schmiedehausen */ -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); } diff --git a/src/test/java/org/apache/commons/collections/TestFactoryUtils.java b/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/TestFactoryUtils.java rename to src/test/java/org/apache/commons/collections/FactoryUtilsTest.java index db581a2ab..9c5aba0db 100644 --- a/src/test/java/org/apache/commons/collections/TestFactoryUtils.java +++ b/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java @@ -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); } diff --git a/src/test/java/org/apache/commons/collections/TestIteratorUtils.java b/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/TestIteratorUtils.java rename to src/test/java/org/apache/commons/collections/IteratorUtilsTest.java index a5e44e8a2..057730b0b 100644 --- a/src/test/java/org/apache/commons/collections/TestIteratorUtils.java +++ b/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java @@ -38,14 +38,14 @@ import org.apache.commons.collections.iterators.EmptyOrderedMapIterator; * * @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() { diff --git a/src/test/java/org/apache/commons/collections/TestListUtils.java b/src/test/java/org/apache/commons/collections/ListUtilsTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/TestListUtils.java rename to src/test/java/org/apache/commons/collections/ListUtilsTest.java index 402a13605..ff364782e 100644 --- a/src/test/java/org/apache/commons/collections/TestListUtils.java +++ b/src/test/java/org/apache/commons/collections/ListUtilsTest.java @@ -33,7 +33,7 @@ import org.apache.commons.collections.list.PredicatedList; * * @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 BulkTest { private String[] fullArray; private List 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 diff --git a/src/test/java/org/apache/commons/collections/LocalTestNode.java b/src/test/java/org/apache/commons/collections/LocalTestNode.java deleted file mode 100644 index f6d197bf3..000000000 --- a/src/test/java/org/apache/commons/collections/LocalTestNode.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.collections; - -/** - * Class LocalTestNode, a helper class for TestDoubleOrderedMap - * - * @version $Revision$ - * - * @author Marc Johnson (marcj at users dot sourceforge dot net) - */ -class LocalTestNode, V extends Comparable> implements Comparable> { - - private K key; - private V value; - - @SuppressWarnings("boxing") - static LocalTestNode createLocalTestNode(final int key) { - return new LocalTestNode(key, String.valueOf(key)); - } - - /** - * construct a LocalTestNode - * - * @param key value used to create the key and value - */ - private LocalTestNode(K key, V value) { - this.key = key; - this.value = value; - } - - /** - * @param key the unique key associated with the current node. - */ - void setKey(K key) { - this.key = key; - } - - /** - * @return the unique key associated with the current node - */ - K getKey() { - return key; - } - - /** - * @param value the unique value associated with the current node. - */ - void setValue(V value) { - this.value = value; - } - - /** - * @return the unique value associated with the current node - */ - V getValue() { - return value; - } - - /** - * Method compareTo - * - * @param other - * - * @return a negative integer, zero, or a positive integer - * as this object is less than, equal to, or greater than the specified object. - */ - public int compareTo(LocalTestNode other) { - - int rval = getKey().compareTo(other.getKey()); - - if (rval == 0) { - rval = getValue().compareTo(other.getValue()); - } - - return rval; - } - - /** - * Method equals - * - * @param o - * - * @return true if equal - */ - @Override - public boolean equals(Object o) { - - if (o == null) { - return false; - } - - if (!(o.getClass().equals(this.getClass()))) { - return false; - } - - @SuppressWarnings("unchecked") // o has the correct class - see above - LocalTestNode node = (LocalTestNode) o; - - return (getKey().equals(node.getKey()) - && getValue().equals(node.getValue())); - } - - /** - * @return hash code - */ - @Override - public int hashCode() { - return getKey().hashCode() ^ getValue().hashCode(); - } -} diff --git a/src/test/java/org/apache/commons/collections/TestMapUtils.java b/src/test/java/org/apache/commons/collections/MapUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/TestMapUtils.java rename to src/test/java/org/apache/commons/collections/MapUtilsTest.java index e36dccca2..4fef61709 100644 --- a/src/test/java/org/apache/commons/collections/TestMapUtils.java +++ b/src/test/java/org/apache/commons/collections/MapUtilsTest.java @@ -50,14 +50,14 @@ import org.apache.commons.collections.collection.TransformedCollectionTest; * @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 getPredicate() { diff --git a/src/test/java/org/apache/commons/collections/TestPredicateUtils.java b/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/TestPredicateUtils.java rename to src/test/java/org/apache/commons/collections/PredicateUtilsTest.java index 35b422307..1e40f324c 100644 --- a/src/test/java/org/apache/commons/collections/TestPredicateUtils.java +++ b/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java @@ -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. */ diff --git a/src/test/java/org/apache/commons/collections/TestSetUtils.java b/src/test/java/org/apache/commons/collections/SetUtilsTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/TestSetUtils.java rename to src/test/java/org/apache/commons/collections/SetUtilsTest.java index e95e32308..bd5933028 100644 --- a/src/test/java/org/apache/commons/collections/TestSetUtils.java +++ b/src/test/java/org/apache/commons/collections/SetUtilsTest.java @@ -34,14 +34,14 @@ import org.apache.commons.collections.set.PredicatedSet; * @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() { diff --git a/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java b/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/TestSplitMapUtils.java rename to src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java index c48e8b2de..f48ac0a5d 100644 --- a/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java +++ b/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java @@ -30,7 +30,7 @@ import org.apache.commons.collections.splitmap.TransformedMap; * @version $Id$ */ @SuppressWarnings("boxing") -public class TestSplitMapUtils extends BulkTest { +public class SplitMapUtilsTest extends BulkTest { private Map backingMap; private TransformedMap transformedMap; @@ -40,7 +40,7 @@ public class TestSplitMapUtils extends BulkTest { } }; - public TestSplitMapUtils(String testName) { + public SplitMapUtilsTest(String testName) { super(testName); } diff --git a/src/test/java/org/apache/commons/collections/TestTransformerUtils.java b/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/TestTransformerUtils.java rename to src/test/java/org/apache/commons/collections/TransformerUtilsTest.java index d6e095711..aee6c503d 100644 --- a/src/test/java/org/apache/commons/collections/TestTransformerUtils.java +++ b/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java @@ -42,7 +42,7 @@ import org.apache.commons.collections.functors.TruePredicate; * @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 extends junit.framework.TestCase { /** * Construct */ - public TestTransformerUtils(String name) { + public TransformerUtilsTest(String name) { super(name); } diff --git a/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java b/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java index 0e05668dc..d52d127ca 100644 --- a/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java +++ b/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java @@ -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.Bag; * * @version $Id$ */ -public abstract class AbstractBagTest extends AbstractTestObject { +public abstract class AbstractBagTest 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 diff --git a/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java b/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java index 921f20f05..b6971e0e9 100644 --- a/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java +++ b/src/test/java/org/apache/commons/collections/buffer/BlockingBufferTest.java @@ -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 extends AbstractTestObject { +public class BlockingBufferTest extends AbstractObjectTest { public BlockingBufferTest(String testName) { super(testName); diff --git a/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java b/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java index e0e873e7d..a24b66c7c 100644 --- a/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java +++ b/src/test/java/org/apache/commons/collections/buffer/BoundedBufferTest.java @@ -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 extends AbstractTestObject { +public class BoundedBufferTest extends AbstractObjectTest { public BoundedBufferTest(String testName) { super(testName); 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 ecbc522d4..bcc4a1be1 100644 --- a/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java +++ b/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java @@ -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.AbstractTestObject; * @author Neil O'Toole * @author Stephen Colebourne */ -public abstract class AbstractCollectionTest extends AbstractTestObject { +public abstract class AbstractCollectionTest extends AbstractObjectTest { // // NOTE: diff --git a/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java b/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java index e3fcbfd88..d13e93427 100644 --- a/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java +++ b/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java @@ -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 extends AbstractTestObject { +public abstract class AbstractComparatorTest extends AbstractObjectTest { /** * JUnit constructor. diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java b/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java index 8303452af..987a4f43a 100644 --- a/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java +++ b/src/test/java/org/apache/commons/collections/iterators/AbstractTestIterator.java @@ -19,7 +19,7 @@ package org.apache.commons.collections.iterators; 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.AbstractTestObject; * @author Morgan Delagrange * @author Stephen Colebourne */ -public abstract class AbstractTestIterator extends AbstractTestObject { +public abstract class AbstractTestIterator extends AbstractObjectTest { /** * JUnit constructor. diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java b/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java index d80fdde15..469ba804a 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java +++ b/src/test/java/org/apache/commons/collections/map/AbstractTestMap.java @@ -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.set.AbstractSetTest; * @author Stephen Colebourne * @version $Revision$ */ -public abstract class AbstractTestMap extends AbstractTestObject { +public abstract class AbstractTestMap extends AbstractObjectTest { /** * JDK1.2 has bugs in null handling of Maps, especially HashMap.Entry.toString diff --git a/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java index 0a1a9ce77..23f1e7f45 100644 --- a/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java +++ b/src/test/java/org/apache/commons/collections/map/TestIdentityMap.java @@ -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.IterableMap; * * @author Stephen Colebourne */ -public class TestIdentityMap extends AbstractTestObject { +public class TestIdentityMap extends AbstractObjectTest { private static final Integer I1A = new Integer(1); private static final Integer I1B = new Integer(1); diff --git a/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java index 52e667a7b..cf3b77f76 100644 --- a/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java +++ b/src/test/java/org/apache/commons/collections/map/TestMultiValueMap.java @@ -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.AbstractTestObject; * @author Stephen Colebourne * @since Commons Collections 3.2 */ -public class TestMultiValueMap extends AbstractTestObject { +public class TestMultiValueMap extends AbstractObjectTest { public TestMultiValueMap(String testName) { super(testName);