From 23405f00a38d7e0d28863621f7f4e7efb6e2a629 Mon Sep 17 00:00:00 2001
From: Thomas Neidhart <tn@apache.org>
Date: Sun, 29 Jul 2012 10:21:47 +0000
Subject: [PATCH] Changed test classes for bag package to <Class>Test.java
 notation.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1366804 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                              |  4 +++-
 .../{AbstractTestBag.java => AbstractBagTest.java}   |  9 +++------
 ...TestSortedBag.java => AbstractSortedBagTest.java} | 10 ++++------
 .../bag/{TestHashBag.java => HashBagTest.java}       | 10 ++++------
 ...TestPredicatedBag.java => PredicatedBagTest.java} | 12 +++++-------
 ...edSortedBag.java => PredicatedSortedBagTest.java} | 12 +++++-------
 ...stTransformedBag.java => TransformedBagTest.java} | 12 +++++-------
 ...dSortedBag.java => TransformedSortedBagTest.java} | 12 +++++-------
 .../bag/{TestTreeBag.java => TreeBagTest.java}       | 10 ++++------
 .../collection/AbstractTestCollection.java           |  2 +-
 10 files changed, 39 insertions(+), 54 deletions(-)
 rename src/test/java/org/apache/commons/collections/bag/{AbstractTestBag.java => AbstractBagTest.java} (99%)
 rename src/test/java/org/apache/commons/collections/bag/{AbstractTestSortedBag.java => AbstractSortedBagTest.java} (84%)
 rename src/test/java/org/apache/commons/collections/bag/{TestHashBag.java => HashBagTest.java} (88%)
 rename src/test/java/org/apache/commons/collections/bag/{TestPredicatedBag.java => PredicatedBagTest.java} (94%)
 rename src/test/java/org/apache/commons/collections/bag/{TestPredicatedSortedBag.java => PredicatedSortedBagTest.java} (93%)
 rename src/test/java/org/apache/commons/collections/bag/{TestTransformedBag.java => TransformedBagTest.java} (92%)
 rename src/test/java/org/apache/commons/collections/bag/{TestTransformedSortedBag.java => TransformedSortedBagTest.java} (92%)
 rename src/test/java/org/apache/commons/collections/bag/{TestTreeBag.java => TreeBagTest.java} (92%)

diff --git a/pom.xml b/pom.xml
index 5e99e9cc0..ef2ca2443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,10 +447,12 @@
             <configuration>
               <includes>
                 <include>**/Test*.java</include>
+                <include>**/*Test.java</include>
               </includes>
               <excludes>
                 <exclude>**/*$*</exclude>
-                <exclude >**/TestUtils.java</exclude>
+                <exclude>**/TestUtils.java</exclude>
+                <exclude>**/Abstract*.java</exclude>
               </excludes>
           </configuration>
         </plugin>
diff --git a/src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java b/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java
rename to src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java
index a397d50fe..0e05668dc 100644
--- a/src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java
@@ -37,12 +37,9 @@ import org.apache.commons.collections.Bag;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your bag fails.
  *
- * @version $Revision$
- *
- * @author Chuck Burdick
- * @author Stephen Colebourne
+ * @version $Id$
  */
-public abstract class AbstractTestBag<T> extends AbstractTestObject {
+public abstract class AbstractBagTest<T> extends AbstractTestObject {
 //  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
@@ -53,7 +50,7 @@ public abstract class AbstractTestBag<T> extends AbstractTestObject {
      * 
      * @param testName  the test class name
      */
-    public AbstractTestBag(String testName) {
+    public AbstractBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java b/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java
similarity index 84%
rename from src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java
rename to src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java
index 5c9f042a6..64d773b7e 100644
--- a/src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java
@@ -23,14 +23,12 @@ import org.apache.commons.collections.SortedBag;
  * {@link org.apache.commons.collections.SortedBag SortedBag}
  * methods and contracts.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.0
+ * @version $Id$
  */
-public abstract class AbstractTestSortedBag<T> extends AbstractTestBag<T> {
+public abstract class AbstractSortedBagTest<T> extends AbstractBagTest<T> {
 
-    public AbstractTestSortedBag(String testName) {
+    public AbstractSortedBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/bag/TestHashBag.java b/src/test/java/org/apache/commons/collections/bag/HashBagTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/bag/TestHashBag.java
rename to src/test/java/org/apache/commons/collections/bag/HashBagTest.java
index f17e84a16..23156da22 100644
--- a/src/test/java/org/apache/commons/collections/bag/TestHashBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/HashBagTest.java
@@ -19,16 +19,14 @@ package org.apache.commons.collections.bag;
 import org.apache.commons.collections.Bag;
 
 /**
- * Extension of {@link AbstractTestBag} for exercising the {@link HashBag}
+ * Extension of {@link AbstractBagTest} for exercising the {@link HashBag}
  * implementation.
  *
- * @version $Revision$
- *
- * @author Chuck Burdick
+ * @version $Id$
  */
-public class TestHashBag<T> extends AbstractTestBag<T> {
+public class HashBagTest<T> extends AbstractBagTest<T> {
     
-    public TestHashBag(String testName) {
+    public HashBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java b/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java
rename to src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java
index 10fa09a3c..6477127ae 100644
--- a/src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java
@@ -23,17 +23,15 @@ import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.functors.TruePredicate;
 
 /**
- * Extension of {@link AbstractTestBag} for exercising the {@link PredicatedBag}
+ * Extension of {@link AbstractBagTest} for exercising the {@link PredicatedBag}
  * implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Phil Steitz
+ * @since 3.0
+ * @version $Id$
  */
-public class TestPredicatedBag<T> extends AbstractTestBag<T> {
+public class PredicatedBagTest<T> extends AbstractBagTest<T> {
 
-    public TestPredicatedBag(String testName) {
+    public PredicatedBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
rename to src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java
index bb70b7966..c7e5bb4a8 100644
--- a/src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java
@@ -23,19 +23,17 @@ import org.apache.commons.collections.SortedBag;
 import org.apache.commons.collections.functors.TruePredicate;
 
 /**
- * Extension of {@link AbstractTestSortedBag} for exercising the {@link PredicatedSortedBag}
+ * Extension of {@link AbstractSortedBagTest} for exercising the {@link PredicatedSortedBag}
  * implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Phil Steitz
+ * @since 3.0
+ * @version $Id$
  */
-public class TestPredicatedSortedBag<T> extends AbstractTestSortedBag<T> {
+public class PredicatedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
     private SortedBag<T> nullBag = null;
 
-    public TestPredicatedSortedBag(String testName) {
+    public PredicatedSortedBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java b/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java
rename to src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java
index 01f22432a..bcaf43845 100644
--- a/src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java
@@ -21,17 +21,15 @@ import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.collection.TestTransformedCollection;
 
 /**
- * Extension of {@link AbstractTestBag} for exercising the {@link TransformedBag}
+ * Extension of {@link AbstractBagTest} for exercising the {@link TransformedBag}
  * implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.0
+ * @version $Id$
  */
-public class TestTransformedBag<T> extends AbstractTestBag<T> {
+public class TransformedBagTest<T> extends AbstractBagTest<T> {
 
-    public TestTransformedBag(String testName) {
+    public TransformedBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java b/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java
rename to src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java
index 60ed6f885..0212378ec 100644
--- a/src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java
@@ -22,17 +22,15 @@ import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.collection.TestTransformedCollection;
 
 /**
- * Extension of {@link AbstractTestSortedBag} for exercising the {@link TransformedSortedBag}
+ * Extension of {@link AbstractSortedBagTest} for exercising the {@link TransformedSortedBag}
  * implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.0
+ * @version $Id$
  */
-public class TestTransformedSortedBag<T> extends AbstractTestSortedBag<T> {
+public class TransformedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
-    public TestTransformedSortedBag(String testName) {
+    public TransformedSortedBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/bag/TestTreeBag.java b/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/bag/TestTreeBag.java
rename to src/test/java/org/apache/commons/collections/bag/TreeBagTest.java
index d02ee083c..d5cac7493 100644
--- a/src/test/java/org/apache/commons/collections/bag/TestTreeBag.java
+++ b/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java
@@ -20,16 +20,14 @@ import org.apache.commons.collections.Bag;
 import org.apache.commons.collections.SortedBag;
 
 /**
- * Extension of {@link AbstractTestBag} for exercising the {@link TreeBag}
+ * Extension of {@link AbstractBagTest} for exercising the {@link TreeBag}
  * implementation.
  *
- * @version $Revision$
- *
- * @author Chuck Burdick
+ * @version $Id$
  */
-public class TestTreeBag<T> extends AbstractTestSortedBag<T> {
+public class TreeBagTest<T> extends AbstractSortedBagTest<T> {
 
-    public TestTreeBag(String testName) {
+    public TreeBagTest(String testName) {
         super(testName);
     }
 
diff --git a/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java
index 4ff1fd192..0e0e0c384 100644
--- a/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java
+++ b/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java
@@ -106,7 +106,7 @@ import org.apache.commons.collections.AbstractTestObject;
  * <p>
  * If you're extending {@link org.apache.commons.collections.list.AbstractTestList AbstractTestList},
  * {@link org.apache.commons.collections.set.AbstractTestSet AbstractTestSet},
- * or {@link org.apache.commons.collections.bag.AbstractTestBag AbstractTestBag}, 
+ * or {@link org.apache.commons.collections.bag.AbstractBagTest AbstractTestBag}, 
  * you probably don't have to worry about the
  * above methods, because those three classes already override the methods
  * to provide standard JDK confirmed collections.<P>