commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestBeanMap.java TestCursorableLinkedList.java TestDoubleOrderedMap.java TestFastHashMap.java TestFastHashMap1.java TestFastTreeMap.java TestFastTreeMap1.java TestLRUMap.java TestSequencedHashMap.java TestSoftRefHashMap.java
Date Tue, 18 Jun 2002 05:35:58 GMT
mas         2002/06/17 22:35:58

  Modified:    collections/src/test/org/apache/commons/collections
                        TestBeanMap.java TestCursorableLinkedList.java
                        TestDoubleOrderedMap.java TestFastHashMap.java
                        TestFastHashMap1.java TestFastTreeMap.java
                        TestFastTreeMap1.java TestLRUMap.java
                        TestSequencedHashMap.java TestSoftRefHashMap.java
  Log:
  Enabled the new test framework in the following test classes:
   - TestBeanMap
   - TestCursorableLinkedList
   - TestDoubleOrderedMap
   - TestFastHashMap
   - TestFastHashMap1
   - TestFastTreeMap
   - TestFastTreeMap1
   - TestLRUMap
   - TestSequencedHashMap
   - TestSoftRefHashMap
  
  Submitted by Paul Jack ( pjack at sfaf dot org ).
  
  Note: TestAll does not contain reference to TestSoftRefHashMap, so this test is
  not automatically run.  If you run it manually, you will see many failures that
  are due to bug 9571.
  
  Note: With this commit, there are four test failures if you are running with
  JDK 1.2.  This is due to a bug in the JDK's implementation of keySet on a
  HashMap which incorrectly returns false after removing a mapping which maps a
  key to a null value.  Incidently, this problem is very similar to the problem
  that existed on SequencedHashMap, filed as bug 9719, and fixed on June 9th.
  See: http://developer.java.sun.com/developer/bugParade/bugs/4286765.html
  
  Revision  Changes    Path
  1.6       +18 -4     jakarta-commons/collections/src/test/org/apache/commons/collections/TestBeanMap.java
  
  Index: TestBeanMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestBeanMap.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestBeanMap.java	13 Mar 2002 04:59:03 -0000	1.5
  +++ TestBeanMap.java	18 Jun 2002 05:35:58 -0000	1.6
  @@ -76,7 +76,7 @@
       }
   
       public static Test suite() {
  -        return new TestSuite(TestBeanMap.class);
  +        return BulkTest.makeSuite(TestBeanMap.class);
       }
   
   /*
  @@ -316,5 +316,19 @@
               fail("BeanMap.clone() should not throw a " +
                    "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"
  +        };
       }
   }
  
  
  
  1.5       +5 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
  
  Index: TestCursorableLinkedList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestCursorableLinkedList.java	25 Feb 2002 23:51:24 -0000	1.4
  +++ TestCursorableLinkedList.java	18 Jun 2002 05:35:58 -0000	1.5
  @@ -74,7 +74,7 @@
       }
   
       public static Test suite() {
  -        return new TestSuite(TestCursorableLinkedList.class);
  +        return BulkTest.makeSuite(TestCursorableLinkedList.class);
       }
   
       public static void main(String args[]) {
  
  
  
  1.5       +4 -4      jakarta-commons/collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
  
  Index: TestDoubleOrderedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestDoubleOrderedMap.java	28 May 2002 06:51:03 -0000	1.4
  +++ TestDoubleOrderedMap.java	18 Jun 2002 05:35:58 -0000	1.5
  @@ -95,7 +95,7 @@
        * @return the test suite
        */
       public static Test suite() {
  -        return new TestSuite(TestDoubleOrderedMap.class);
  +        return BulkTest.makeSuite(TestDoubleOrderedMap.class);
       }
   
       /**
  
  
  
  1.5       +5 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap.java
  
  Index: TestFastHashMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestFastHashMap.java	26 Feb 2002 00:31:32 -0000	1.4
  +++ TestFastHashMap.java	18 Jun 2002 05:35:58 -0000	1.5
  @@ -80,7 +80,7 @@
   
       public static Test suite()
       {
  -        return new TestSuite(TestFastHashMap.class);
  +        return BulkTest.makeSuite(TestFastHashMap.class);
       }
   
       public static void main(String args[])
  
  
  
  1.3       +5 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap1.java
  
  Index: TestFastHashMap1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap1.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestFastHashMap1.java	22 Feb 2002 02:18:50 -0000	1.2
  +++ TestFastHashMap1.java	18 Jun 2002 05:35:58 -0000	1.3
  @@ -82,7 +82,7 @@
   
       public static Test suite()
       {
  -        return new TestSuite(TestFastHashMap1.class);
  +        return BulkTest.makeSuite(TestFastHashMap1.class);
       }
   
       public static void main(String args[])
  
  
  
  1.6       +5 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastTreeMap.java
  
  Index: TestFastTreeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastTreeMap.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestFastTreeMap.java	26 Feb 2002 00:31:32 -0000	1.5
  +++ TestFastTreeMap.java	18 Jun 2002 05:35:58 -0000	1.6
  @@ -80,7 +80,7 @@
   
       public static Test suite()
       {
  -        return new TestSuite(TestFastTreeMap.class);
  +        return BulkTest.makeSuite(TestFastTreeMap.class);
       }
   
       public static void main(String args[])
  
  
  
  1.3       +5 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastTreeMap1.java
  
  Index: TestFastTreeMap1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastTreeMap1.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestFastTreeMap1.java	22 Feb 2002 02:18:50 -0000	1.2
  +++ TestFastTreeMap1.java	18 Jun 2002 05:35:58 -0000	1.3
  @@ -82,7 +82,7 @@
   
       public static Test suite()
       {
  -        return new TestSuite(TestFastTreeMap1.class);
  +        return BulkTest.makeSuite(TestFastTreeMap1.class);
       }
   
       public static void main(String args[])
  
  
  
  1.22      +5 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/TestLRUMap.java
  
  Index: TestLRUMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestLRUMap.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- TestLRUMap.java	28 May 2002 06:51:03 -0000	1.21
  +++ TestLRUMap.java	18 Jun 2002 05:35:58 -0000	1.22
  @@ -83,7 +83,7 @@
       }
   
       public static Test suite() {
  -        return new TestSuite(TestLRUMap.class);
  +        return BulkTest.makeSuite(TestLRUMap.class);
       }
   
       public static void main(String args[]) {
  
  
  
  1.14      +1 -1      jakarta-commons/collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java
  
  Index: TestSequencedHashMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- TestSequencedHashMap.java	18 Jun 2002 03:28:35 -0000	1.13
  +++ TestSequencedHashMap.java	18 Jun 2002 05:35:58 -0000	1.14
  @@ -86,7 +86,7 @@
       }
   
       public static Test suite() {
  -        return new TestSuite(TestSequencedHashMap.class);
  +        return BulkTest.makeSuite(TestSequencedHashMap.class);
       }
   
       // current versions of SequencedHashMap and subclasses are not
  
  
  
  1.3       +5 -9      jakarta-commons/collections/src/test/org/apache/commons/collections/TestSoftRefHashMap.java
  
  Index: TestSoftRefHashMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSoftRefHashMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestSoftRefHashMap.java	26 Feb 2002 00:31:32 -0000	1.2
  +++ TestSoftRefHashMap.java	18 Jun 2002 05:35:58 -0000	1.3
  @@ -71,7 +71,7 @@
    * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
    * @version $Id$
    */
  -public class TestSoftRefHashMap extends TestHashMap
  +public class TestSoftRefHashMap extends TestMap
   {
       public TestSoftRefHashMap(String testName) {
           super(testName);
  @@ -89,10 +89,6 @@
       public Map makeEmptyMap() {
           SoftRefHashMap map = new SoftRefHashMap();
           return map;
  -    }
  -
  -    public void setUp() {
  -        map = (HashMap) makeEmptyMap();
       }
   
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message