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

Remove redundant casts (closes #235) 

Remove redundant casts throughout the codebase to make it cleaner and easier to read.
This commit is contained in:
Allon Mureinik 2017-02-12 20:35:48 +02:00 committed by pascalschumacher
parent 5bdf0a938a
commit ce1bd5785d
28 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
View File

@ -183,7 +183,7 @@ public static Throwable getCause(final Throwable throwable, String[] methodNames
*/ */
public static Throwable getRootCause(final Throwable throwable) { public static Throwable getRootCause(final Throwable throwable) {
final List<Throwable> list = getThrowableList(throwable); final List<Throwable> list = getThrowableList(throwable);
return list.size() < 2 ? null : (Throwable)list.get(list.size() - 1); return list.size() < 2 ? null : list.get(list.size() - 1);
} }
/** /**

2
src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
View File

@ -1687,7 +1687,7 @@ public static String toString(final Type type) {
public static String toLongString(final TypeVariable<?> var) { public static String toLongString(final TypeVariable<?> var) {
Validate.notNull(var, "var is null"); Validate.notNull(var, "var is null");
final StringBuilder buf = new StringBuilder(); final StringBuilder buf = new StringBuilder();
final GenericDeclaration d = ((TypeVariable<?>) var).getGenericDeclaration(); final GenericDeclaration d = var.getGenericDeclaration();
if (d instanceof Class<?>) { if (d instanceof Class<?>) {
Class<?> c = (Class<?>) d; Class<?> c = (Class<?>) d;
while (true) { while (true) {

2
src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
View File

@ -241,7 +241,7 @@ public static String replaceSystemProperties(final Object source) {
* and the escaping character. * and the escaping character.
*/ */
public StrSubstitutor() { public StrSubstitutor() {
this((StrLookup<?>) null, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE); this(null, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
} }
/** /**

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

@ -51,10 +51,10 @@ public void testJira567(){
@Test @Test
public void testAddObjectArrayBoolean() { public void testAddObjectArrayBoolean() {
boolean[] newArray; boolean[] newArray;
newArray = ArrayUtils.add((boolean[])null, false); newArray = ArrayUtils.add(null, false);
assertTrue(Arrays.equals(new boolean[]{false}, newArray)); assertTrue(Arrays.equals(new boolean[]{false}, newArray));
assertEquals(Boolean.TYPE, newArray.getClass().getComponentType()); assertEquals(Boolean.TYPE, newArray.getClass().getComponentType());
newArray = ArrayUtils.add((boolean[])null, true); newArray = ArrayUtils.add(null, true);
assertTrue(Arrays.equals(new boolean[]{true}, newArray)); assertTrue(Arrays.equals(new boolean[]{true}, newArray));
assertEquals(Boolean.TYPE, newArray.getClass().getComponentType()); assertEquals(Boolean.TYPE, newArray.getClass().getComponentType());
final boolean[] array1 = new boolean[]{true, false, true}; final boolean[] array1 = new boolean[]{true, false, true};
@ -249,7 +249,7 @@ public void testLANG571(){
@Test @Test
public void testAddObjectArrayToObjectArray() { public void testAddObjectArrayToObjectArray() {
assertNull(ArrayUtils.addAll((Object[]) null, (Object[]) null)); assertNull(ArrayUtils.addAll(null, (Object[]) null));
Object[] newArray; Object[] newArray;
final String[] stringArray1 = new String[]{"a", "b", "c"}; final String[] stringArray1 = new String[]{"a", "b", "c"};
final String[] stringArray2 = new String[]{"1", "2", "3"}; final String[] stringArray2 = new String[]{"1", "2", "3"};
@ -586,7 +586,7 @@ public void testAddObjectAtIndex() {
double[] doubleArray = ArrayUtils.add( new double[] { 1.1 }, 0, 2.2); double[] doubleArray = ArrayUtils.add( new double[] { 1.1 }, 0, 2.2);
assertTrue( Arrays.equals( new double[] { 2.2, 1.1 }, doubleArray ) ); assertTrue( Arrays.equals( new double[] { 2.2, 1.1 }, doubleArray ) );
try { try {
doubleArray = ArrayUtils.add( (double[]) null, -1, 2.2); doubleArray = ArrayUtils.add(null, -1, 2.2);
} catch(final IndexOutOfBoundsException e) { } catch(final IndexOutOfBoundsException e) {
assertEquals("Index: -1, Length: 0", e.getMessage()); assertEquals("Index: -1, Length: 0", e.getMessage());
} }

2
src/test/java/org/apache/commons/lang3/ArrayUtilsInsertTest.java
View File

@ -323,7 +323,7 @@ public void testInsertGenericArray() throws Exception {
assertNull(ArrayUtils.insert(42, null, array)); assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new String[0], ArrayUtils.insert(0, new String[0], (String[]) null)); assertArrayEquals(new String[0], ArrayUtils.insert(0, new String[0], (String[]) null));
assertNull(ArrayUtils.insert(42, (String[]) null, (String[]) null)); assertNull(ArrayUtils.insert(42, null, (String[]) null));
try { try {
ArrayUtils.insert(-1, array, array); ArrayUtils.insert(-1, array, array);

6
src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
View File

@ -311,7 +311,7 @@ public void testRemoveShortArray() {
@Test @Test
public void testRemoveElementObjectArray() { public void testRemoveElementObjectArray() {
Object[] array; Object[] array;
array = ArrayUtils.removeElement((Object[]) null, "a"); array = ArrayUtils.removeElement(null, "a");
assertNull(array); assertNull(array);
array = ArrayUtils.removeElement(ArrayUtils.EMPTY_OBJECT_ARRAY, "a"); array = ArrayUtils.removeElement(ArrayUtils.EMPTY_OBJECT_ARRAY, "a");
assertTrue(Arrays.equals(ArrayUtils.EMPTY_OBJECT_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_OBJECT_ARRAY, array));
@ -330,7 +330,7 @@ public void testRemoveElementObjectArray() {
@Test @Test
public void testRemoveElementBooleanArray() { public void testRemoveElementBooleanArray() {
boolean[] array; boolean[] array;
array = ArrayUtils.removeElement((boolean[]) null, true); array = ArrayUtils.removeElement(null, true);
assertNull(array); assertNull(array);
array = ArrayUtils.removeElement(ArrayUtils.EMPTY_BOOLEAN_ARRAY, true); array = ArrayUtils.removeElement(ArrayUtils.EMPTY_BOOLEAN_ARRAY, true);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array));
@ -388,7 +388,7 @@ public void testRemoveElementCharArray() {
@SuppressWarnings("cast") @SuppressWarnings("cast")
public void testRemoveElementDoubleArray() { public void testRemoveElementDoubleArray() {
double[] array; double[] array;
array = ArrayUtils.removeElement((double[]) null, (double) 1); array = ArrayUtils.removeElement(null, (double) 1);
assertNull(array); assertNull(array);
array = ArrayUtils.removeElement(ArrayUtils.EMPTY_DOUBLE_ARRAY, (double) 1); array = ArrayUtils.removeElement(ArrayUtils.EMPTY_DOUBLE_ARRAY, (double) 1);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array));

62
src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
View File

@ -3842,10 +3842,10 @@ public void testIndexOfDoubleTolerance() {
array = new double[0]; array = new double[0];
assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, (double) 0)); assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, (double) 0));
array = new double[] { 0, 1, 2, 3, 0 }; array = new double[] { 0, 1, 2, 3, 0 };
assertEquals(0, ArrayUtils.indexOf(array, (double) 0, (double) 0.3)); assertEquals(0, ArrayUtils.indexOf(array, (double) 0, 0.3));
assertEquals(2, ArrayUtils.indexOf(array, (double) 2.2, (double) 0.35)); assertEquals(2, ArrayUtils.indexOf(array, 2.2, 0.35));
assertEquals(3, ArrayUtils.indexOf(array, (double) 4.15, (double) 2.0)); assertEquals(3, ArrayUtils.indexOf(array, 4.15, 2.0));
assertEquals(1, ArrayUtils.indexOf(array, (double) 1.00001324, (double) 0.0001)); assertEquals(1, ArrayUtils.indexOf(array, 1.00001324, 0.0001));
} }
@SuppressWarnings("cast") @SuppressWarnings("cast")
@ -3872,14 +3872,14 @@ public void testIndexOfDoubleWithStartIndexTolerance() {
array = new double[0]; array = new double[0];
assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 2, (double) 0)); assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 2, (double) 0));
array = new double[] { 0, 1, 2, 3, 0 }; array = new double[] { 0, 1, 2, 3, 0 };
assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 99, (double) 0.3)); assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 99, 0.3));
assertEquals(0, ArrayUtils.indexOf(array, (double) 0, 0, (double) 0.3)); assertEquals(0, ArrayUtils.indexOf(array, (double) 0, 0, 0.3));
assertEquals(4, ArrayUtils.indexOf(array, (double) 0, 3, (double) 0.3)); assertEquals(4, ArrayUtils.indexOf(array, (double) 0, 3, 0.3));
assertEquals(2, ArrayUtils.indexOf(array, (double) 2.2, 0, (double) 0.35)); assertEquals(2, ArrayUtils.indexOf(array, 2.2, 0, 0.35));
assertEquals(3, ArrayUtils.indexOf(array, (double) 4.15, 0, (double) 2.0)); assertEquals(3, ArrayUtils.indexOf(array, 4.15, 0, 2.0));
assertEquals(1, ArrayUtils.indexOf(array, (double) 1.00001324, 0, (double) 0.0001)); assertEquals(1, ArrayUtils.indexOf(array, 1.00001324, 0, 0.0001));
assertEquals(3, ArrayUtils.indexOf(array, (double) 4.15, -1, (double) 2.0)); assertEquals(3, ArrayUtils.indexOf(array, 4.15, -1, 2.0));
assertEquals(1, ArrayUtils.indexOf(array, (double) 1.00001324, -300, (double) 0.0001)); assertEquals(1, ArrayUtils.indexOf(array, 1.00001324, -300, 0.0001));
} }
@SuppressWarnings("cast") @SuppressWarnings("cast")
@ -3905,10 +3905,10 @@ public void testLastIndexOfDoubleTolerance() {
array = new double[0]; array = new double[0];
assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0, (double) 0)); assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0, (double) 0));
array = new double[] { 0, 1, 2, 3, 0 }; array = new double[] { 0, 1, 2, 3, 0 };
assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0, (double) 0.3)); assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0, 0.3));
assertEquals(2, ArrayUtils.lastIndexOf(array, (double) 2.2, (double) 0.35)); assertEquals(2, ArrayUtils.lastIndexOf(array, 2.2, 0.35));
assertEquals(3, ArrayUtils.lastIndexOf(array, (double) 4.15, (double) 2.0)); assertEquals(3, ArrayUtils.lastIndexOf(array, 4.15, 2.0));
assertEquals(1, ArrayUtils.lastIndexOf(array, (double) 1.00001324, (double) 0.0001)); assertEquals(1, ArrayUtils.lastIndexOf(array, 1.00001324, 0.0001));
} }
@SuppressWarnings("cast") @SuppressWarnings("cast")
@ -3938,12 +3938,12 @@ public void testLastIndexOfDoubleWithStartIndexTolerance() {
array = new double[] { (double) 3 }; array = new double[] { (double) 3 };
assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 1, 0, (double) 0)); assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 1, 0, (double) 0));
array = new double[] { 0, 1, 2, 3, 0 }; array = new double[] { 0, 1, 2, 3, 0 };
assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0, 99, (double) 0.3)); assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0, 99, 0.3));
assertEquals(0, ArrayUtils.lastIndexOf(array, (double) 0, 3, (double) 0.3)); assertEquals(0, ArrayUtils.lastIndexOf(array, (double) 0, 3, 0.3));
assertEquals(2, ArrayUtils.lastIndexOf(array, (double) 2.2, 3, (double) 0.35)); assertEquals(2, ArrayUtils.lastIndexOf(array, 2.2, 3, 0.35));
assertEquals(3, ArrayUtils.lastIndexOf(array, (double) 4.15, array.length, (double) 2.0)); assertEquals(3, ArrayUtils.lastIndexOf(array, 4.15, array.length, 2.0));
assertEquals(1, ArrayUtils.lastIndexOf(array, (double) 1.00001324, array.length, (double) 0.0001)); assertEquals(1, ArrayUtils.lastIndexOf(array, 1.00001324, array.length, 0.0001));
assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 4.15, -200, (double) 2.0)); assertEquals(-1, ArrayUtils.lastIndexOf(array, 4.15, -200, 2.0));
} }
@SuppressWarnings("cast") @SuppressWarnings("cast")
@ -3965,10 +3965,10 @@ public void testContainsDoubleTolerance() {
double[] array = null; double[] array = null;
assertFalse(ArrayUtils.contains(array, (double) 1, (double) 0)); assertFalse(ArrayUtils.contains(array, (double) 1, (double) 0));
array = new double[] { 0, 1, 2, 3, 0 }; array = new double[] { 0, 1, 2, 3, 0 };
assertFalse(ArrayUtils.contains(array, (double) 4.0, (double) 0.33)); assertFalse(ArrayUtils.contains(array, 4.0, 0.33));
assertFalse(ArrayUtils.contains(array, (double) 2.5, (double) 0.49)); assertFalse(ArrayUtils.contains(array, 2.5, 0.49));
assertTrue(ArrayUtils.contains(array, (double) 2.5, (double) 0.50)); assertTrue(ArrayUtils.contains(array, 2.5, 0.50));
assertTrue(ArrayUtils.contains(array, (double) 2.5, (double) 0.51)); assertTrue(ArrayUtils.contains(array, 2.5, 0.51));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -4957,11 +4957,11 @@ public void testIsSortedBool() {
@Test @Test
public void testCreatePrimitiveArray() { public void testCreatePrimitiveArray() {
Assert.assertNull(ArrayUtils.toPrimitive((Object[])null)); Assert.assertNull(ArrayUtils.toPrimitive((Object[])null));
Assert.assertArrayEquals(new int[]{}, (int[]) ArrayUtils.toPrimitive(new Integer[]{})); Assert.assertArrayEquals(new int[]{}, ArrayUtils.toPrimitive(new Integer[]{}));
Assert.assertArrayEquals(new short[]{2}, (short[]) ArrayUtils.toPrimitive(new Short[]{2})); Assert.assertArrayEquals(new short[]{2}, ArrayUtils.toPrimitive(new Short[]{2}));
Assert.assertArrayEquals(new long[]{2, 3}, (long[]) ArrayUtils.toPrimitive(new Long[]{2L, 3L})); Assert.assertArrayEquals(new long[]{2, 3}, ArrayUtils.toPrimitive(new Long[]{2L, 3L}));
Assert.assertArrayEquals(new float[]{3.14f}, (float[]) ArrayUtils.toPrimitive(new Float[]{3.14f}), 0.1f); Assert.assertArrayEquals(new float[]{3.14f}, ArrayUtils.toPrimitive(new Float[]{3.14f}), 0.1f);
Assert.assertArrayEquals(new double[]{2.718}, (double[]) ArrayUtils.toPrimitive(new Double[]{2.718}), 0.1); Assert.assertArrayEquals(new double[]{2.718}, ArrayUtils.toPrimitive(new Double[]{2.718}), 0.1);
} }
@Test @Test

48
src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
View File

@ -56,14 +56,14 @@ public void test_negate_Boolean() {
public void test_isTrue_Boolean() { public void test_isTrue_Boolean() {
assertTrue(BooleanUtils.isTrue(Boolean.TRUE)); assertTrue(BooleanUtils.isTrue(Boolean.TRUE));
assertFalse(BooleanUtils.isTrue(Boolean.FALSE)); assertFalse(BooleanUtils.isTrue(Boolean.FALSE));
assertFalse(BooleanUtils.isTrue((Boolean) null)); assertFalse(BooleanUtils.isTrue(null));
} }
@Test @Test
public void test_isNotTrue_Boolean() { public void test_isNotTrue_Boolean() {
assertFalse(BooleanUtils.isNotTrue(Boolean.TRUE)); assertFalse(BooleanUtils.isNotTrue(Boolean.TRUE));
assertTrue(BooleanUtils.isNotTrue(Boolean.FALSE)); assertTrue(BooleanUtils.isNotTrue(Boolean.FALSE));
assertTrue(BooleanUtils.isNotTrue((Boolean) null)); assertTrue(BooleanUtils.isNotTrue(null));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -71,14 +71,14 @@ public void test_isNotTrue_Boolean() {
public void test_isFalse_Boolean() { public void test_isFalse_Boolean() {
assertFalse(BooleanUtils.isFalse(Boolean.TRUE)); assertFalse(BooleanUtils.isFalse(Boolean.TRUE));
assertTrue(BooleanUtils.isFalse(Boolean.FALSE)); assertTrue(BooleanUtils.isFalse(Boolean.FALSE));
assertFalse(BooleanUtils.isFalse((Boolean) null)); assertFalse(BooleanUtils.isFalse(null));
} }
@Test @Test
public void test_isNotFalse_Boolean() { public void test_isNotFalse_Boolean() {
assertTrue(BooleanUtils.isNotFalse(Boolean.TRUE)); assertTrue(BooleanUtils.isNotFalse(Boolean.TRUE));
assertFalse(BooleanUtils.isNotFalse(Boolean.FALSE)); assertFalse(BooleanUtils.isNotFalse(Boolean.FALSE));
assertTrue(BooleanUtils.isNotFalse((Boolean) null)); assertTrue(BooleanUtils.isNotFalse(null));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -95,8 +95,8 @@ public void test_toBooleanDefaultIfNull_Boolean_boolean() {
assertTrue(BooleanUtils.toBooleanDefaultIfNull(Boolean.TRUE, false)); assertTrue(BooleanUtils.toBooleanDefaultIfNull(Boolean.TRUE, false));
assertFalse(BooleanUtils.toBooleanDefaultIfNull(Boolean.FALSE, true)); assertFalse(BooleanUtils.toBooleanDefaultIfNull(Boolean.FALSE, true));
assertFalse(BooleanUtils.toBooleanDefaultIfNull(Boolean.FALSE, false)); assertFalse(BooleanUtils.toBooleanDefaultIfNull(Boolean.FALSE, false));
assertTrue(BooleanUtils.toBooleanDefaultIfNull((Boolean) null, true)); assertTrue(BooleanUtils.toBooleanDefaultIfNull(null, true));
assertFalse(BooleanUtils.toBooleanDefaultIfNull((Boolean) null, false)); assertFalse(BooleanUtils.toBooleanDefaultIfNull(null, false));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -140,8 +140,8 @@ public void test_toBoolean_Integer_Integer_Integer() {
final Integer six = Integer.valueOf(6); final Integer six = Integer.valueOf(6);
final Integer seven = Integer.valueOf(7); final Integer seven = Integer.valueOf(7);
assertTrue(BooleanUtils.toBoolean((Integer) null, null, seven)); assertTrue(BooleanUtils.toBoolean(null, null, seven));
assertFalse(BooleanUtils.toBoolean((Integer) null, six, null)); assertFalse(BooleanUtils.toBoolean(null, six, null));
assertTrue(BooleanUtils.toBoolean(Integer.valueOf(6), six, seven)); assertTrue(BooleanUtils.toBoolean(Integer.valueOf(6), six, seven));
assertFalse(BooleanUtils.toBoolean(Integer.valueOf(7), six, seven)); assertFalse(BooleanUtils.toBoolean(Integer.valueOf(7), six, seven));
@ -176,9 +176,9 @@ public void test_toBooleanObject_Integer_Integer_Integer_Integer() {
final Integer seven = Integer.valueOf(7); final Integer seven = Integer.valueOf(7);
final Integer eight = Integer.valueOf(8); final Integer eight = Integer.valueOf(8);
assertSame(Boolean.TRUE, BooleanUtils.toBooleanObject((Integer) null, null, seven, eight)); assertSame(Boolean.TRUE, BooleanUtils.toBooleanObject(null, null, seven, eight));
assertSame(Boolean.FALSE, BooleanUtils.toBooleanObject((Integer) null, six, null, eight)); assertSame(Boolean.FALSE, BooleanUtils.toBooleanObject(null, six, null, eight));
assertSame(null, BooleanUtils.toBooleanObject((Integer) null, six, seven, null)); assertSame(null, BooleanUtils.toBooleanObject(null, six, seven, null));
assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject(Integer.valueOf(6), six, seven, eight)); assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject(Integer.valueOf(6), six, seven, eight));
assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject(Integer.valueOf(7), six, seven, eight)); assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject(Integer.valueOf(7), six, seven, eight));
@ -212,7 +212,7 @@ public void test_toIntegerObject_boolean() {
public void test_toIntegerObject_Boolean() { public void test_toIntegerObject_Boolean() {
assertEquals(Integer.valueOf(1), BooleanUtils.toIntegerObject(Boolean.TRUE)); assertEquals(Integer.valueOf(1), BooleanUtils.toIntegerObject(Boolean.TRUE));
assertEquals(Integer.valueOf(0), BooleanUtils.toIntegerObject(Boolean.FALSE)); assertEquals(Integer.valueOf(0), BooleanUtils.toIntegerObject(Boolean.FALSE));
assertEquals(null, BooleanUtils.toIntegerObject((Boolean) null)); assertEquals(null, BooleanUtils.toIntegerObject(null));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -244,8 +244,8 @@ public void test_toIntegerObject_Boolean_Integer_Integer_Integer() {
final Integer eight = Integer.valueOf(8); final Integer eight = Integer.valueOf(8);
assertEquals(six, BooleanUtils.toIntegerObject(Boolean.TRUE, six, seven, eight)); assertEquals(six, BooleanUtils.toIntegerObject(Boolean.TRUE, six, seven, eight));
assertEquals(seven, BooleanUtils.toIntegerObject(Boolean.FALSE, six, seven, eight)); assertEquals(seven, BooleanUtils.toIntegerObject(Boolean.FALSE, six, seven, eight));
assertEquals(eight, BooleanUtils.toIntegerObject((Boolean) null, six, seven, eight)); assertEquals(eight, BooleanUtils.toIntegerObject(null, six, seven, eight));
assertEquals(null, BooleanUtils.toIntegerObject((Boolean) null, six, seven, null)); assertEquals(null, BooleanUtils.toIntegerObject(null, six, seven, null));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -288,9 +288,9 @@ public void test_toBooleanObject_String() {
@Test @Test
public void test_toBooleanObject_String_String_String_String() { public void test_toBooleanObject_String_String_String_String() {
assertSame(Boolean.TRUE, BooleanUtils.toBooleanObject((String) null, null, "N", "U")); assertSame(Boolean.TRUE, BooleanUtils.toBooleanObject(null, null, "N", "U"));
assertSame(Boolean.FALSE, BooleanUtils.toBooleanObject((String) null, "Y", null, "U")); assertSame(Boolean.FALSE, BooleanUtils.toBooleanObject(null, "Y", null, "U"));
assertSame(null, BooleanUtils.toBooleanObject((String) null, "Y", "N", null)); assertSame(null, BooleanUtils.toBooleanObject(null, "Y", "N", null));
assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("Y", "Y", "N", "U")); assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("Y", "Y", "N", "U"));
assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("N", "Y", "N", "U")); assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("N", "Y", "N", "U"));
@ -299,7 +299,7 @@ public void test_toBooleanObject_String_String_String_String() {
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void test_toBooleanObject_String_String_String_String_nullValue() { public void test_toBooleanObject_String_String_String_String_nullValue() {
BooleanUtils.toBooleanObject((String) null, "Y", "N", "U"); BooleanUtils.toBooleanObject(null, "Y", "N", "U");
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
@ -357,8 +357,8 @@ public void test_toBoolean_String() {
@Test @Test
public void test_toBoolean_String_String_String() { public void test_toBoolean_String_String_String() {
assertTrue(BooleanUtils.toBoolean((String) null, null, "N")); assertTrue(BooleanUtils.toBoolean(null, null, "N"));
assertFalse(BooleanUtils.toBoolean((String) null, "Y", null)); assertFalse(BooleanUtils.toBoolean(null, "Y", null));
assertTrue(BooleanUtils.toBoolean("Y", "Y", "N")); assertTrue(BooleanUtils.toBoolean("Y", "Y", "N"));
assertTrue(BooleanUtils.toBoolean("Y", new String("Y"), new String("N"))); assertTrue(BooleanUtils.toBoolean("Y", new String("Y"), new String("N")));
assertFalse(BooleanUtils.toBoolean("N", "Y", "N")); assertFalse(BooleanUtils.toBoolean("N", "Y", "N"));
@ -381,28 +381,28 @@ public void test_toBoolean_String_String_String_noMatch() {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@Test @Test
public void test_toStringTrueFalse_Boolean() { public void test_toStringTrueFalse_Boolean() {
assertEquals(null, BooleanUtils.toStringTrueFalse((Boolean) null)); assertEquals(null, BooleanUtils.toStringTrueFalse(null));
assertEquals("true", BooleanUtils.toStringTrueFalse(Boolean.TRUE)); assertEquals("true", BooleanUtils.toStringTrueFalse(Boolean.TRUE));
assertEquals("false", BooleanUtils.toStringTrueFalse(Boolean.FALSE)); assertEquals("false", BooleanUtils.toStringTrueFalse(Boolean.FALSE));
} }
@Test @Test
public void test_toStringOnOff_Boolean() { public void test_toStringOnOff_Boolean() {
assertEquals(null, BooleanUtils.toStringOnOff((Boolean) null)); assertEquals(null, BooleanUtils.toStringOnOff(null));
assertEquals("on", BooleanUtils.toStringOnOff(Boolean.TRUE)); assertEquals("on", BooleanUtils.toStringOnOff(Boolean.TRUE));
assertEquals("off", BooleanUtils.toStringOnOff(Boolean.FALSE)); assertEquals("off", BooleanUtils.toStringOnOff(Boolean.FALSE));
} }
@Test @Test
public void test_toStringYesNo_Boolean() { public void test_toStringYesNo_Boolean() {
assertEquals(null, BooleanUtils.toStringYesNo((Boolean) null)); assertEquals(null, BooleanUtils.toStringYesNo(null));
assertEquals("yes", BooleanUtils.toStringYesNo(Boolean.TRUE)); assertEquals("yes", BooleanUtils.toStringYesNo(Boolean.TRUE));
assertEquals("no", BooleanUtils.toStringYesNo(Boolean.FALSE)); assertEquals("no", BooleanUtils.toStringYesNo(Boolean.FALSE));
} }
@Test @Test
public void test_toString_Boolean_String_String_String() { public void test_toString_Boolean_String_String_String() {
assertEquals("U", BooleanUtils.toString((Boolean) null, "Y", "N", "U")); assertEquals("U", BooleanUtils.toString(null, "Y", "N", "U"));
assertEquals("Y", BooleanUtils.toString(Boolean.TRUE, "Y", "N", "U")); assertEquals("Y", BooleanUtils.toString(Boolean.TRUE, "Y", "N", "U"));
assertEquals("N", BooleanUtils.toString(Boolean.FALSE, "Y", "N", "U")); assertEquals("N", BooleanUtils.toString(Boolean.FALSE, "Y", "N", "U"));
} }

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

@ -137,7 +137,7 @@ public void test_getShortClassName_String() {
public void test_getSimpleName_Class() { public void test_getSimpleName_Class() {
assertEquals("ClassUtils", ClassUtils.getSimpleName(ClassUtils.class)); assertEquals("ClassUtils", ClassUtils.getSimpleName(ClassUtils.class));
assertEquals("Entry", ClassUtils.getSimpleName(Map.Entry.class)); assertEquals("Entry", ClassUtils.getSimpleName(Map.Entry.class));
assertEquals("", ClassUtils.getSimpleName((Class<?>) null)); assertEquals("", ClassUtils.getSimpleName(null));
// LANG-535 // LANG-535
assertEquals("String[]", ClassUtils.getSimpleName(String[].class)); assertEquals("String[]", ClassUtils.getSimpleName(String[].class));
@ -380,7 +380,7 @@ public void test_isAssignable_ClassArray_ClassArray() throws Exception {
assertTrue(ClassUtils.isAssignable(array0, array0)); assertTrue(ClassUtils.isAssignable(array0, array0));
// assertTrue(ClassUtils.isAssignable(array0, null)); // assertTrue(ClassUtils.isAssignable(array0, null));
assertTrue(ClassUtils.isAssignable(array0, (Class<?>[]) null)); // explicit cast to avoid warning assertTrue(ClassUtils.isAssignable(array0, (Class<?>[]) null)); // explicit cast to avoid warning
assertTrue(ClassUtils.isAssignable((Class[]) null, (Class[]) null)); assertTrue(ClassUtils.isAssignable((Class[]) null, null));
assertFalse(ClassUtils.isAssignable(array1, array1s)); assertFalse(ClassUtils.isAssignable(array1, array1s));
assertTrue(ClassUtils.isAssignable(array1s, array1s)); assertTrue(ClassUtils.isAssignable(array1s, array1s));
@ -410,7 +410,7 @@ public void test_isAssignable_ClassArray_ClassArray_Autoboxing() throws Exceptio
assertTrue(ClassUtils.isAssignable(null, array0, true)); assertTrue(ClassUtils.isAssignable(null, array0, true));
assertTrue(ClassUtils.isAssignable(array0, array0, true)); assertTrue(ClassUtils.isAssignable(array0, array0, true));
assertTrue(ClassUtils.isAssignable(array0, null, true)); assertTrue(ClassUtils.isAssignable(array0, null, true));
assertTrue(ClassUtils.isAssignable((Class[]) null, (Class[]) null, true)); assertTrue(ClassUtils.isAssignable((Class[]) null, null, true));
assertFalse(ClassUtils.isAssignable(array1, array1s, true)); assertFalse(ClassUtils.isAssignable(array1, array1s, true));
assertTrue(ClassUtils.isAssignable(array1s, array1s, true)); assertTrue(ClassUtils.isAssignable(array1s, array1s, true));
@ -438,7 +438,7 @@ public void test_isAssignable_ClassArray_ClassArray_NoAutoboxing() throws Except
assertTrue(ClassUtils.isAssignable(null, array0, false)); assertTrue(ClassUtils.isAssignable(null, array0, false));
assertTrue(ClassUtils.isAssignable(array0, array0, false)); assertTrue(ClassUtils.isAssignable(array0, array0, false));
assertTrue(ClassUtils.isAssignable(array0, null, false)); assertTrue(ClassUtils.isAssignable(array0, null, false));
assertTrue(ClassUtils.isAssignable((Class[]) null, (Class[]) null, false)); assertTrue(ClassUtils.isAssignable((Class[]) null, null, false));
assertFalse(ClassUtils.isAssignable(array1, array1s, false)); assertFalse(ClassUtils.isAssignable(array1, array1s, false));
assertTrue(ClassUtils.isAssignable(array1s, array1s, false)); assertTrue(ClassUtils.isAssignable(array1s, array1s, false));

2
src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
View File

@ -76,7 +76,7 @@ public void test_isEnum() {
@Test(expected=NullPointerException.class) @Test(expected=NullPointerException.class)
public void test_isEnum_nullClass() { public void test_isEnum_nullClass() {
EnumUtils.isValidEnum((Class<Traffic>) null, "PURPLE"); EnumUtils.isValidEnum(null, "PURPLE");
} }
@Test @Test

2
src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
View File

@ -125,7 +125,7 @@ private static void assertValidToLocale(
*/ */
@Test @Test
public void testToLocale_1Part() { public void testToLocale_1Part() {
assertNull(LocaleUtils.toLocale((String) null)); assertNull(LocaleUtils.toLocale(null));
assertValidToLocale("us"); assertValidToLocale("us");
assertValidToLocale("fr"); assertValidToLocale("fr");

10
src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
View File

@ -80,7 +80,7 @@ public void testFirstNonNull() {
assertNull(ObjectUtils.firstNonNull(new Object[0])); assertNull(ObjectUtils.firstNonNull(new Object[0]));
// Cast to Object in line below ensures compiler doesn't complain of unchecked generic array creation // Cast to Object in line below ensures compiler doesn't complain of unchecked generic array creation
assertNull(ObjectUtils.firstNonNull((Object) null, (Object) null)); assertNull(ObjectUtils.firstNonNull(null, null));
assertNull(ObjectUtils.firstNonNull((Object) null)); assertNull(ObjectUtils.firstNonNull((Object) null));
assertNull(ObjectUtils.firstNonNull((Object[]) null)); assertNull(ObjectUtils.firstNonNull((Object[]) null));
@ -273,13 +273,13 @@ public void testIdentityToStringAppendable() {
@Test @Test
public void testToString_Object() { public void testToString_Object() {
assertEquals("", ObjectUtils.toString((Object) null) ); assertEquals("", ObjectUtils.toString(null) );
assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE) ); assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE) );
} }
@Test @Test
public void testToString_ObjectString() { public void testToString_ObjectString() {
assertEquals(BAR, ObjectUtils.toString((Object) null, BAR) ); assertEquals(BAR, ObjectUtils.toString(null, BAR) );
assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE, BAR) ); assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE, BAR) );
} }
@ -315,7 +315,7 @@ public void testMax() {
assertSame( nonNullComparable1, ObjectUtils.max( minComparable, nonNullComparable1 ) ); assertSame( nonNullComparable1, ObjectUtils.max( minComparable, nonNullComparable1 ) );
assertSame( nonNullComparable1, ObjectUtils.max( null, minComparable, null, nonNullComparable1 ) ); assertSame( nonNullComparable1, ObjectUtils.max( null, minComparable, null, nonNullComparable1 ) );
assertNull( ObjectUtils.max((String)null, (String)null) ); assertNull( ObjectUtils.max(null, null) );
} }
@Test @Test
@ -341,7 +341,7 @@ public void testMin() {
assertSame( minComparable, ObjectUtils.min( minComparable, nonNullComparable1 ) ); assertSame( minComparable, ObjectUtils.min( minComparable, nonNullComparable1 ) );
assertSame( minComparable, ObjectUtils.min( null, nonNullComparable1, null, minComparable ) ); assertSame( minComparable, ObjectUtils.min( null, nonNullComparable1, null, minComparable ) );
assertNull( ObjectUtils.min((String)null, (String)null) ); assertNull( ObjectUtils.min(null, null) );
} }
/** /**

2
src/test/java/org/apache/commons/lang3/RangeTest.java
View File

@ -53,7 +53,7 @@ public void setUp() {
byteRange2 = Range.between((byte) 0, (byte) 5); byteRange2 = Range.between((byte) 0, (byte) 5);
byteRange3 = Range.between((byte) 0, (byte) 10); byteRange3 = Range.between((byte) 0, (byte) 10);
intRange = Range.between((int) 10, (int) 20); intRange = Range.between(10, 20);
longRange = Range.between((long) 10, (long) 20); longRange = Range.between((long) 10, (long) 20);
floatRange = Range.between((float) 10, (float) 20); floatRange = Range.between((float) 10, (float) 20);
doubleRange = Range.between((double) 10, (double) 20); doubleRange = Range.between((double) 10, (double) 20);

16
src/test/java/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java
View File

@ -38,8 +38,8 @@ public class StringUtilsStartsEndsWithTest {
*/ */
@Test @Test
public void testStartsWith() { public void testStartsWith() {
assertTrue("startsWith(null, null)", StringUtils.startsWith(null, (String)null)); assertTrue("startsWith(null, null)", StringUtils.startsWith(null, null));
assertFalse("startsWith(FOOBAR, null)", StringUtils.startsWith(FOOBAR, (String)null)); assertFalse("startsWith(FOOBAR, null)", StringUtils.startsWith(FOOBAR, null));
assertFalse("startsWith(null, FOO)", StringUtils.startsWith(null, FOO)); assertFalse("startsWith(null, FOO)", StringUtils.startsWith(null, FOO));
assertTrue("startsWith(FOOBAR, \"\")", StringUtils.startsWith(FOOBAR, "")); assertTrue("startsWith(FOOBAR, \"\")", StringUtils.startsWith(FOOBAR, ""));
@ -62,8 +62,8 @@ public void testStartsWith() {
*/ */
@Test @Test
public void testStartsWithIgnoreCase() { public void testStartsWithIgnoreCase() {
assertTrue("startsWithIgnoreCase(null, null)", StringUtils.startsWithIgnoreCase(null, (String)null)); assertTrue("startsWithIgnoreCase(null, null)", StringUtils.startsWithIgnoreCase(null, null));
assertFalse("startsWithIgnoreCase(FOOBAR, null)", StringUtils.startsWithIgnoreCase(FOOBAR, (String)null)); assertFalse("startsWithIgnoreCase(FOOBAR, null)", StringUtils.startsWithIgnoreCase(FOOBAR, null));
assertFalse("startsWithIgnoreCase(null, FOO)", StringUtils.startsWithIgnoreCase(null, FOO)); assertFalse("startsWithIgnoreCase(null, FOO)", StringUtils.startsWithIgnoreCase(null, FOO));
assertTrue("startsWithIgnoreCase(FOOBAR, \"\")", StringUtils.startsWithIgnoreCase(FOOBAR, "")); assertTrue("startsWithIgnoreCase(FOOBAR, \"\")", StringUtils.startsWithIgnoreCase(FOOBAR, ""));
@ -104,8 +104,8 @@ public void testStartsWithAny() {
*/ */
@Test @Test
public void testEndsWith() { public void testEndsWith() {
assertTrue("endsWith(null, null)", StringUtils.endsWith(null, (String)null)); assertTrue("endsWith(null, null)", StringUtils.endsWith(null, null));
assertFalse("endsWith(FOOBAR, null)", StringUtils.endsWith(FOOBAR, (String)null)); assertFalse("endsWith(FOOBAR, null)", StringUtils.endsWith(FOOBAR, null));
assertFalse("endsWith(null, FOO)", StringUtils.endsWith(null, FOO)); assertFalse("endsWith(null, FOO)", StringUtils.endsWith(null, FOO));
assertTrue("endsWith(FOOBAR, \"\")", StringUtils.endsWith(FOOBAR, "")); assertTrue("endsWith(FOOBAR, \"\")", StringUtils.endsWith(FOOBAR, ""));
@ -135,8 +135,8 @@ public void testEndsWith() {
*/ */
@Test @Test
public void testEndsWithIgnoreCase() { public void testEndsWithIgnoreCase() {
assertTrue("endsWithIgnoreCase(null, null)", StringUtils.endsWithIgnoreCase(null, (String)null)); assertTrue("endsWithIgnoreCase(null, null)", StringUtils.endsWithIgnoreCase(null, null));
assertFalse("endsWithIgnoreCase(FOOBAR, null)", StringUtils.endsWithIgnoreCase(FOOBAR, (String)null)); assertFalse("endsWithIgnoreCase(FOOBAR, null)", StringUtils.endsWithIgnoreCase(FOOBAR, null));
assertFalse("endsWithIgnoreCase(null, FOO)", StringUtils.endsWithIgnoreCase(null, FOO)); assertFalse("endsWithIgnoreCase(null, FOO)", StringUtils.endsWithIgnoreCase(null, FOO));
assertTrue("endsWithIgnoreCase(FOOBAR, \"\")", StringUtils.endsWithIgnoreCase(FOOBAR, "")); assertTrue("endsWithIgnoreCase(FOOBAR, \"\")", StringUtils.endsWithIgnoreCase(FOOBAR, ""));

26
src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
View File

@ -270,7 +270,7 @@ public void testObject() {
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0); assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(o1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((Object) null, (Object) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((Object) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, o1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, o1).toComparison() < 0);
} }
@ -285,7 +285,7 @@ public void testObjectBuild() {
assertTrue(new CompareToBuilder().append(o2, o1).build().intValue() > 0); assertTrue(new CompareToBuilder().append(o2, o1).build().intValue() > 0);
assertTrue(new CompareToBuilder().append(o1, null).build().intValue() > 0); assertTrue(new CompareToBuilder().append(o1, null).build().intValue() > 0);
assertEquals(Integer.valueOf(0), new CompareToBuilder().append((Object) null, (Object) null).build()); assertEquals(Integer.valueOf(0), new CompareToBuilder().append((Object) null, null).build());
assertTrue(new CompareToBuilder().append(null, o1).build().intValue() < 0); assertTrue(new CompareToBuilder().append(null, o1).build().intValue() < 0);
} }
@ -310,7 +310,7 @@ public void testObjectComparator() {
assertTrue(new CompareToBuilder().append(o2, o1, String.CASE_INSENSITIVE_ORDER).toComparison() > 0); assertTrue(new CompareToBuilder().append(o2, o1, String.CASE_INSENSITIVE_ORDER).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, null, String.CASE_INSENSITIVE_ORDER).toComparison() > 0); assertTrue(new CompareToBuilder().append(o1, null, String.CASE_INSENSITIVE_ORDER).toComparison() > 0);
assertTrue(new CompareToBuilder().append((Object) null, (Object) null, String.CASE_INSENSITIVE_ORDER).toComparison() == 0); assertTrue(new CompareToBuilder().append(null, null, String.CASE_INSENSITIVE_ORDER).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, o1, String.CASE_INSENSITIVE_ORDER).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, o1, String.CASE_INSENSITIVE_ORDER).toComparison() < 0);
} }
@ -325,7 +325,7 @@ public void testObjectComparatorNull() {
assertTrue(new CompareToBuilder().append(o2, o1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(o2, o1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, null, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(o1, null, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((Object) null, (Object) null, null).toComparison() == 0); assertTrue(new CompareToBuilder().append(null, null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, o1, null).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, o1, null).toComparison() < 0);
} }
@ -469,7 +469,7 @@ public void testObjectArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((Object[]) null, (Object[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((Object[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -496,7 +496,7 @@ public void testLongArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((long[]) null, (long[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((long[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -523,7 +523,7 @@ public void testIntArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((int[]) null, (int[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((int[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -550,7 +550,7 @@ public void testShortArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((short[]) null, (short[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((short[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -577,7 +577,7 @@ public void testCharArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((char[]) null, (char[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((char[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -604,7 +604,7 @@ public void testByteArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((byte[]) null, (byte[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((byte[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -631,7 +631,7 @@ public void testDoubleArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((double[]) null, (double[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((double[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -658,7 +658,7 @@ public void testFloatArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((float[]) null, (float[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((float[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }
@ -685,7 +685,7 @@ public void testBooleanArray() {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0); assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
assertTrue(new CompareToBuilder().append((boolean[]) null, (boolean[]) null).toComparison() == 0); assertTrue(new CompareToBuilder().append((boolean[]) null, null).toComparison() == 0);
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0); assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
} }

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

@ -397,15 +397,15 @@ public void testObjectArrayEqual() throws Exception {
@Test @Test
public void testByteArrayEqualAsObject() throws Exception { public void testByteArrayEqualAsObject() throws Exception {
final DiffResult list = new DiffBuilder("String1", "String2", SHORT_STYLE) final DiffResult list = new DiffBuilder("String1", "String2", SHORT_STYLE)
.append("foo", (Object) new boolean[] {false}, (Object) new boolean[] {false}) .append("foo", new boolean[] {false}, new boolean[] {false})
.append("foo", (Object) new byte[] {0x01}, (Object) new byte[] {0x01}) .append("foo", new byte[] {0x01}, new byte[] {0x01})
.append("foo", (Object) new char[] {'a'}, (Object) new char[] {'a'}) .append("foo", new char[] {'a'}, new char[] {'a'})
.append("foo", (Object) new double[] {1.0}, (Object) new double[] {1.0}) .append("foo", new double[] {1.0}, new double[] {1.0})
.append("foo", (Object) new float[] {1.0F}, (Object) new float[] {1.0F}) .append("foo", new float[] {1.0F}, new float[] {1.0F})
.append("foo", (Object) new int[] {1}, (Object) new int[] {1}) .append("foo", new int[] {1}, new int[] {1})
.append("foo", (Object) new long[] {1L}, (Object) new long[] {1L}) .append("foo", new long[] {1L}, new long[] {1L})
.append("foo", (Object) new short[] {1}, (Object) new short[] {1}) .append("foo", new short[] {1}, new short[] {1})
.append("foo", (Object) new Object[] {1, "two"}, (Object) new Object[] {1, "two"}) .append("foo", new Object[] {1, "two"}, new Object[] {1, "two"})
.build(); .build();
assertEquals(0, list.getNumberOfDiffs()); assertEquals(0, list.getNumberOfDiffs());

8
src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
View File

@ -221,7 +221,7 @@ public void testReflectionEquals() {
assertTrue(!EqualsBuilder.reflectionEquals(o1, null)); assertTrue(!EqualsBuilder.reflectionEquals(o1, null));
assertTrue(!EqualsBuilder.reflectionEquals(null, o2)); assertTrue(!EqualsBuilder.reflectionEquals(null, o2));
assertTrue(EqualsBuilder.reflectionEquals((Object) null, (Object) null)); assertTrue(EqualsBuilder.reflectionEquals(null, null));
} }
@Test @Test
@ -348,7 +348,7 @@ private void testReflectionEqualsEquivalenceRelationship(
assertTrue(!EqualsBuilder.reflectionEquals(to2, null, testTransients)); assertTrue(!EqualsBuilder.reflectionEquals(to2, null, testTransients));
assertTrue(!EqualsBuilder.reflectionEquals(null, to, testTransients)); assertTrue(!EqualsBuilder.reflectionEquals(null, to, testTransients));
assertTrue(!EqualsBuilder.reflectionEquals(null, to2, testTransients)); assertTrue(!EqualsBuilder.reflectionEquals(null, to2, testTransients));
assertTrue(EqualsBuilder.reflectionEquals((Object) null, (Object) null, testTransients)); assertTrue(EqualsBuilder.reflectionEquals(null, null, testTransients));
} }
@Test @Test
@ -374,7 +374,7 @@ public void testObject() {
assertTrue(!new EqualsBuilder().append(o1, null).isEquals()); assertTrue(!new EqualsBuilder().append(o1, null).isEquals());
assertTrue(!new EqualsBuilder().append(null, o2).isEquals()); assertTrue(!new EqualsBuilder().append(null, o2).isEquals());
assertTrue(new EqualsBuilder().append((Object) null, (Object) null).isEquals()); assertTrue(new EqualsBuilder().append((Object) null, null).isEquals());
} }
@Test @Test
@ -390,7 +390,7 @@ public void testObjectBuild() {
assertEquals(Boolean.FALSE, new EqualsBuilder().append(o1, null).build()); assertEquals(Boolean.FALSE, new EqualsBuilder().append(o1, null).build());
assertEquals(Boolean.FALSE, new EqualsBuilder().append(null, o2).build()); assertEquals(Boolean.FALSE, new EqualsBuilder().append(null, o2).build());
assertEquals(Boolean.TRUE, new EqualsBuilder().append((Object) null, (Object) null).build()); assertEquals(Boolean.TRUE, new EqualsBuilder().append((Object) null, null).build());
} }
@Test @Test

12
src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
View File

@ -207,16 +207,16 @@ public void testObjectBuild() {
@Test @Test
@SuppressWarnings("cast") // cast is not really needed, keep for consistency @SuppressWarnings("cast") // cast is not really needed, keep for consistency
public void testLong() { public void testLong() {
assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((long) 0L).toHashCode()); assertEquals(17 * 37, new HashCodeBuilder(17, 37).append(0L).toHashCode());
assertEquals(17 * 37 + (int) (123456789L ^ 123456789L >> 32), new HashCodeBuilder(17, 37).append( assertEquals(17 * 37 + (int) (123456789L ^ 123456789L >> 32), new HashCodeBuilder(17, 37).append(
(long) 123456789L).toHashCode()); 123456789L).toHashCode());
} }
@Test @Test
@SuppressWarnings("cast") // cast is not really needed, keep for consistency @SuppressWarnings("cast") // cast is not really needed, keep for consistency
public void testInt() { public void testInt() {
assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((int) 0).toHashCode()); assertEquals(17 * 37, new HashCodeBuilder(17, 37).append(0).toHashCode());
assertEquals(17 * 37 + 123456, new HashCodeBuilder(17, 37).append((int) 123456).toHashCode()); assertEquals(17 * 37 + 123456, new HashCodeBuilder(17, 37).append(123456).toHashCode());
} }
@Test @Test
@ -240,7 +240,7 @@ public void testByte() {
@Test @Test
@SuppressWarnings("cast") // cast is not really needed, keep for consistency @SuppressWarnings("cast") // cast is not really needed, keep for consistency
public void testDouble() { public void testDouble() {
assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((double) 0d).toHashCode()); assertEquals(17 * 37, new HashCodeBuilder(17, 37).append(0d).toHashCode());
final double d = 1234567.89; final double d = 1234567.89;
final long l = Double.doubleToLongBits(d); final long l = Double.doubleToLongBits(d);
assertEquals(17 * 37 + (int) (l ^ l >> 32), new HashCodeBuilder(17, 37).append(d).toHashCode()); assertEquals(17 * 37 + (int) (l ^ l >> 32), new HashCodeBuilder(17, 37).append(d).toHashCode());
@ -249,7 +249,7 @@ public void testDouble() {
@Test @Test
@SuppressWarnings("cast") // cast is not really needed, keep for consistency @SuppressWarnings("cast") // cast is not really needed, keep for consistency
public void testFloat() { public void testFloat() {
assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((float) 0f).toHashCode()); assertEquals(17 * 37, new HashCodeBuilder(17, 37).append(0f).toHashCode());
final float f = 1234.89f; final float f = 1234.89f;
final int i = Float.floatToIntBits(f); final int i = Float.floatToIntBits(f);
assertEquals(17 * 37 + i, new HashCodeBuilder(17, 37).append(f).toHashCode()); assertEquals(17 * 37 + i, new HashCodeBuilder(17, 37).append(f).toHashCode());

12
src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
View File

@ -660,9 +660,9 @@ public void testLong() {
@SuppressWarnings("cast") // cast is not really needed, keep for consistency @SuppressWarnings("cast") // cast is not really needed, keep for consistency
@Test @Test
public void testInt() { public void testInt() {
assertEquals(baseStr + "[3]", new ToStringBuilder(base).append((int) 3).toString()); assertEquals(baseStr + "[3]", new ToStringBuilder(base).append(3).toString());
assertEquals(baseStr + "[a=3]", new ToStringBuilder(base).append("a", (int) 3).toString()); assertEquals(baseStr + "[a=3]", new ToStringBuilder(base).append("a", 3).toString());
assertEquals(baseStr + "[a=3,b=4]", new ToStringBuilder(base).append("a", (int) 3).append("b", (int) 4).toString()); assertEquals(baseStr + "[a=3,b=4]", new ToStringBuilder(base).append("a", 3).append("b", 4).toString());
} }
@Test @Test
@ -689,9 +689,9 @@ public void testByte() {
@SuppressWarnings("cast") @SuppressWarnings("cast")
@Test @Test
public void testDouble() { public void testDouble() {
assertEquals(baseStr + "[3.2]", new ToStringBuilder(base).append((double) 3.2).toString()); assertEquals(baseStr + "[3.2]", new ToStringBuilder(base).append(3.2).toString());
assertEquals(baseStr + "[a=3.2]", new ToStringBuilder(base).append("a", (double) 3.2).toString()); assertEquals(baseStr + "[a=3.2]", new ToStringBuilder(base).append("a", 3.2).toString());
assertEquals(baseStr + "[a=3.2,b=4.3]", new ToStringBuilder(base).append("a", (double) 3.2).append("b", (double) 4.3).toString()); assertEquals(baseStr + "[a=3.2,b=4.3]", new ToStringBuilder(base).append("a", 3.2).append("b", 4.3).toString());
} }
@Test @Test

2
src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java
View File

@ -181,7 +181,7 @@ public void testJavaSerialization() {
exceptionContext.setContextValue("test Poorly written obj", "serializable replacement"); exceptionContext.setContextValue("test Poorly written obj", "serializable replacement");
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final T clone = (T) SerializationUtils.deserialize(SerializationUtils.serialize(exceptionContext)); final T clone = SerializationUtils.deserialize(SerializationUtils.serialize(exceptionContext));
assertEquals(exceptionContext.getFormattedExceptionMessage(null), clone.getFormattedExceptionMessage(null)); assertEquals(exceptionContext.getFormattedExceptionMessage(null), clone.getFormattedExceptionMessage(null));
} }
} }

10
src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java
View File

@ -119,8 +119,8 @@ public void testGetCause_Throwable() {
assertSame(nested, ExceptionUtils.getCause(withCause)); assertSame(nested, ExceptionUtils.getCause(withCause));
assertSame(null, ExceptionUtils.getCause(jdkNoCause)); assertSame(null, ExceptionUtils.getCause(jdkNoCause));
assertSame(cyclicCause.getCause(), ExceptionUtils.getCause(cyclicCause)); assertSame(cyclicCause.getCause(), ExceptionUtils.getCause(cyclicCause));
assertSame(((ExceptionWithCause) cyclicCause.getCause()).getCause(), ExceptionUtils.getCause(cyclicCause.getCause())); assertSame(cyclicCause.getCause().getCause(), ExceptionUtils.getCause(cyclicCause.getCause()));
assertSame(cyclicCause.getCause(), ExceptionUtils.getCause(((ExceptionWithCause) cyclicCause.getCause()).getCause())); assertSame(cyclicCause.getCause(), ExceptionUtils.getCause(cyclicCause.getCause().getCause()));
assertSame(withoutCause, ExceptionUtils.getCause(notVisibleException)); assertSame(withoutCause, ExceptionUtils.getCause(notVisibleException));
} }
@ -151,7 +151,7 @@ public void testGetRootCause_Throwable() {
assertSame(withoutCause, ExceptionUtils.getRootCause(nested)); assertSame(withoutCause, ExceptionUtils.getRootCause(nested));
assertSame(withoutCause, ExceptionUtils.getRootCause(withCause)); assertSame(withoutCause, ExceptionUtils.getRootCause(withCause));
assertSame(null, ExceptionUtils.getRootCause(jdkNoCause)); assertSame(null, ExceptionUtils.getRootCause(jdkNoCause));
assertSame(((ExceptionWithCause) cyclicCause.getCause()).getCause(), ExceptionUtils.getRootCause(cyclicCause)); assertSame(cyclicCause.getCause().getCause(), ExceptionUtils.getRootCause(cyclicCause));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -208,7 +208,7 @@ public void testGetThrowables_Throwable_recursiveCause() {
assertEquals(3, throwables.length); assertEquals(3, throwables.length);
assertSame(cyclicCause, throwables[0]); assertSame(cyclicCause, throwables[0]);
assertSame(cyclicCause.getCause(), throwables[1]); assertSame(cyclicCause.getCause(), throwables[1]);
assertSame(((ExceptionWithCause) cyclicCause.getCause()).getCause(), throwables[2]); assertSame(cyclicCause.getCause().getCause(), throwables[2]);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -255,7 +255,7 @@ public void testGetThrowableList_Throwable_recursiveCause() {
assertEquals(3, throwables.size()); assertEquals(3, throwables.size());
assertSame(cyclicCause, throwables.get(0)); assertSame(cyclicCause, throwables.get(0));
assertSame(cyclicCause.getCause(), throwables.get(1)); assertSame(cyclicCause.getCause(), throwables.get(1));
assertSame(((ExceptionWithCause) cyclicCause.getCause()).getCause(), throwables.get(2)); assertSame(cyclicCause.getCause().getCause(), throwables.get(2));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------

40
src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
View File

@ -150,7 +150,7 @@ public void testIncrement() {
@Test @Test
public void testIncrementAndGet() { public void testIncrementAndGet() {
final MutableInt mutNum = new MutableInt((int) 1); final MutableInt mutNum = new MutableInt(1);
final int result = mutNum.incrementAndGet(); final int result = mutNum.incrementAndGet();
assertEquals(2, result); assertEquals(2, result);
@ -160,7 +160,7 @@ public void testIncrementAndGet() {
@Test @Test
public void testGetAndIncrement() { public void testGetAndIncrement() {
final MutableInt mutNum = new MutableInt((int) 1); final MutableInt mutNum = new MutableInt(1);
final int result = mutNum.getAndIncrement(); final int result = mutNum.getAndIncrement();
assertEquals(1, result); assertEquals(1, result);
@ -179,7 +179,7 @@ public void testDecrement() {
@Test @Test
public void testDecrementAndGet() { public void testDecrementAndGet() {
final MutableInt mutNum = new MutableInt((int) 1); final MutableInt mutNum = new MutableInt(1);
final int result = mutNum.decrementAndGet(); final int result = mutNum.decrementAndGet();
assertEquals(0, result); assertEquals(0, result);
@ -189,7 +189,7 @@ public void testDecrementAndGet() {
@Test @Test
public void testGetAndDecrement() { public void testGetAndDecrement() {
final MutableInt mutNum = new MutableInt((int) 1); final MutableInt mutNum = new MutableInt(1);
final int result = mutNum.getAndDecrement(); final int result = mutNum.getAndDecrement();
assertEquals(1, result); assertEquals(1, result);
@ -217,38 +217,38 @@ public void testAddValueObject() {
@Test @Test
public void testGetAndAddValuePrimitive() { public void testGetAndAddValuePrimitive() {
final MutableInt mutableInteger = new MutableInt((int)0); final MutableInt mutableInteger = new MutableInt(0);
final int result = mutableInteger.getAndAdd((int) 1); final int result = mutableInteger.getAndAdd(1);
assertEquals((int) 0, result); assertEquals(0, result);
assertEquals((int) 1, mutableInteger.intValue()); assertEquals(1, mutableInteger.intValue());
} }
@Test @Test
public void testGetAndAddValueObject() { public void testGetAndAddValueObject() {
final MutableInt mutableInteger = new MutableInt((int)0); final MutableInt mutableInteger = new MutableInt(0);
final int result = mutableInteger.getAndAdd(Integer.valueOf((int) 1)); final int result = mutableInteger.getAndAdd(Integer.valueOf(1));
assertEquals((int) 0, result); assertEquals(0, result);
assertEquals((int) 1, mutableInteger.intValue()); assertEquals(1, mutableInteger.intValue());
} }
@Test @Test
public void testAddAndGetValuePrimitive() { public void testAddAndGetValuePrimitive() {
final MutableInt mutableInteger = new MutableInt((int)0); final MutableInt mutableInteger = new MutableInt(0);
final int result = mutableInteger.addAndGet((int) 1); final int result = mutableInteger.addAndGet(1);
assertEquals((int) 1, result); assertEquals(1, result);
assertEquals((int) 1, mutableInteger.intValue()); assertEquals(1, mutableInteger.intValue());
} }
@Test @Test
public void testAddAndGetValueObject() { public void testAddAndGetValueObject() {
final MutableInt mutableInteger = new MutableInt((int)0); final MutableInt mutableInteger = new MutableInt(0);
final int result = mutableInteger.addAndGet(Integer.valueOf((int) 1)); final int result = mutableInteger.addAndGet(Integer.valueOf(1));
assertEquals((int) 1, result); assertEquals(1, result);
assertEquals((int) 1, mutableInteger.intValue()); assertEquals(1, mutableInteger.intValue());
} }
@Test @Test

8
src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
View File

@ -345,7 +345,7 @@ public void testInvokeMethod() throws Exception {
assertEquals("foo()", MethodUtils.invokeMethod(testBean, "foo", assertEquals("foo()", MethodUtils.invokeMethod(testBean, "foo",
(Object[]) null)); (Object[]) null));
assertEquals("foo()", MethodUtils.invokeMethod(testBean, "foo", assertEquals("foo()", MethodUtils.invokeMethod(testBean, "foo",
(Object[]) null, (Class<?>[]) null)); null, null));
assertEquals("foo(String)", MethodUtils.invokeMethod(testBean, "foo", assertEquals("foo(String)", MethodUtils.invokeMethod(testBean, "foo",
"")); ""));
assertEquals("foo(Object)", MethodUtils.invokeMethod(testBean, "foo", assertEquals("foo(Object)", MethodUtils.invokeMethod(testBean, "foo",
@ -385,7 +385,7 @@ public void testInvokeExactMethod() throws Exception {
assertEquals("foo()", MethodUtils.invokeExactMethod(testBean, "foo", assertEquals("foo()", MethodUtils.invokeExactMethod(testBean, "foo",
(Object[]) null)); (Object[]) null));
assertEquals("foo()", MethodUtils.invokeExactMethod(testBean, "foo", assertEquals("foo()", MethodUtils.invokeExactMethod(testBean, "foo",
(Object[]) null, (Class<?>[]) null)); null, null));
assertEquals("foo(String)", MethodUtils.invokeExactMethod(testBean, assertEquals("foo(String)", MethodUtils.invokeExactMethod(testBean,
"foo", "")); "foo", ""));
assertEquals("foo(Object)", MethodUtils.invokeExactMethod(testBean, assertEquals("foo(Object)", MethodUtils.invokeExactMethod(testBean,
@ -422,7 +422,7 @@ public void testInvokeStaticMethod() throws Exception {
assertEquals("bar()", MethodUtils.invokeStaticMethod(TestBean.class, assertEquals("bar()", MethodUtils.invokeStaticMethod(TestBean.class,
"bar", (Object[]) null)); "bar", (Object[]) null));
assertEquals("bar()", MethodUtils.invokeStaticMethod(TestBean.class, assertEquals("bar()", MethodUtils.invokeStaticMethod(TestBean.class,
"bar", (Object[]) null, (Class<?>[]) null)); "bar", null, null));
assertEquals("bar(String)", MethodUtils.invokeStaticMethod( assertEquals("bar(String)", MethodUtils.invokeStaticMethod(
TestBean.class, "bar", "")); TestBean.class, "bar", ""));
assertEquals("bar(Object)", MethodUtils.invokeStaticMethod( assertEquals("bar(Object)", MethodUtils.invokeStaticMethod(
@ -465,7 +465,7 @@ public void testInvokeExactStaticMethod() throws Exception {
assertEquals("bar()", MethodUtils.invokeExactStaticMethod(TestBean.class, assertEquals("bar()", MethodUtils.invokeExactStaticMethod(TestBean.class,
"bar", (Object[]) null)); "bar", (Object[]) null));
assertEquals("bar()", MethodUtils.invokeExactStaticMethod(TestBean.class, assertEquals("bar()", MethodUtils.invokeExactStaticMethod(TestBean.class,
"bar", (Object[]) null, (Class<?>[]) null)); "bar", null, null));
assertEquals("bar(String)", MethodUtils.invokeExactStaticMethod( assertEquals("bar(String)", MethodUtils.invokeExactStaticMethod(
TestBean.class, "bar", "")); TestBean.class, "bar", ""));
assertEquals("bar(Object)", MethodUtils.invokeExactStaticMethod( assertEquals("bar(Object)", MethodUtils.invokeExactStaticMethod(

4
src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java
View File

@ -1374,7 +1374,7 @@ public void testInsert() {
// expected // expected
} }
sb.insert(0, (char[]) null, 0, 0); sb.insert(0, null, 0, 0);
assertEquals("barbaz", sb.toString()); assertEquals("barbaz", sb.toString());
sb.insert(0, new char[0], 0, 0); sb.insert(0, new char[0], 0, 0);
@ -1599,7 +1599,7 @@ public void testInsertWithNullText() {
sb.insert(0, (char[]) null); sb.insert(0, (char[]) null);
assertEquals("nullfoonullbarbaz", sb.toString()); assertEquals("nullfoonullbarbaz", sb.toString());
sb.insert(0, (char[]) null, 0, 0); sb.insert(0, null, 0, 0);
assertEquals("nullnullfoonullbarbaz", sb.toString()); assertEquals("nullnullfoonullbarbaz", sb.toString());
} }
} }

10
src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
View File

@ -63,7 +63,7 @@ public void testConstructors() {
assertEquals(0, sb4.length()); assertEquals(0, sb4.length());
assertEquals(0, sb4.size()); assertEquals(0, sb4.size());
final StrBuilder sb5 = new StrBuilder((String) null); final StrBuilder sb5 = new StrBuilder(null);
assertEquals(32, sb5.capacity()); assertEquals(32, sb5.capacity());
assertEquals(0, sb5.length()); assertEquals(0, sb5.length());
assertEquals(0, sb5.size()); assertEquals(0, sb5.size());
@ -184,7 +184,7 @@ public void testGetSetNewLineText() {
sb.setNewLineText(""); sb.setNewLineText("");
assertEquals("", sb.getNewLineText()); assertEquals("", sb.getNewLineText());
sb.setNewLineText((String) null); sb.setNewLineText(null);
assertEquals(null, sb.getNewLineText()); assertEquals(null, sb.getNewLineText());
} }
@ -203,7 +203,7 @@ public void testGetSetNullText() {
sb.setNullText("NULL"); sb.setNullText("NULL");
assertEquals("NULL", sb.getNullText()); assertEquals("NULL", sb.getNullText());
sb.setNullText((String) null); sb.setNullText(null);
assertEquals(null, sb.getNullText()); assertEquals(null, sb.getNullText());
} }
@ -745,7 +745,7 @@ public void testReplace_int_int_String() {
assertEquals("aaabc", sb.toString()); assertEquals("aaabc", sb.toString());
sb.replace(0, 3, ""); sb.replace(0, 3, "");
assertEquals("bc", sb.toString()); assertEquals("bc", sb.toString());
sb.replace(1, 2, (String) null); sb.replace(1, 2, null);
assertEquals("b", sb.toString()); assertEquals("b", sb.toString());
sb.replace(1, 1000, "text"); sb.replace(1, 1000, "text");
assertEquals("btext", sb.toString()); assertEquals("btext", sb.toString());
@ -941,7 +941,7 @@ public void testReplaceFirst_StrMatcher_String() {
@Test @Test
public void testReplace_StrMatcher_String_int_int_int_VaryMatcher() { public void testReplace_StrMatcher_String_int_int_int_VaryMatcher() {
StrBuilder sb = new StrBuilder("abcbccba"); StrBuilder sb = new StrBuilder("abcbccba");
sb.replace((StrMatcher) null, "x", 0, sb.length(), -1); sb.replace(null, "x", 0, sb.length(), -1);
assertEquals("abcbccba", sb.toString()); assertEquals("abcbccba", sb.toString());
sb.replace(StrMatcher.charMatcher('a'), "x", 0, sb.length(), -1); sb.replace(StrMatcher.charMatcher('a'), "x", 0, sb.length(), -1);

2
src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java
View File

@ -197,7 +197,7 @@ public void testStringMatcher_String() {
assertEquals(0, matcher.isMatch(BUFFER2, 4)); assertEquals(0, matcher.isMatch(BUFFER2, 4));
assertEquals(0, matcher.isMatch(BUFFER2, 5)); assertEquals(0, matcher.isMatch(BUFFER2, 5));
assertSame(StrMatcher.noneMatcher(), StrMatcher.stringMatcher("")); assertSame(StrMatcher.noneMatcher(), StrMatcher.stringMatcher(""));
assertSame(StrMatcher.noneMatcher(), StrMatcher.stringMatcher((String) null)); assertSame(StrMatcher.noneMatcher(), StrMatcher.stringMatcher(null));
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------

12
src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java
View File

@ -477,7 +477,7 @@ public void testGetSetPrefix() {
sub.setVariablePrefix("<<"); sub.setVariablePrefix("<<");
assertTrue(sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher); assertTrue(sub.getVariablePrefixMatcher() instanceof StrMatcher.StringMatcher);
try { try {
sub.setVariablePrefix((String) null); sub.setVariablePrefix(null);
fail(); fail();
} catch (final IllegalArgumentException ex) { } catch (final IllegalArgumentException ex) {
// expected // expected
@ -488,7 +488,7 @@ public void testGetSetPrefix() {
sub.setVariablePrefixMatcher(matcher); sub.setVariablePrefixMatcher(matcher);
assertSame(matcher, sub.getVariablePrefixMatcher()); assertSame(matcher, sub.getVariablePrefixMatcher());
try { try {
sub.setVariablePrefixMatcher((StrMatcher) null); sub.setVariablePrefixMatcher(null);
fail(); fail();
} catch (final IllegalArgumentException ex) { } catch (final IllegalArgumentException ex) {
// expected // expected
@ -509,7 +509,7 @@ public void testGetSetSuffix() {
sub.setVariableSuffix("<<"); sub.setVariableSuffix("<<");
assertTrue(sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher); assertTrue(sub.getVariableSuffixMatcher() instanceof StrMatcher.StringMatcher);
try { try {
sub.setVariableSuffix((String) null); sub.setVariableSuffix(null);
fail(); fail();
} catch (final IllegalArgumentException ex) { } catch (final IllegalArgumentException ex) {
// expected // expected
@ -520,7 +520,7 @@ public void testGetSetSuffix() {
sub.setVariableSuffixMatcher(matcher); sub.setVariableSuffixMatcher(matcher);
assertSame(matcher, sub.getVariableSuffixMatcher()); assertSame(matcher, sub.getVariableSuffixMatcher());
try { try {
sub.setVariableSuffixMatcher((StrMatcher) null); sub.setVariableSuffixMatcher(null);
fail(); fail();
} catch (final IllegalArgumentException ex) { } catch (final IllegalArgumentException ex) {
// expected // expected
@ -540,13 +540,13 @@ public void testGetSetValueDelimiter() {
sub.setValueDelimiter("||"); sub.setValueDelimiter("||");
assertTrue(sub.getValueDelimiterMatcher() instanceof StrMatcher.StringMatcher); assertTrue(sub.getValueDelimiterMatcher() instanceof StrMatcher.StringMatcher);
sub.setValueDelimiter((String) null); sub.setValueDelimiter(null);
assertNull(sub.getValueDelimiterMatcher()); assertNull(sub.getValueDelimiterMatcher());
final StrMatcher matcher = StrMatcher.commaMatcher(); final StrMatcher matcher = StrMatcher.commaMatcher();
sub.setValueDelimiterMatcher(matcher); sub.setValueDelimiterMatcher(matcher);
assertSame(matcher, sub.getValueDelimiterMatcher()); assertSame(matcher, sub.getValueDelimiterMatcher());
sub.setValueDelimiterMatcher((StrMatcher) null); sub.setValueDelimiterMatcher(null);
assertNull(sub.getValueDelimiterMatcher()); assertNull(sub.getValueDelimiterMatcher());
} }

30
src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
View File

@ -171,17 +171,17 @@ public void testIsSameDay_Date() {
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameDay_DateNullNull() throws Exception { public void testIsSameDay_DateNullNull() throws Exception {
DateUtils.isSameDay((Date) null, (Date) null); DateUtils.isSameDay((Date) null, null);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameDay_DateNullNotNull() throws Exception { public void testIsSameDay_DateNullNotNull() throws Exception {
DateUtils.isSameDay((Date) null, new Date()); DateUtils.isSameDay(null, new Date());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameDay_DateNotNullNull() throws Exception { public void testIsSameDay_DateNotNullNull() throws Exception {
DateUtils.isSameDay(new Date(), (Date) null); DateUtils.isSameDay(new Date(), null);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -200,17 +200,17 @@ public void testIsSameDay_Cal() {
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameDay_CalNullNull() throws Exception { public void testIsSameDay_CalNullNull() throws Exception {
DateUtils.isSameDay((Calendar) null, (Calendar) null); DateUtils.isSameDay((Calendar) null, null);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameDay_CalNullNotNull() throws Exception { public void testIsSameDay_CalNullNotNull() throws Exception {
DateUtils.isSameDay((Calendar) null, Calendar.getInstance()); DateUtils.isSameDay(null, Calendar.getInstance());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameDay_CalNotNullNull() throws Exception { public void testIsSameDay_CalNotNullNull() throws Exception {
DateUtils.isSameDay(Calendar.getInstance(), (Calendar) null); DateUtils.isSameDay(Calendar.getInstance(), null);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -229,17 +229,17 @@ public void testIsSameInstant_Date() {
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameInstant_DateNullNull() throws Exception { public void testIsSameInstant_DateNullNull() throws Exception {
DateUtils.isSameInstant((Date) null, (Date) null); DateUtils.isSameInstant((Date) null, null);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameInstant_DateNullNotNull() throws Exception { public void testIsSameInstant_DateNullNotNull() throws Exception {
DateUtils.isSameInstant((Date) null, new Date()); DateUtils.isSameInstant(null, new Date());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameInstant_DateNotNullNull() throws Exception { public void testIsSameInstant_DateNotNullNull() throws Exception {
DateUtils.isSameInstant(new Date(), (Date) null); DateUtils.isSameInstant(new Date(), null);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -259,17 +259,17 @@ public void testIsSameInstant_Cal() {
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameInstant_CalNullNull() throws Exception { public void testIsSameInstant_CalNullNull() throws Exception {
DateUtils.isSameInstant((Calendar) null, (Calendar) null); DateUtils.isSameInstant((Calendar) null, null);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameInstant_CalNullNotNull() throws Exception { public void testIsSameInstant_CalNullNotNull() throws Exception {
DateUtils.isSameInstant((Calendar) null, Calendar.getInstance()); DateUtils.isSameInstant(null, Calendar.getInstance());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameInstant_CalNotNullNull() throws Exception { public void testIsSameInstant_CalNotNullNull() throws Exception {
DateUtils.isSameInstant(Calendar.getInstance(), (Calendar) null); DateUtils.isSameInstant(Calendar.getInstance(), null);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -297,17 +297,17 @@ public void testIsSameLocalTime_Cal() {
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameLocalTime_CalNullNull() throws Exception { public void testIsSameLocalTime_CalNullNull() throws Exception {
DateUtils.isSameLocalTime((Calendar) null, (Calendar) null); DateUtils.isSameLocalTime(null, null);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameLocalTime_CalNullNotNull() throws Exception { public void testIsSameLocalTime_CalNullNotNull() throws Exception {
DateUtils.isSameLocalTime((Calendar) null, Calendar.getInstance()); DateUtils.isSameLocalTime(null, Calendar.getInstance());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testIsSameLocalTime_CalNotNullNull() throws Exception { public void testIsSameLocalTime_CalNotNullNull() throws Exception {
DateUtils.isSameLocalTime(Calendar.getInstance(), (Calendar) null); DateUtils.isSameLocalTime(Calendar.getInstance(), null);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------