diff --git a/src/test/org/apache/commons/collections/TestBeanMap.java b/src/test/org/apache/commons/collections/TestBeanMap.java index 9f91602c4..c49bf6b87 100644 --- a/src/test/org/apache/commons/collections/TestBeanMap.java +++ b/src/test/org/apache/commons/collections/TestBeanMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBeanMap.java,v 1.5 2002/03/13 04:59:03 mas Exp $ - * $Revision: 1.5 $ - * $Date: 2002/03/13 04:59:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBeanMap.java,v 1.6 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.6 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -76,7 +76,7 @@ public class TestBeanMap extends TestMap { } public static Test suite() { - return new TestSuite(TestBeanMap.class); + return BulkTest.makeSuite(TestBeanMap.class); } /* @@ -317,4 +317,18 @@ public class TestBeanMap extends TestMap { "CloneNotSupportedException when clone should succeed."); } } + + public String[] ignoredSimpleTests() { + // Ignore the serialization tests on collection views. + return new String[] { + "TestBeanMap.bulkTestMapEntrySet.testCanonicalEmptyCollectionExists", + "TestBeanMap.bulkTestMapEntrySet.testCanonicalFullCollectionExists", + "TestBeanMap.bulkTestMapKeySet.testCanonicalEmptyCollectionExists", + "TestBeanMap.bulkTestMapKeySet.testCanonicalFullCollectionExists", + "TestBeanMap.bulkTestMapValues.testCanonicalEmptyCollectionExists", + "TestBeanMap.bulkTestMapValues.testCanonicalFullCollectionExists", + "TestBeanMap.bulkTestMapEntrySet.testSimpleSerialization", + "TestBeanMap.bulkTestMapKeySet.testSimpleSerialization" + }; + } } diff --git a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java index f34f56d3d..eb78d4d2b 100644 --- a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java +++ b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.4 2002/02/25 23:51:24 morgand Exp $ - * $Revision: 1.4 $ - * $Date: 2002/02/25 23:51:24 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.5 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.5 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -66,7 +66,7 @@ import java.util.*; /** * @author Rodney Waldhoff - * @version $Id: TestCursorableLinkedList.java,v 1.4 2002/02/25 23:51:24 morgand Exp $ + * @version $Id: TestCursorableLinkedList.java,v 1.5 2002/06/18 05:35:58 mas Exp $ */ public class TestCursorableLinkedList extends TestList { public TestCursorableLinkedList(String testName) { @@ -74,7 +74,7 @@ public class TestCursorableLinkedList extends TestList { } public static Test suite() { - return new TestSuite(TestCursorableLinkedList.class); + return BulkTest.makeSuite(TestCursorableLinkedList.class); } public static void main(String args[]) { diff --git a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java index 0d60aae56..84cac8f91 100644 --- a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java +++ b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v 1.4 2002/05/28 06:51:03 mas Exp $ - * $Revision: 1.4 $ - * $Date: 2002/05/28 06:51:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v 1.5 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.5 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -95,7 +95,7 @@ public class TestDoubleOrderedMap extends TestMap { * @return the test suite */ public static Test suite() { - return new TestSuite(TestDoubleOrderedMap.class); + return BulkTest.makeSuite(TestDoubleOrderedMap.class); } /** diff --git a/src/test/org/apache/commons/collections/TestFastHashMap.java b/src/test/org/apache/commons/collections/TestFastHashMap.java index 8630e1e6e..714e7d782 100644 --- a/src/test/org/apache/commons/collections/TestFastHashMap.java +++ b/src/test/org/apache/commons/collections/TestFastHashMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.4 2002/02/26 00:31:32 morgand Exp $ - * $Revision: 1.4 $ - * $Date: 2002/02/26 00:31:32 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.5 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.5 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -69,7 +69,7 @@ import java.util.Map; /** * @author Jason van Zyl - * @version $Id: TestFastHashMap.java,v 1.4 2002/02/26 00:31:32 morgand Exp $ + * @version $Id: TestFastHashMap.java,v 1.5 2002/06/18 05:35:58 mas Exp $ */ public class TestFastHashMap extends TestHashMap { @@ -80,7 +80,7 @@ public class TestFastHashMap extends TestHashMap public static Test suite() { - return new TestSuite(TestFastHashMap.class); + return BulkTest.makeSuite(TestFastHashMap.class); } public static void main(String args[]) diff --git a/src/test/org/apache/commons/collections/TestFastHashMap1.java b/src/test/org/apache/commons/collections/TestFastHashMap1.java index 441422876..31edd63b0 100644 --- a/src/test/org/apache/commons/collections/TestFastHashMap1.java +++ b/src/test/org/apache/commons/collections/TestFastHashMap1.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap1.java,v 1.2 2002/02/22 02:18:50 mas Exp $ - * $Revision: 1.2 $ - * $Date: 2002/02/22 02:18:50 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap1.java,v 1.3 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.3 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -71,7 +71,7 @@ import java.util.Map; * Test FastHashMap in fast mode. * * @author Jason van Zyl - * @version $Id: TestFastHashMap1.java,v 1.2 2002/02/22 02:18:50 mas Exp $ + * @version $Id: TestFastHashMap1.java,v 1.3 2002/06/18 05:35:58 mas Exp $ */ public class TestFastHashMap1 extends TestFastHashMap { @@ -82,7 +82,7 @@ public class TestFastHashMap1 extends TestFastHashMap public static Test suite() { - return new TestSuite(TestFastHashMap1.class); + return BulkTest.makeSuite(TestFastHashMap1.class); } public static void main(String args[]) diff --git a/src/test/org/apache/commons/collections/TestFastTreeMap.java b/src/test/org/apache/commons/collections/TestFastTreeMap.java index fc1629871..333f19b47 100644 --- a/src/test/org/apache/commons/collections/TestFastTreeMap.java +++ b/src/test/org/apache/commons/collections/TestFastTreeMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastTreeMap.java,v 1.5 2002/02/26 00:31:32 morgand Exp $ - * $Revision: 1.5 $ - * $Date: 2002/02/26 00:31:32 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastTreeMap.java,v 1.6 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.6 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -69,7 +69,7 @@ import java.util.TreeMap; /** * @author Jason van Zyl - * @version $Id: TestFastTreeMap.java,v 1.5 2002/02/26 00:31:32 morgand Exp $ + * @version $Id: TestFastTreeMap.java,v 1.6 2002/06/18 05:35:58 mas Exp $ */ public class TestFastTreeMap extends TestTreeMap { @@ -80,7 +80,7 @@ public class TestFastTreeMap extends TestTreeMap public static Test suite() { - return new TestSuite(TestFastTreeMap.class); + return BulkTest.makeSuite(TestFastTreeMap.class); } public static void main(String args[]) diff --git a/src/test/org/apache/commons/collections/TestFastTreeMap1.java b/src/test/org/apache/commons/collections/TestFastTreeMap1.java index ec9bfbbe1..8ad4687fc 100644 --- a/src/test/org/apache/commons/collections/TestFastTreeMap1.java +++ b/src/test/org/apache/commons/collections/TestFastTreeMap1.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastTreeMap1.java,v 1.2 2002/02/22 02:18:50 mas Exp $ - * $Revision: 1.2 $ - * $Date: 2002/02/22 02:18:50 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastTreeMap1.java,v 1.3 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.3 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -71,7 +71,7 @@ import java.util.TreeMap; * Test FastTreeMap in fast mode. * * @author Jason van Zyl - * @version $Id: TestFastTreeMap1.java,v 1.2 2002/02/22 02:18:50 mas Exp $ + * @version $Id: TestFastTreeMap1.java,v 1.3 2002/06/18 05:35:58 mas Exp $ */ public class TestFastTreeMap1 extends TestFastTreeMap { @@ -82,7 +82,7 @@ public class TestFastTreeMap1 extends TestFastTreeMap public static Test suite() { - return new TestSuite(TestFastTreeMap1.class); + return BulkTest.makeSuite(TestFastTreeMap1.class); } public static void main(String args[]) diff --git a/src/test/org/apache/commons/collections/TestLRUMap.java b/src/test/org/apache/commons/collections/TestLRUMap.java index fecf88988..87d72f120 100644 --- a/src/test/org/apache/commons/collections/TestLRUMap.java +++ b/src/test/org/apache/commons/collections/TestLRUMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLRUMap.java,v 1.21 2002/05/28 06:51:03 mas Exp $ - * $Revision: 1.21 $ - * $Date: 2002/05/28 06:51:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLRUMap.java,v 1.22 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.22 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -74,7 +74,7 @@ import java.util.Set; * * @author James Strachan * @author Morgan Delagrange - * @version $Id: TestLRUMap.java,v 1.21 2002/05/28 06:51:03 mas Exp $ + * @version $Id: TestLRUMap.java,v 1.22 2002/06/18 05:35:58 mas Exp $ */ public class TestLRUMap extends TestSequencedHashMap { @@ -83,7 +83,7 @@ public class TestLRUMap extends TestSequencedHashMap } public static Test suite() { - return new TestSuite(TestLRUMap.class); + return BulkTest.makeSuite(TestLRUMap.class); } public static void main(String args[]) { diff --git a/src/test/org/apache/commons/collections/TestSequencedHashMap.java b/src/test/org/apache/commons/collections/TestSequencedHashMap.java index 2bc0ef682..142e1e8cc 100644 --- a/src/test/org/apache/commons/collections/TestSequencedHashMap.java +++ b/src/test/org/apache/commons/collections/TestSequencedHashMap.java @@ -86,7 +86,7 @@ public class TestSequencedHashMap extends TestMap { } public static Test suite() { - return new TestSuite(TestSequencedHashMap.class); + return BulkTest.makeSuite(TestSequencedHashMap.class); } // current versions of SequencedHashMap and subclasses are not diff --git a/src/test/org/apache/commons/collections/TestSoftRefHashMap.java b/src/test/org/apache/commons/collections/TestSoftRefHashMap.java index 818091fe0..ddbf88aae 100644 --- a/src/test/org/apache/commons/collections/TestSoftRefHashMap.java +++ b/src/test/org/apache/commons/collections/TestSoftRefHashMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestSoftRefHashMap.java,v 1.2 2002/02/26 00:31:32 morgand Exp $ - * $Revision: 1.2 $ - * $Date: 2002/02/26 00:31:32 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestSoftRefHashMap.java,v 1.3 2002/06/18 05:35:58 mas Exp $ + * $Revision: 1.3 $ + * $Date: 2002/06/18 05:35:58 $ * * ==================================================================== * @@ -69,9 +69,9 @@ import java.util.HashMap; /** * @author James Strachan - * @version $Id: TestSoftRefHashMap.java,v 1.2 2002/02/26 00:31:32 morgand Exp $ + * @version $Id: TestSoftRefHashMap.java,v 1.3 2002/06/18 05:35:58 mas Exp $ */ -public class TestSoftRefHashMap extends TestHashMap +public class TestSoftRefHashMap extends TestMap { public TestSoftRefHashMap(String testName) { super(testName); @@ -91,8 +91,4 @@ public class TestSoftRefHashMap extends TestHashMap return map; } - public void setUp() { - map = (HashMap) makeEmptyMap(); - } - }