Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added base class for testing iterators, fixed odd line feeds in TestArrayIterator2 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130575 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Morgan James Delagrange 2002-02-25 22:48:52 +00:00
parent d3bc97b77e
commit f9c4fd7f26
3 changed files with 137 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/org/apache/commons/collections/TestArrayIterator.java
View File

@ -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.5 2002/02/25 22:43:04 morgand 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.6 2002/02/25 22:48:52 morgand Exp $
* $Revision: 1.5 $ * $Revision: 1.6 $
* $Date: 2002/02/25 22:43:04 $ * $Date: 2002/02/25 22:48:52 $
* *
* ==================================================================== * ====================================================================
* *
@ -69,10 +69,11 @@ import java.util.NoSuchElementException;
* Tests the ArrayIterator to ensure that the next() method will actually * Tests the ArrayIterator to ensure that the next() method will actually
* perform the iteration rather than the hasNext() method. * perform the iteration rather than the hasNext() method.
* The code of this test was supplied by Mauricio S. Moura * The code of this test was supplied by Mauricio S. Moura
* *
* @author James Strachan * @author James Strachan
* @author Mauricio S. Moura * @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 { public class TestArrayIterator extends TestIterator {

237
src/test/org/apache/commons/collections/TestArrayIterator2.java
View File

@ -1,114 +1,123 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestArrayIterator2.java,v 1.1 2001/08/23 12:04:40 jstrachan Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestArrayIterator2.java,v 1.2 2002/02/25 22:48:52 morgand Exp $
* $Revision: 1.1 $ * $Revision: 1.2 $
* $Date: 2001/08/23 12:04:40 $ * $Date: 2002/02/25 22:48:52 $
* *
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * distribution.
* *
* 3. The end-user documentation included with the redistribution, if * 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement: * any, must include the following acknowlegement:
* "This product includes software developed by the * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)." * Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself, * Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear. * if and wherever such third-party acknowlegements normally appear.
* *
* 4. The names "The Jakarta Project", "Commons", and "Apache Software * 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived * Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written * from this software without prior written permission. For written
* permission, please contact apache@apache.org. * permission, please contact apache@apache.org.
* *
* 5. Products derived from this software may not be called "Apache" * 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written * nor may "Apache" appear in their names without prior written
* permission of the Apache Group. * permission of the Apache Group.
* *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* ==================================================================== * ====================================================================
* *
* This software consists of voluntary contributions made by many * This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more * individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see * information on the Apache Software Foundation, please see
* <http://www.apache.org/>. * <http://www.apache.org/>.
* *
*/ */
package org.apache.commons.collections; package org.apache.commons.collections;
import junit.framework.*; import junit.framework.*;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
/** /**
* Tests the ArrayIterator with primitive type arrays * Tests the ArrayIterator with primitive type arrays
* *
* @author James Strachan * @author Morgan Delagrange
* @version $Id: TestArrayIterator2.java,v 1.1 2001/08/23 12:04:40 jstrachan Exp $ * @author James Strachan
*/ * @version $Id: TestArrayIterator2.java,v 1.2 2002/02/25 22:48:52 morgand Exp $
public class TestArrayIterator2 extends TestObject { */
public class TestArrayIterator2 extends TestIterator {
protected int[] testArray = {
2, 4, 6, 8 protected int[] testArray = {
}; 2, 4, 6, 8
};
public static Test suite() {
return new TestSuite(TestArrayIterator2.class); public static Test suite() {
} return new TestSuite(TestArrayIterator2.class);
}
public TestArrayIterator2(String testName) {
super(testName); public TestArrayIterator2(String testName) {
} super(testName);
}
/**
* Return a new, empty {@link Object} to used for testing. public Iterator makeEmptyIterator() {
*/ return new ArrayIterator(new int[0]);
public Object makeObject() { }
return new ArrayIterator( testArray );
} public Iterator makeFullIterator() {
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] ); * Return a new, empty {@link Object} to used for testing.
Number iterValue = (Number) iter.next(); */
public Object makeObject() {
assertEquals( "Iteration value is correct", testValue, iterValue ); return makeFullIterator();
} }
assertTrue("Iterator should now be empty", ! iter.hasNext() ); public void testIterator() {
Iterator iter = (Iterator) makeFullIterator();
try { for ( int i = 0; i < testArray.length; i++ ) {
Object testValue = iter.next(); Integer testValue = new Integer( testArray[i] );
} catch (Exception e) { Number iterValue = (Number) iter.next();
assertTrue("NoSuchElementException must be thrown",
e.getClass().equals((new NoSuchElementException()).getClass())); 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()));
}
}
}

11
src/test/org/apache/commons/collections/TestIterator.java
View File

@ -1,7 +1,7 @@
/* /*
* $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 $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestIterator.java,v 1.2 2002/02/25 22:48:52 morgand Exp $
* $Revision: 1.1 $ * $Revision: 1.2 $
* $Date: 2002/02/25 22:43:04 $ * $Date: 2002/02/25 22:48:52 $
* *
* ==================================================================== * ====================================================================
* *
@ -64,6 +64,11 @@ package org.apache.commons.collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
/**
* Base class for tetsing Iterator interface
*
* @author Morgan Delagrange
*/
public abstract class TestIterator extends TestObject { public abstract class TestIterator extends TestObject {
public TestIterator(String testName) { public TestIterator(String testName) {