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

LANG-567 - ArrayUtils.addAll(T[] array1, T... array2) does not handle mixed types very well 

Also remove unnecessary main() and suite() from test class

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@892114 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2009-12-18 02:50:21 +00:00
parent eb2b517b46
commit 2f8f67ab29
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/commons/lang3/ArrayUtils.java
View File

@ -2956,10 +2956,19 @@ public static <T> T[] addAll(T[] array1, T... array2) {
} else if (array2 == null) { } else if (array2 == null) {
return clone(array1); return clone(array1);
} }
T[] joinedArray = (T[]) Array.newInstance(array1.getClass().getComponentType(), final Class<?> type1 = array1.getClass().getComponentType();
array1.length + array2.length); T[] joinedArray = (T[]) Array.newInstance(type1, array1.length + array2.length);
System.arraycopy(array1, 0, joinedArray, 0, array1.length); System.arraycopy(array1, 0, joinedArray, 0, array1.length);
try {
System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); System.arraycopy(array2, 0, joinedArray, array1.length, array2.length);
} catch (ArrayStoreException ase) {
// Check if problem is incompatible types
final Class<?> type2 = array2.getClass().getComponentType();
if (!type1.isAssignableFrom(type2)){
throw new IllegalArgumentException("Cannot store "+type2.getName()+" in an array of "+type1.getName());
}
throw ase; // No, so rethrow original
}
return joinedArray; return joinedArray;
} }

22
src/test/org/apache/commons/lang3/ArrayUtilsAddTest.java
View File

@ -19,10 +19,7 @@
import java.util.Arrays; import java.util.Arrays;
import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
/** /**
* Tests ArrayUtils add methods. * Tests ArrayUtils add methods.
@ -31,14 +28,19 @@
* @version $Id$ * @version $Id$
*/ */
public class ArrayUtilsAddTest extends TestCase { public class ArrayUtilsAddTest extends TestCase {
public static void main(String[] args) {
TestRunner.run(suite());
}
public static Test suite() { public void testJira567(){
TestSuite suite = new TestSuite(ArrayUtilsAddTest.class); Number[] n;
suite.setName("ArrayUtils add Tests"); // Valid array construction
return suite; n = ArrayUtils.addAll(new Number[]{Integer.valueOf(1)}, new Long[]{Long.valueOf(2)});
assertEquals(2,n.length);
assertEquals(Number.class,n.getClass().getComponentType());
try {
// Invalid - can't store Long in Integer array
n = ArrayUtils.addAll(new Integer[]{Integer.valueOf(1)}, new Long[]{Long.valueOf(2)});
fail("Should have generated IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
} }
public void testAddObjectArrayBoolean() { public void testAddObjectArrayBoolean() {