scolebourne    2003/11/20 13:44:58

  Modified:    collections/src/test/org/apache/commons/collections/iterators
                        AbstractTestOrderedMapIterator.java
  Log:
  Improve ordered map iterator tests
  
  Revision  Changes    Path
  1.2       +14 -5     
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
  
  Index: AbstractTestOrderedMapIterator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractTestOrderedMapIterator.java       20 Nov 2003 00:03:05 -0000      1.1
  +++ AbstractTestOrderedMapIterator.java       20 Nov 2003 21:44:58 -0000      1.2
  @@ -90,6 +90,15 @@
       }
   
       //-----------------------------------------------------------------------
  +    public final OrderedMapIterator makeEmptyOrderedMapIterator() {
  +        return (OrderedMapIterator) makeEmptyMapIterator();
  +    }
  +
  +    public final OrderedMapIterator makeFullOrderedMapIterator() {
  +        return (OrderedMapIterator) makeFullMapIterator();
  +    }
  +    
  +    //-----------------------------------------------------------------------
       /**
        * Test that the empty list iterator contract is correct.
        */
  @@ -100,7 +109,7 @@
   
           super.testEmptyMapIterator();
           
  -        OrderedMapIterator it = (OrderedMapIterator) makeEmptyMapIterator();
  +        OrderedMapIterator it = makeEmptyOrderedMapIterator();
           Map map = getMap();
           assertEquals(false, it.hasPrevious());
           try {
  @@ -120,7 +129,7 @@
   
           super.testFullMapIterator();
           
  -        OrderedMapIterator it = (OrderedMapIterator) makeFullMapIterator();
  +        OrderedMapIterator it = makeFullOrderedMapIterator();
           Map map = getMap();
           
           assertEquals(true, it.hasNext());
  @@ -171,7 +180,7 @@
               return;
           }
   
  -        OrderedMapIterator it = (OrderedMapIterator) makeFullMapIterator();
  +        OrderedMapIterator it = makeFullOrderedMapIterator();
           Map map = getMap();
           
           assertEquals("keySet() not consistent", new ArrayList(map.keySet()), new 
ArrayList(map.keySet()));
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to