You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2012/07/29 12:21:48 UTC

svn commit: r1366804 - in /commons/proper/collections/trunk: ./ src/test/java/org/apache/commons/collections/bag/ src/test/java/org/apache/commons/collections/collection/

Author: tn
Date: Sun Jul 29 10:21:47 2012
New Revision: 1366804

URL: http://svn.apache.org/viewvc?rev=1366804&view=rev
Log:
Changed test classes for bag package to <Class>Test.java notation.

Added:
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/HashBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestHashBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTreeBag.java
Removed:
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestHashBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTreeBag.java
Modified:
    commons/proper/collections/trunk/pom.xml
    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java

Modified: commons/proper/collections/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=1366804&r1=1366803&r2=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/pom.xml (original)
+++ commons/proper/collections/trunk/pom.xml Sun Jul 29 10:21:47 2012
@@ -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>

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java Sun Jul 29 10:21:47 2012
@@ -37,12 +37,9 @@ import org.apache.commons.collections.Ba
  * 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>
      * 
      * @param testName  the test class name
      */
-    public AbstractTestBag(String testName) {
+    public AbstractBagTest(String testName) {
         super(testName);
     }
 

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractTestSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java Sun Jul 29 10:21:47 2012
@@ -23,14 +23,12 @@ import org.apache.commons.collections.So
  * {@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);
     }
 

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/HashBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestHashBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/HashBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/HashBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestHashBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestHashBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/HashBagTest.java Sun Jul 29 10:21:47 2012
@@ -19,16 +19,14 @@ package org.apache.commons.collections.b
 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);
     }
 

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java Sun Jul 29 10:21:47 2012
@@ -23,17 +23,15 @@ import org.apache.commons.collections.Pr
 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);
     }
 

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestPredicatedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java Sun Jul 29 10:21:47 2012
@@ -23,19 +23,17 @@ import org.apache.commons.collections.So
 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);
     }
 

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java Sun Jul 29 10:21:47 2012
@@ -21,17 +21,15 @@ import org.apache.commons.collections.Tr
 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);
     }
 

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTransformedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java Sun Jul 29 10:21:47 2012
@@ -22,17 +22,15 @@ import org.apache.commons.collections.Tr
 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);
     }
 

Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTreeBag.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTreeBag.java&r1=1361641&r2=1366804&rev=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TestTreeBag.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java Sun Jul 29 10:21:47 2012
@@ -20,16 +20,14 @@ import org.apache.commons.collections.Ba
 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);
     }
 

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java?rev=1366804&r1=1366803&r2=1366804&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/AbstractTestCollection.java Sun Jul 29 10:21:47 2012
@@ -106,7 +106,7 @@ import org.apache.commons.collections.Ab
  * <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>