added base class for testing iterators

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130574 13f79535-47bb-0310-9956-ffa450edef68

src/test/org/apache/commons/collections/TestArrayIterator.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/TestArrayIterator.java,v 1.4 2001/08/23 10:50:01 jstrachan Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestArrayIterator.java,v 1.5 2002/02/25 22:43:04 morgand Exp $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
- * $Date: 2001/08/23 10:50:01 $
+ * $Date: 2002/02/25 22:43:04 $
  *
  * ====================================================================
  *
@@ -72,9 +72,9 @@ import java.util.NoSuchElementException;
  *
  * @author James Strachan
  * @author Mauricio S. Moura
- * @version $Id: TestArrayIterator.java,v 1.4 2001/08/23 10:50:01 jstrachan Exp $
+ * @version $Id: TestArrayIterator.java,v 1.5 2002/02/25 22:43:04 morgand Exp $
  */
-public class TestArrayIterator extends TestObject {
+public class TestArrayIterator extends TestIterator {
     
     protected String[] testArray = {
         "One", "Two", "Three"
@@ -88,15 +88,23 @@ public class TestArrayIterator extends TestObject {
         super(testName);
     }
 
+    public Iterator makeEmptyIterator() {
+        return new ArrayIterator(new Object[0]);
+    }
+
+    public Iterator makeFullIterator() {
+        return new ArrayIterator(testArray);
+    }
+    
     /**
      * Return a new, empty {@link Object} to used for testing.
      */
     public Object makeObject() {
-        return new ArrayIterator( (Object[]) testArray );
+        return makeFullIterator();
     }
     
     public void testIterator() {
-        Iterator iter = (Iterator) makeObject();
+        Iterator iter = (Iterator) makeFullIterator();
         for ( int i = 0; i < testArray.length; i++ ) {
             Object testValue = testArray[i];            
             Object iterValue = iter.next();

src/test/org/apache/commons/collections/TestIterator.java

@@ -0,0 +1,115 @@
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestIterator.java,v 1.1 2002/02/25 22:43:04 morgand Exp $
+ * $Revision: 1.1 $
+ * $Date: 2002/02/25 22:43:04 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+     
+package org.apache.commons.collections;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public abstract class TestIterator extends TestObject {
+
+    public TestIterator(String testName) {
+        super(testName);
+    }
+
+    public abstract Iterator makeEmptyIterator();
+
+    public abstract Iterator makeFullIterator();
+
+
+    /**
+     * Should throw a NoSuchElementException.
+     */
+    public void testEmptyIterator() {
+        Iterator iter = makeEmptyIterator();
+        try {
+	    iter.next();
+            fail("NoSuchElementException must be thrown when Iterator is exhausted");
+	} catch (NoSuchElementException e) {
+	}
+    }
+
+    /**
+     * NoSuchElementException (or any other exception)
+     * should not be thrown for the first element.  
+     * NoSuchElementException must be thrown when
+     * hasNext() returns false
+     */
+    public void testFullIterator() {
+        Iterator iter = makeFullIterator();
+        try {
+	    iter.next();
+	} catch (NoSuchElementException e) {
+            fail("Full iterators must have at least one element");
+	}
+
+        while (iter.hasNext()) {
+            iter.next();
+        }
+
+        try {
+	    iter.next();
+            fail("NoSuchElementException must be thrown when Iterator is exhausted");
+	} catch (NoSuchElementException e) {
+	}
+    }
+
+}