Author: rwaldhoff Date: Mon Jan 31 16:38:33 2005 New Revision: 149332 URL: http://svn.apache.org/viewcvs?view=rev&rev=149332 Log: add array constructor and tests
Modified: jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedByteList.java jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedIntList.java jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedShortList.java jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java Modified: jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedByteList.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedByteList.java?view=diff&r1=149331&r2=149332 ============================================================================== --- jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedByteList.java (original) +++ jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedByteList.java Mon Jan 31 16:38:33 2005 @@ -34,7 +34,7 @@ * This implementation supports all optional methods. * * @since Commons Primitives 1.0 - * @version $Revision: 1.5 $ $Date: 2004/02/25 20:46:25 $ + * @version $Revision: 1.5 $ $Date$ * * @author Rodney Waldhoff */ @@ -78,6 +78,20 @@ addAll(that); } + /** + * Constructs a list by copying the specified array. + * + * @param array the array to initialize the collection with + * @throws NullPointerException if the array is <code>null</code> + */ + public ArrayUnsignedByteList(short[] array) { + this(array.length); + for(int i=0;i<array.length;i++) { + _data[i] = fromShort(array[i]); + } + _size = array.length; + } + // ShortList methods //------------------------------------------------------------------------- Modified: jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedIntList.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedIntList.java?view=diff&r1=149331&r2=149332 ============================================================================== --- jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedIntList.java (original) +++ jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedIntList.java Mon Jan 31 16:38:33 2005 @@ -34,7 +34,7 @@ * This implementation supports all optional methods. * * @since Commons Primitives 1.0 - * @version $Revision: 1.5 $ $Date: 2004/02/25 20:46:25 $ + * @version $Revision: 1.5 $ $Date$ * * @author Rodney Waldhoff */ @@ -78,6 +78,20 @@ addAll(that); } + /** + * Constructs a list by copying the specified array. + * + * @param array the array to initialize the collection with + * @throws NullPointerException if the array is <code>null</code> + */ + public ArrayUnsignedIntList(long[] array) { + this(array.length); + for(int i=0;i<array.length;i++) { + _data[i] = fromLong(array[i]); + } + _size = array.length; + } + // IntList methods //------------------------------------------------------------------------- Modified: jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedShortList.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedShortList.java?view=diff&r1=149331&r2=149332 ============================================================================== --- jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedShortList.java (original) +++ jakarta/commons/proper/primitives/trunk/src/java/org/apache/commons/collections/primitives/ArrayUnsignedShortList.java Mon Jan 31 16:38:33 2005 @@ -34,7 +34,7 @@ * This implementation supports all optional methods. * * @since Commons Primitives 1.0 - * @version $Revision: 1.5 $ $Date: 2004/02/25 20:46:25 $ + * @version $Revision: 1.5 $ $Date$ * * @author Rodney Waldhoff */ @@ -78,6 +78,20 @@ addAll(that); } + /** + * Constructs a list by copying the specified array. + * + * @param array the array to initialize the collection with + * @throws NullPointerException if the array is <code>null</code> + */ + public ArrayUnsignedShortList(int[] array) { + this(array.length); + for(int i=0;i<array.length;i++) { + _data[i] = fromInt(array[i]); + } + _size = array.length; + } + // IntList methods //------------------------------------------------------------------------- Modified: jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java?view=diff&r1=149331&r2=149332 ============================================================================== --- jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java (original) +++ jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedByteList.java Mon Jan 31 16:38:33 2005 @@ -21,7 +21,7 @@ import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2004/02/25 20:46:30 $ + * @version $Revision: 1.3 $ $Date$ * @author Rodney Waldhoff */ public class TestArrayUnsignedByteList extends TestShortList { @@ -70,6 +70,16 @@ // tests // ------------------------------------------------------------------------ + public void testArrayConstructor() { + short[] data = new short[] { 1, 2, 3 }; + ShortList list = new ArrayUnsignedByteList(data); + for(int i=0;i<data.length;i++) { + assertEquals(data[i],list.get(i)); + } + data[0] = 17; + assertEquals(1,list.get(0)); + } + // @TODO need to add serialized form to cvs public void testCanonicalEmptyCollectionExists() { // XXX FIX ME XXX @@ -134,7 +144,7 @@ public void testCopyConstructorWithNull() { try { - new ArrayUnsignedByteList(null); + new ArrayUnsignedByteList((ShortList)null); fail("Expected NullPointerException"); } catch(NullPointerException e) { // expected Modified: jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java?view=diff&r1=149331&r2=149332 ============================================================================== --- jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java (original) +++ jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedIntList.java Mon Jan 31 16:38:33 2005 @@ -21,7 +21,7 @@ import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2004/02/25 20:46:30 $ + * @version $Revision: 1.3 $ $Date$ * @author Rodney Waldhoff */ public class TestArrayUnsignedIntList extends TestLongList { @@ -70,6 +70,16 @@ // tests // ------------------------------------------------------------------------ + public void testArrayConstructor() { + long[] data = new long[] { 1, 2, 3 }; + LongList list = new ArrayUnsignedIntList(data); + for(int i=0;i<data.length;i++) { + assertEquals(data[i],list.get(i)); + } + data[0] = 17; + assertEquals(1,list.get(0)); + } + // @TODO need to add serialized form to cvs public void testCanonicalEmptyCollectionExists() { // XXX FIX ME XXX @@ -134,7 +144,7 @@ public void testCopyConstructorWithNull() { try { - new ArrayUnsignedIntList(null); + new ArrayUnsignedIntList((LongList)null); fail("Expected NullPointerException"); } catch(NullPointerException e) { // expected Modified: jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java?view=diff&r1=149331&r2=149332 ============================================================================== --- jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java (original) +++ jakarta/commons/proper/primitives/trunk/src/test/org/apache/commons/collections/primitives/TestArrayUnsignedShortList.java Mon Jan 31 16:38:33 2005 @@ -21,7 +21,7 @@ import org.apache.commons.collections.BulkTest; /** - * @version $Revision: 1.3 $ $Date: 2004/02/25 20:46:30 $ + * @version $Revision: 1.3 $ $Date$ * @author Rodney Waldhoff */ public class TestArrayUnsignedShortList extends TestIntList { @@ -62,6 +62,16 @@ // tests // ------------------------------------------------------------------------ + public void testArrayConstructor() { + int[] data = new int[] { 1, 2, 3 }; + IntList list = new ArrayUnsignedShortList(data); + for(int i=0;i<data.length;i++) { + assertEquals(data[i],list.get(i)); + } + data[0] = 17; + assertEquals(1,list.get(0)); + } + // @TODO need to add serialized form to cvs public void testCanonicalEmptyCollectionExists() { // XXX FIX ME XXX @@ -126,7 +136,7 @@ public void testCopyConstructorWithNull() { try { - new ArrayUnsignedShortList(null); + new ArrayUnsignedShortList((IntList)null); fail("Expected NullPointerException"); } catch(NullPointerException e) { // expected --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]