You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mo...@apache.org on 2002/02/25 23:48:52 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestArrayIterator.java TestArrayIterator2.java TestIterator.java
morgand 02/02/25 14:48:52
Modified: collections/src/test/org/apache/commons/collections
TestArrayIterator.java TestArrayIterator2.java
TestIterator.java
Log:
added base class for testing iterators, fixed odd line feeds in TestArrayIterator2
Revision Changes Path
1.6 +6 -5 jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java
Index: TestArrayIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestArrayIterator.java 25 Feb 2002 22:43:04 -0000 1.5
+++ TestArrayIterator.java 25 Feb 2002 22:48:52 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java,v 1.5 2002/02/25 22:43:04 morgand Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/25 22:43:04 $
+ * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java,v 1.6 2002/02/25 22:48:52 morgand Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/25 22:48:52 $
*
* ====================================================================
*
@@ -69,10 +69,11 @@
* Tests the ArrayIterator to ensure that the next() method will actually
* perform the iteration rather than the hasNext() method.
* The code of this test was supplied by Mauricio S. Moura
- *
+ *
* @author James Strachan
* @author Mauricio S. Moura
- * @version $Id: TestArrayIterator.java,v 1.5 2002/02/25 22:43:04 morgand Exp $
+ * @author Morgan Delagrange
+ * @version $Id: TestArrayIterator.java,v 1.6 2002/02/25 22:48:52 morgand Exp $
*/
public class TestArrayIterator extends TestIterator {
1.2 +123 -114 jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator2.java
Index: TestArrayIterator2.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestArrayIterator2.java 23 Aug 2001 12:04:40 -0000 1.1
+++ TestArrayIterator2.java 25 Feb 2002 22:48:52 -0000 1.2
@@ -1,114 +1,123 @@
-/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator2.java,v 1.1 2001/08/23 12:04:40 jstrachan Exp $
- * $Revision: 1.1 $
- * $Date: 2001/08/23 12:04:40 $
- *
- * ====================================================================
- *
- * 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 junit.framework.*;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * Tests the ArrayIterator with primitive type arrays
- *
- * @author James Strachan
- * @version $Id: TestArrayIterator2.java,v 1.1 2001/08/23 12:04:40 jstrachan Exp $
- */
-public class TestArrayIterator2 extends TestObject {
-
- protected int[] testArray = {
- 2, 4, 6, 8
- };
-
- public static Test suite() {
- return new TestSuite(TestArrayIterator2.class);
- }
-
- public TestArrayIterator2(String testName) {
- super(testName);
- }
-
- /**
- * Return a new, empty {@link Object} to used for testing.
- */
- public Object makeObject() {
- return new ArrayIterator( testArray );
- }
-
- public void testIterator() {
- Iterator iter = (Iterator) makeObject();
- for ( int i = 0; i < testArray.length; i++ ) {
- Integer testValue = new Integer( testArray[i] );
- Number iterValue = (Number) iter.next();
-
- assertEquals( "Iteration value is correct", testValue, iterValue );
- }
-
- assertTrue("Iterator should now be empty", ! iter.hasNext() );
-
- try {
- Object testValue = iter.next();
- } catch (Exception e) {
- assertTrue("NoSuchElementException must be thrown",
- e.getClass().equals((new NoSuchElementException()).getClass()));
- }
- }
-}
-
+/*
+ * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator2.java,v 1.2 2002/02/25 22:48:52 morgand Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/25 22:48:52 $
+ *
+ * ====================================================================
+ *
+ * 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 junit.framework.*;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * Tests the ArrayIterator with primitive type arrays
+ *
+ * @author Morgan Delagrange
+ * @author James Strachan
+ * @version $Id: TestArrayIterator2.java,v 1.2 2002/02/25 22:48:52 morgand Exp $
+ */
+public class TestArrayIterator2 extends TestIterator {
+
+ protected int[] testArray = {
+ 2, 4, 6, 8
+ };
+
+ public static Test suite() {
+ return new TestSuite(TestArrayIterator2.class);
+ }
+
+ public TestArrayIterator2(String testName) {
+ super(testName);
+ }
+
+ public Iterator makeEmptyIterator() {
+ return new ArrayIterator(new int[0]);
+ }
+
+ public Iterator makeFullIterator() {
+ return new ArrayIterator(testArray);
+ }
+
+ /**
+ * Return a new, empty {@link Object} to used for testing.
+ */
+ public Object makeObject() {
+ return makeFullIterator();
+ }
+
+ public void testIterator() {
+ Iterator iter = (Iterator) makeFullIterator();
+ for ( int i = 0; i < testArray.length; i++ ) {
+ Integer testValue = new Integer( testArray[i] );
+ Number iterValue = (Number) iter.next();
+
+ assertEquals( "Iteration value is correct", testValue, iterValue );
+ }
+
+ assertTrue("Iterator should now be empty", ! iter.hasNext() );
+
+ try {
+ Object testValue = iter.next();
+ } catch (Exception e) {
+ assertTrue("NoSuchElementException must be thrown",
+ e.getClass().equals((new NoSuchElementException()).getClass()));
+ }
+ }
+}
+
1.2 +8 -3 jakarta-commons/collections/src/test/org/apache/commons/collections/TestIterator.java
Index: TestIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestIterator.java 25 Feb 2002 22:43:04 -0000 1.1
+++ TestIterator.java 25 Feb 2002 22:48:52 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestIterator.java,v 1.1 2002/02/25 22:43:04 morgand Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/25 22:43:04 $
+ * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestIterator.java,v 1.2 2002/02/25 22:48:52 morgand Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/25 22:48:52 $
*
* ====================================================================
*
@@ -64,6 +64,11 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
+/**
+ * Base class for tetsing Iterator interface
+ *
+ * @author Morgan Delagrange
+ */
public abstract class TestIterator extends TestObject {
public TestIterator(String testName) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>