cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestIteratorUtils.java

[scolebourne]

scolebourne    2004/05/26 14:56:45

  Modified:    collections/src/test/org/apache/commons/collections
                        TestIteratorUtils.java
  Log:
  Ensure empty iterator implementation is as per v3.0
  
  Revision  Changes    Path
  1.16      +4 -2      
jakarta-commons/collections/src/test/org/apache/commons/collections/TestIteratorUtils.java
  
  Index: TestIteratorUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestIteratorUtils.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- TestIteratorUtils.java    22 May 2004 09:46:39 -0000      1.15
  +++ TestIteratorUtils.java    26 May 2004 21:56:45 -0000      1.16
  @@ -27,6 +27,7 @@
   import org.apache.commons.collections.iterators.EmptyIterator;
   import org.apache.commons.collections.iterators.EmptyListIterator;
   import org.apache.commons.collections.iterators.EmptyMapIterator;
  +import org.apache.commons.collections.iterators.EmptyOrderedIterator;
   import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
   
   /**
  @@ -493,10 +494,11 @@
        * Test empty map iterator
        */
       public void testEmptyOrderedIterator() {
  -        assertSame(EmptyListIterator.ORDERED_INSTANCE, 
IteratorUtils.EMPTY_ORDERED_ITERATOR);
  +        assertSame(EmptyOrderedIterator.INSTANCE, 
IteratorUtils.EMPTY_ORDERED_ITERATOR);
           assertEquals(true, IteratorUtils.EMPTY_ORDERED_ITERATOR instanceof 
Iterator);
           assertEquals(true, IteratorUtils.EMPTY_ORDERED_ITERATOR instanceof 
OrderedIterator);
           assertEquals(true, IteratorUtils.EMPTY_ORDERED_ITERATOR instanceof 
ResettableIterator);
  +        assertEquals(false, IteratorUtils.EMPTY_ORDERED_ITERATOR instanceof 
ListIterator);
           assertEquals(false, IteratorUtils.EMPTY_ORDERED_ITERATOR instanceof 
MapIterator);
           assertEquals(false, IteratorUtils.EMPTY_ORDERED_ITERATOR.hasNext());
           assertEquals(false, IteratorUtils.EMPTY_ORDERED_ITERATOR.hasPrevious());
  
  
  

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