Apache/commons-lang
1
0
Fork 0
mirror of https://github.com/apache/commons-lang.git synced 2025-02-07 02:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert r113289 - varargs invocation does not work with null

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1132658 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2011-06-06 14:24:21 +00:00
parent e909357fb4
commit 114e59cc83
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
View File

@ -301,8 +301,8 @@ public void test_isAssignable_ClassArray_ClassArray() throws Exception {
assertFalse(ClassUtils.isAssignable(null, array2)); assertFalse(ClassUtils.isAssignable(null, array2));
assertTrue(ClassUtils.isAssignable(null, array0)); assertTrue(ClassUtils.isAssignable(null, array0));
assertTrue(ClassUtils.isAssignable(array0, array0)); assertTrue(ClassUtils.isAssignable(array0, array0));
assertTrue(ClassUtils.isAssignable(array0, (Class<?>[]) null)); // test both types of ... // assertTrue(ClassUtils.isAssignable(array0, null));
assertTrue(ClassUtils.isAssignable(array0, (Class<?>) null)); // ... varargs invocation assertTrue(ClassUtils.isAssignable(array0, (Class<?>[]) null)); // explicit cast to avoid warning
assertTrue(ClassUtils.isAssignable((Class[]) null, (Class[]) null)); assertTrue(ClassUtils.isAssignable((Class[]) null, (Class[]) null));
assertFalse(ClassUtils.isAssignable(array1, array1s)); assertFalse(ClassUtils.isAssignable(array1, array1s));
@ -730,8 +730,8 @@ public void testPrimitiveToWrapper() {
public void testPrimitivesToWrappers() { public void testPrimitivesToWrappers() {
// test null // test null
assertNull("null -> null", ClassUtils.primitivesToWrappers((Class<?>[]) null)); // test both types of ... // assertNull("null -> null", ClassUtils.primitivesToWrappers(null));
assertNull("null -> null", ClassUtils.primitivesToWrappers((Class<?>) null)); // ... varargs invocation assertNull("null -> null", ClassUtils.primitivesToWrappers((Class<?>[]) null)); // explicit cast to avoid warning
// test empty array // test empty array
assertEquals("empty -> empty", assertEquals("empty -> empty",
ArrayUtils.EMPTY_CLASS_ARRAY, ClassUtils.primitivesToWrappers(ArrayUtils.EMPTY_CLASS_ARRAY)); ArrayUtils.EMPTY_CLASS_ARRAY, ClassUtils.primitivesToWrappers(ArrayUtils.EMPTY_CLASS_ARRAY));
@ -801,9 +801,8 @@ public void testWrappersToPrimitives() {
} }
public void testWrappersToPrimitivesNull() { public void testWrappersToPrimitivesNull() {
// Test both types of varargs invocation // assertNull("Wrong result for null input", ClassUtils.wrappersToPrimitives(null));
assertNull("Wrong result for null input", ClassUtils.wrappersToPrimitives((Class<?>[]) null)); assertNull("Wrong result for null input", ClassUtils.wrappersToPrimitives((Class<?>[]) null)); // explicit cast
assertNull("Wrong result for null input", ClassUtils.wrappersToPrimitives((Class<?>) null));
} }
public void testWrappersToPrimitivesEmpty() { public void testWrappersToPrimitivesEmpty() {
@ -958,9 +957,8 @@ public void testGetPublicMethod() throws Exception {
} }
public void testToClass_object() { public void testToClass_object() {
// Test both types of varargs invocation // assertNull(ClassUtils.toClass(null));
assertNull(ClassUtils.toClass((Object[]) null)); assertNull(ClassUtils.toClass((Object[]) null)); // explicit cast
assertNull(ClassUtils.toClass((Object) null));
assertSame(ArrayUtils.EMPTY_CLASS_ARRAY, ClassUtils.toClass(ArrayUtils.EMPTY_OBJECT_ARRAY)); assertSame(ArrayUtils.EMPTY_CLASS_ARRAY, ClassUtils.toClass(ArrayUtils.EMPTY_OBJECT_ARRAY));

5
src/test/java/org/apache/commons/lang3/StringUtilsTest.java
View File

@ -174,9 +174,8 @@ public void testJoin_Objects() {
} }
public void testJoin_Objectarray() { public void testJoin_Objectarray() {
// Test both types of varargs invocation // assertEquals(null, StringUtils.join(null));
assertEquals(null, StringUtils.join((Object[]) null)); assertEquals(null, StringUtils.join((Object[]) null)); // explicit cast
assertEquals(null, StringUtils.join((Object) null));
assertEquals("", StringUtils.join(EMPTY_ARRAY_LIST)); assertEquals("", StringUtils.join(EMPTY_ARRAY_LIST));
assertEquals("", StringUtils.join(NULL_ARRAY_LIST)); assertEquals("", StringUtils.join(NULL_ARRAY_LIST));
assertEquals("abc", StringUtils.join(new String[] {"a", "b", "c"})); assertEquals("abc", StringUtils.join(new String[] {"a", "b", "c"}));

5
src/test/java/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java
View File

@ -230,9 +230,8 @@ public void testStripAll() {
String[] fooDots = new String[] { ".."+FOO+"..", ".."+FOO, FOO+".." }; String[] fooDots = new String[] { ".."+FOO+"..", ".."+FOO, FOO+".." };
String[] foo = new String[] { FOO, FOO, FOO }; String[] foo = new String[] { FOO, FOO, FOO };
// Test both varargs invocations // assertEquals(null, StringUtils.stripAll(null));
assertEquals(null, StringUtils.stripAll((String[]) null)); assertEquals(null, StringUtils.stripAll((String[]) null)); // explicit cast
assertEquals(null, StringUtils.stripAll((String) null));
assertArrayEquals(empty, StringUtils.stripAll(empty)); assertArrayEquals(empty, StringUtils.stripAll(empty));
assertArrayEquals(foo, StringUtils.stripAll(fooSpace)); assertArrayEquals(foo, StringUtils.stripAll(fooSpace));