You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/11/08 19:47:38 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestIteratorUtils.java
scolebourne 2003/11/08 10:47:38
Modified: collections/src/test/org/apache/commons/collections
TestIteratorUtils.java
Log:
Update tests
Revision Changes Path
1.9 +55 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestIteratorUtils.java 2 Nov 2003 15:27:54 -0000 1.8
+++ TestIteratorUtils.java 8 Nov 2003 18:47:38 -0000 1.9
@@ -66,8 +66,12 @@
import junit.framework.Test;
+import org.apache.commons.collections.iterators.MapIterator;
+import org.apache.commons.collections.iterators.OrderedMapIterator;
import org.apache.commons.collections.iterators.ResetableIterator;
import org.apache.commons.collections.iterators.ResetableListIterator;
+import org.apache.commons.collections.iterators.ResetableMapIterator;
+import org.apache.commons.collections.iterators.ResetableOrderedMapIterator;
/**
* Tests for IteratorUtils.
@@ -429,6 +433,8 @@
* Test empty iterator
*/
public void testEmptyIterator() {
+ assertTrue(IteratorUtils.EMPTY_ITERATOR instanceof Iterator);
+ assertTrue(IteratorUtils.EMPTY_ITERATOR instanceof ResetableIterator);
assertEquals(false, IteratorUtils.EMPTY_ITERATOR.hasNext());
IteratorUtils.EMPTY_ITERATOR.reset();
assertSame(IteratorUtils.EMPTY_ITERATOR, IteratorUtils.EMPTY_ITERATOR);
@@ -448,6 +454,10 @@
* Test empty list iterator
*/
public void testEmptyListIterator() {
+ assertTrue(IteratorUtils.EMPTY_LIST_ITERATOR instanceof Iterator);
+ assertTrue(IteratorUtils.EMPTY_LIST_ITERATOR instanceof ListIterator);
+ assertTrue(IteratorUtils.EMPTY_LIST_ITERATOR instanceof ResetableIterator);
+ assertTrue(IteratorUtils.EMPTY_LIST_ITERATOR instanceof ResetableListIterator);
assertEquals(false, IteratorUtils.EMPTY_LIST_ITERATOR.hasNext());
assertEquals(0, IteratorUtils.EMPTY_LIST_ITERATOR.nextIndex());
assertEquals(-1, IteratorUtils.EMPTY_LIST_ITERATOR.previousIndex());
@@ -481,6 +491,10 @@
* Test empty map iterator
*/
public void testEmptyMapIterator() {
+ assertTrue(IteratorUtils.EMPTY_MAP_ITERATOR instanceof Iterator);
+ assertTrue(IteratorUtils.EMPTY_MAP_ITERATOR instanceof MapIterator);
+ assertTrue(IteratorUtils.EMPTY_MAP_ITERATOR instanceof ResetableIterator);
+ assertTrue(IteratorUtils.EMPTY_MAP_ITERATOR instanceof ResetableMapIterator);
assertEquals(false, IteratorUtils.EMPTY_MAP_ITERATOR.hasNext());
IteratorUtils.EMPTY_MAP_ITERATOR.reset();
assertSame(IteratorUtils.EMPTY_MAP_ITERATOR, IteratorUtils.EMPTY_MAP_ITERATOR);
@@ -505,8 +519,46 @@
IteratorUtils.EMPTY_MAP_ITERATOR.setValue(null);
fail();
} catch (IllegalStateException ex) {}
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Test empty map iterator
+ */
+ public void testEmptyOrderedMapIterator() {
+ assertTrue(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR instanceof Iterator);
+ assertTrue(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR instanceof MapIterator);
+ assertTrue(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR instanceof OrderedMapIterator);
+ assertTrue(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR instanceof ResetableIterator);
+ assertTrue(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR instanceof ResetableMapIterator);
+ assertTrue(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR instanceof ResetableOrderedMapIterator);
+ assertEquals(false, IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.hasNext());
+ assertEquals(false, IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.hasPrevious());
+ IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.reset();
+ assertSame(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR, IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR);
+ assertSame(IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR, IteratorUtils.emptyOrderedMapIterator());
+ try {
+ IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.next();
+ fail();
+ } catch (NoSuchElementException ex) {}
+ try {
+ IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.previous();
+ fail();
+ } catch (NoSuchElementException ex) {}
+ try {
+ IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.remove();
+ fail();
+ } catch (IllegalStateException ex) {}
+ try {
+ IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.getKey();
+ fail();
+ } catch (IllegalStateException ex) {}
+ try {
+ IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.getValue();
+ fail();
+ } catch (IllegalStateException ex) {}
try {
- IteratorUtils.EMPTY_MAP_ITERATOR.asMapEntry();
+ IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR.setValue(null);
fail();
} catch (IllegalStateException ex) {}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org