Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@apache.org Received: (qmail 6164 invoked from network); 25 Feb 2002 22:43:26 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 25 Feb 2002 22:43:26 -0000 Received: (qmail 29751 invoked by uid 97); 25 Feb 2002 22:43:28 -0000 Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org Received: (qmail 29729 invoked by uid 97); 25 Feb 2002 22:43:28 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 29716 invoked by uid 97); 25 Feb 2002 22:43:27 -0000 Date: 25 Feb 2002 22:43:04 -0000 Message-ID: <20020225224304.65951.qmail@icarus.apache.org> From: morgand@apache.org To: jakarta-commons-cvs@apache.org Subject: cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestIterator.java TestArrayIterator.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N morgand 02/02/25 14:43:04 Modified: collections/src/test/org/apache/commons/collections TestArrayIterator.java Added: collections/src/test/org/apache/commons/collections TestIterator.java Log: added base class for testing iterators Revision Changes Path 1.5 +125 -117 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TestArrayIterator.java 23 Aug 2001 10:50:01 -0000 1.4 +++ TestArrayIterator.java 25 Feb 2002 22:43:04 -0000 1.5 @@ -1,117 +1,125 @@ -/* - * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java,v 1.4 2001/08/23 10:50:01 jstrachan Exp $ - * $Revision: 1.4 $ - * $Date: 2001/08/23 10:50:01 $ - * - * ==================================================================== - * - * 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 - * . - * - */ - -package org.apache.commons.collections; - -import junit.framework.*; -import java.util.Iterator; -import java.util.NoSuchElementException; - -/** - * 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.4 2001/08/23 10:50:01 jstrachan Exp $ - */ -public class TestArrayIterator extends TestObject { - - protected String[] testArray = { - "One", "Two", "Three" - }; - - public static Test suite() { - return new TestSuite(TestArrayIterator.class); - } - - public TestArrayIterator(String testName) { - super(testName); - } - - /** - * Return a new, empty {@link Object} to used for testing. - */ - public Object makeObject() { - return new ArrayIterator( (Object[]) testArray ); - } - - public void testIterator() { - Iterator iter = (Iterator) makeObject(); - for ( int i = 0; i < testArray.length; i++ ) { - Object testValue = testArray[i]; - Object iterValue = 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/TestArrayIterator.java,v 1.5 2002/02/25 22:43:04 morgand Exp $ + * $Revision: 1.5 $ + * $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 + * . + * + */ + +package org.apache.commons.collections; + +import junit.framework.*; +import java.util.Iterator; +import java.util.NoSuchElementException; + +/** + * 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 $ + */ +public class TestArrayIterator extends TestIterator { + + protected String[] testArray = { + "One", "Two", "Three" + }; + + public static Test suite() { + return new TestSuite(TestArrayIterator.class); + } + + public TestArrayIterator(String testName) { + 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 makeFullIterator(); + } + + public void testIterator() { + Iterator iter = (Iterator) makeFullIterator(); + for ( int i = 0; i < testArray.length; i++ ) { + Object testValue = testArray[i]; + Object iterValue = 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.1 jakarta-commons/collections/src/test/org/apache/commons/collections/TestIterator.java Index: TestIterator.java =================================================================== /* * $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 $ * * ==================================================================== * * 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 * . * */ 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) { } } } -- To unsubscribe, e-mail: For additional commands, e-mail: