diff --git a/src/test/org/apache/commons/collections/BulkTest.java b/src/test/org/apache/commons/collections/BulkTest.java index ae78fce78..970d5e2e6 100644 --- a/src/test/org/apache/commons/collections/BulkTest.java +++ b/src/test/org/apache/commons/collections/BulkTest.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/BulkTest.java,v 1.5 2003/10/02 22:14:29 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/BulkTest.java,v 1.6 2003/10/05 20:48:29 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -167,7 +167,7 @@ import junit.framework.TestSuite; * A subclass can override a superclass's bulk test by * returning null from the bulk test method. If you only * want to override specific simple tests within a bulk test, use the - * {@link #ignoredSimpleTests} method.

+ * {@link #ignoredTests} method.

* * Note that if you want to use the bulk test methods, you must * define your suite() method to use {@link #makeSuite}. @@ -175,7 +175,7 @@ import junit.framework.TestSuite; * interpret bulk test methods. * * @author Paul Jack - * @version $Id: BulkTest.java,v 1.5 2003/10/02 22:14:29 scolebourne Exp $ + * @version $Id: BulkTest.java,v 1.6 2003/10/05 20:48:29 scolebourne Exp $ */ public class BulkTest extends TestCase implements Cloneable { @@ -191,7 +191,7 @@ public class BulkTest extends TestCase implements Cloneable { /** * The full name of this bulk test instance. This is the full name - * that is compared to {@link #ignoredSimpleTests} to see if this + * that is compared to {@link #ignoredTests} to see if this * test should be ignored. It's also displayed in the text runner * to ease debugging. */ @@ -225,39 +225,39 @@ public class BulkTest extends TestCase implements Cloneable { /** - * Returns an array of simple test names to ignore.

+ * Returns an array of test names to ignore.

* - * If a simple test that's defined by this BulkTest or + * If a test that's defined by this BulkTest or * by one of its bulk test methods has a name that's in the returned * array, then that simple test will not be executed.

* - * A simple test's name is formed by taking the class name of the + * A test's name is formed by taking the class name of the * root BulkTest, eliminating the package name, then * appending the names of any bulk test methods that were invoked * to get to the simple test, and then appending the simple test * method name. The method names are delimited by periods: * - *

+     *  
      *  TestHashMap.bulkTestEntrySet.testClear
-     *  
+ *
* * is the name of one of the simple tests defined in the sample classes * described above. If the sample TestHashMap class * included this method: * - *
-     *  public String[] ignoredSimpleTests() {
+     *  
+     *  public String[] ignoredTests() {
      *      return new String[] { "TestHashMap.bulkTestEntrySet.testClear" };
      *  }
-     *  
+ *
* * then the entry set's clear method wouldn't be tested, but the key * set's clear method would. * - * @return an array of the names of simple tests to ignore, or null if + * @return an array of the names of tests to ignore, or null if * no tests should be ignored */ - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { return null; } @@ -341,7 +341,7 @@ class BulkTestSuiteMaker { BulkTest bulk = makeFirstTestCase(startingClass); ignored = new ArrayList(); - String[] s = bulk.ignoredSimpleTests(); + String[] s = bulk.ignoredTests(); if (s != null) { ignored.addAll(Arrays.asList(s)); } @@ -391,6 +391,9 @@ class BulkTestSuiteMaker { * @param m The bulk test method */ void addBulk(BulkTest bulk, Method m) { + String verboseName = prefix + "." + m.getName(); + if (ignored.contains(verboseName)) return; + BulkTest bulk2; try { bulk2 = (BulkTest)m.invoke(bulk, null); diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayByteList.java b/src/test/org/apache/commons/collections/primitives/TestArrayByteList.java index 6ca3210b5..4d918b679 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayByteList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayByteList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayByteList.java,v 1.4 2003/08/31 17:28:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayByteList.java,v 1.5 2003/10/05 20:48:59 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.4 $ $Date: 2003/08/31 17:28:40 $ + * @version $Revision: 1.5 $ $Date: 2003/10/05 20:48:59 $ * @author Rodney Waldhoff */ public class TestArrayByteList extends TestByteList { @@ -87,7 +87,7 @@ public class TestArrayByteList extends TestByteList { return new ArrayByteList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayByteList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayCharList.java b/src/test/org/apache/commons/collections/primitives/TestArrayCharList.java index e868893ee..da7ab1bf0 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayCharList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayCharList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayCharList.java,v 1.3 2003/08/31 17:28:41 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayCharList.java,v 1.4 2003/10/05 20:48:59 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:41 $ + * @version $Revision: 1.4 $ $Date: 2003/10/05 20:48:59 $ * @author Rodney Waldhoff */ public class TestArrayCharList extends TestCharList { @@ -87,7 +87,7 @@ public class TestArrayCharList extends TestCharList { return new ArrayCharList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayCharList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayDoubleList.java b/src/test/org/apache/commons/collections/primitives/TestArrayDoubleList.java index 76c316218..fe5a1fe6d 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayDoubleList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayDoubleList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayDoubleList.java,v 1.3 2003/08/31 17:28:41 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayDoubleList.java,v 1.4 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:41 $ + * @version $Revision: 1.4 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestArrayDoubleList extends TestDoubleList { @@ -87,7 +87,7 @@ public class TestArrayDoubleList extends TestDoubleList { return new ArrayDoubleList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayDoubleList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayFloatList.java b/src/test/org/apache/commons/collections/primitives/TestArrayFloatList.java index cb286dd3f..9609f76d8 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayFloatList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayFloatList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayFloatList.java,v 1.3 2003/08/31 17:28:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayFloatList.java,v 1.4 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:40 $ + * @version $Revision: 1.4 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestArrayFloatList extends TestFloatList { @@ -87,7 +87,7 @@ public class TestArrayFloatList extends TestFloatList { return new ArrayFloatList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayFloatList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayIntList.java b/src/test/org/apache/commons/collections/primitives/TestArrayIntList.java index de15fae52..1bc48c666 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayIntList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayIntList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayIntList.java,v 1.13 2003/08/31 17:28:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayIntList.java,v 1.14 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.13 $ $Date: 2003/08/31 17:28:40 $ + * @version $Revision: 1.14 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestArrayIntList extends TestIntList { @@ -87,7 +87,7 @@ public class TestArrayIntList extends TestIntList { return new ArrayIntList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayIntList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayLongList.java b/src/test/org/apache/commons/collections/primitives/TestArrayLongList.java index afb56ba65..e397f858d 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayLongList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayLongList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayLongList.java,v 1.3 2003/08/31 17:28:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayLongList.java,v 1.4 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:40 $ + * @version $Revision: 1.4 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestArrayLongList extends TestLongList { @@ -87,7 +87,7 @@ public class TestArrayLongList extends TestLongList { return new ArrayLongList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayLongList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayShortList.java b/src/test/org/apache/commons/collections/primitives/TestArrayShortList.java index 83675803e..7a0b812d8 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayShortList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayShortList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayShortList.java,v 1.3 2003/08/31 17:28:41 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayShortList.java,v 1.4 2003/10/05 20:48:59 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:41 $ + * @version $Revision: 1.4 $ $Date: 2003/10/05 20:48:59 $ * @author Rodney Waldhoff */ public class TestArrayShortList extends TestShortList { @@ -87,7 +87,7 @@ public class TestArrayShortList extends TestShortList { return new ArrayShortList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayShortList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java b/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java index 76bc36fd9..14d47fdd8 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayUnsignedByteList.java,v 1.3 2003/08/31 17:28:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayUnsignedByteList.java,v 1.4 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:40 $ + * @version $Revision: 1.4 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestArrayUnsignedByteList extends TestShortList { @@ -87,7 +87,7 @@ public class TestArrayUnsignedByteList extends TestShortList { return new ArrayUnsignedByteList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayUnsignedByteList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java b/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java index 26476029b..2ee669824 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayUnsignedIntList.java,v 1.3 2003/08/31 17:28:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayUnsignedIntList.java,v 1.4 2003/10/05 20:48:59 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:40 $ + * @version $Revision: 1.4 $ $Date: 2003/10/05 20:48:59 $ * @author Rodney Waldhoff */ public class TestArrayUnsignedIntList extends TestLongList { @@ -87,7 +87,7 @@ public class TestArrayUnsignedIntList extends TestLongList { return new ArrayUnsignedIntList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayUnsignedLongList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java b/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java index 7cdef8c12..9679810fa 100644 --- a/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java +++ b/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayUnsignedShortList.java,v 1.13 2003/08/31 17:28:41 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestArrayUnsignedShortList.java,v 1.14 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.13 $ $Date: 2003/08/31 17:28:41 $ + * @version $Revision: 1.14 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestArrayUnsignedShortList extends TestIntList { @@ -87,7 +87,7 @@ public class TestArrayUnsignedShortList extends TestIntList { return new ArrayUnsignedShortList(); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestArrayUnsignedShortList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestListByteList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestListByteList.java index 41925ab93..6a77ba482 100644 --- a/src/test/org/apache/commons/collections/primitives/adapters/TestListByteList.java +++ b/src/test/org/apache/commons/collections/primitives/adapters/TestListByteList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListByteList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListByteList.java,v 1.3 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -69,7 +69,7 @@ import org.apache.commons.collections.primitives.ByteList; import org.apache.commons.collections.primitives.TestByteList; /** - * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $ + * @version $Revision: 1.3 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestListByteList extends TestByteList { @@ -96,7 +96,7 @@ public class TestListByteList extends TestByteList { return new ListByteList(new ArrayList()); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestListByteList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestListCharList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestListCharList.java index da9a4fc17..15731fed2 100644 --- a/src/test/org/apache/commons/collections/primitives/adapters/TestListCharList.java +++ b/src/test/org/apache/commons/collections/primitives/adapters/TestListCharList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListCharList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListCharList.java,v 1.3 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -69,7 +69,7 @@ import org.apache.commons.collections.primitives.CharList; import org.apache.commons.collections.primitives.TestCharList; /** - * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $ + * @version $Revision: 1.3 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestListCharList extends TestCharList { @@ -96,7 +96,7 @@ public class TestListCharList extends TestCharList { return new ListCharList(new ArrayList()); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestListCharList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestListDoubleList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestListDoubleList.java index 1d9ffcce3..09c31297d 100644 --- a/src/test/org/apache/commons/collections/primitives/adapters/TestListDoubleList.java +++ b/src/test/org/apache/commons/collections/primitives/adapters/TestListDoubleList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListDoubleList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListDoubleList.java,v 1.3 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -69,7 +69,7 @@ import org.apache.commons.collections.primitives.DoubleList; import org.apache.commons.collections.primitives.TestDoubleList; /** - * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $ + * @version $Revision: 1.3 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestListDoubleList extends TestDoubleList { @@ -96,7 +96,7 @@ public class TestListDoubleList extends TestDoubleList { return new ListDoubleList(new ArrayList()); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestListDoubleList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestListFloatList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestListFloatList.java index 9aab02c37..328fe0900 100644 --- a/src/test/org/apache/commons/collections/primitives/adapters/TestListFloatList.java +++ b/src/test/org/apache/commons/collections/primitives/adapters/TestListFloatList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListFloatList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListFloatList.java,v 1.3 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -69,7 +69,7 @@ import org.apache.commons.collections.primitives.FloatList; import org.apache.commons.collections.primitives.TestFloatList; /** - * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $ + * @version $Revision: 1.3 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestListFloatList extends TestFloatList { @@ -96,7 +96,7 @@ public class TestListFloatList extends TestFloatList { return new ListFloatList(new ArrayList()); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestListFloatList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestListIntList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestListIntList.java index 58e03e015..82ed923a3 100644 --- a/src/test/org/apache/commons/collections/primitives/adapters/TestListIntList.java +++ b/src/test/org/apache/commons/collections/primitives/adapters/TestListIntList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListIntList.java,v 1.5 2003/08/31 17:28:38 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListIntList.java,v 1.6 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -69,7 +69,7 @@ import org.apache.commons.collections.primitives.IntList; import org.apache.commons.collections.primitives.TestIntList; /** - * @version $Revision: 1.5 $ $Date: 2003/08/31 17:28:38 $ + * @version $Revision: 1.6 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestListIntList extends TestIntList { @@ -96,7 +96,7 @@ public class TestListIntList extends TestIntList { return new ListIntList(new ArrayList()); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestListIntList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestListLongList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestListLongList.java index 1cbf22513..902cd52dc 100644 --- a/src/test/org/apache/commons/collections/primitives/adapters/TestListLongList.java +++ b/src/test/org/apache/commons/collections/primitives/adapters/TestListLongList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListLongList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListLongList.java,v 1.3 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -69,7 +69,7 @@ import org.apache.commons.collections.primitives.LongList; import org.apache.commons.collections.primitives.TestLongList; /** - * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $ + * @version $Revision: 1.3 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestListLongList extends TestLongList { @@ -96,7 +96,7 @@ public class TestListLongList extends TestLongList { return new ListLongList(new ArrayList()); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestListLongList.bulkTestSubList.testFullListSerialization", diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestListShortList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestListShortList.java index 692c48f73..5d37fc9ee 100644 --- a/src/test/org/apache/commons/collections/primitives/adapters/TestListShortList.java +++ b/src/test/org/apache/commons/collections/primitives/adapters/TestListShortList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListShortList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestListShortList.java,v 1.3 2003/10/05 20:48:58 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -69,7 +69,7 @@ import org.apache.commons.collections.primitives.ShortList; import org.apache.commons.collections.primitives.TestShortList; /** - * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $ + * @version $Revision: 1.3 $ $Date: 2003/10/05 20:48:58 $ * @author Rodney Waldhoff */ public class TestListShortList extends TestShortList { @@ -96,7 +96,7 @@ public class TestListShortList extends TestShortList { return new ListShortList(new ArrayList()); } - public String[] ignoredSimpleTests() { + protected String[] ignoredTests() { // sublists are not serializable return new String[] { "TestListShortList.bulkTestSubList.testFullListSerialization",