jstrachan 01/08/23 05:04:40
Modified: collections/src/java/org/apache/commons/collections
ArrayIterator.java
collections/src/test/org/apache/commons/collections
TestAll.java
Added: collections/src/test/org/apache/commons/collections
TestArrayIterator2.java
Log:
Patched ArrayIterator to use java.lang.reflect.Array so that it can support arrays
of primitive types such as int[]
Revision Changes Path
1.6 +8 -7
jakarta-commons/collections/src/java/org/apache/commons/collections/ArrayIterator.java
Index: ArrayIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/ArrayIterator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ArrayIterator.java 2001/08/23 10:50:01 1.5
+++ ArrayIterator.java 2001/08/23 12:04:40 1.6
@@ -7,6 +7,7 @@
*/
package org.apache.commons.collections;
+import java.lang.reflect.Array;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -15,32 +16,32 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
* @author Mauricio S. Moura
* @
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class ArrayIterator implements Iterator {
- private Object[] array;
+ private Object array;
private int index = 0;
public ArrayIterator() {
}
- public ArrayIterator(Object[] array) {
+ public ArrayIterator(Object array) {
this.array = array;
}
// Iterator interface
//-------------------------------------------------------------------------
public boolean hasNext() {
- return index < array.length;
+ return index < Array.getLength( array );
}
public Object next() {
if(!hasNext()) {
throw new NoSuchElementException();
}
- return array[ index++ ];
+ return Array.get( array, index++ );
}
public void remove() {
@@ -49,11 +50,11 @@
// Properties
//-------------------------------------------------------------------------
- public Object[] getArray() {
+ public Object getArray() {
return array;
}
- public void setArray( Object[] array ) {
+ public void setArray( Object array ) {
this.array = array;
this.index = -1;
}
1.10 +5 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/TestAll.java
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestAll.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestAll.java 2001/08/22 10:05:38 1.9
+++ TestAll.java 2001/08/23 12:04:40 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestAll.java,v
1.9 2001/08/22 10:05:38 jstrachan Exp $
- * $Revision: 1.9 $
- * $Date: 2001/08/22 10:05:38 $
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestAll.java,v
1.10 2001/08/23 12:04:40 jstrachan Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/08/23 12:04:40 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
/**
* Entry point for all Collections tests.
* @author Rodney Waldhoff
- * @version $Id: TestAll.java,v 1.9 2001/08/22 10:05:38 jstrachan Exp $
+ * @version $Id: TestAll.java,v 1.10 2001/08/23 12:04:40 jstrachan Exp $
*/
public class TestAll extends TestCase {
public TestAll(String testName) {
@@ -76,6 +76,7 @@
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(TestArrayIterator.suite());
+ suite.addTest(TestArrayIterator2.suite());
suite.addTest(TestArrayList.suite());
suite.addTest(TestArrayStack.suite());
suite.addTest(TestCollectionUtils.suite());
1.1
jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator2.java
Index: TestArrayIterator2.java
===================================================================
/*
* $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 [EMAIL PROTECTED]
*
* 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()));
}
}
}
