Fix various boxing errors
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1206700 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index 8bd6e4c..890e5b0 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -441,7 +441,7 @@
// Test null handling
assertEquals(ArrayUtils.EMPTY_OBJECT_ARRAY, ArrayUtils.nullToEmpty((Object[]) null));
// Test valid array handling
- Object[] original = new Object[] {true, false};
+ Object[] original = new Object[] {Boolean.TRUE, Boolean.FALSE};
assertEquals(original, ArrayUtils.nullToEmpty(original));
// Test empty array handling
Object[] empty = new Object[]{};
@@ -480,6 +480,7 @@
// Test null handling
assertEquals(ArrayUtils.EMPTY_LONG_OBJECT_ARRAY, ArrayUtils.nullToEmpty((Long[]) null));
// Test valid array handling
+ @SuppressWarnings("boxing")
Long[] original = new Long[] {1L, 2L};
assertEquals(original, ArrayUtils.nullToEmpty(original));
// Test empty array handling
@@ -506,6 +507,7 @@
// Test null handling
assertEquals(ArrayUtils.EMPTY_SHORT_OBJECT_ARRAY, ArrayUtils.nullToEmpty((Short[]) null));
// Test valid array handling
+ @SuppressWarnings("boxing")
Short[] original = new Short[] {1, 2};
assertEquals(original, ArrayUtils.nullToEmpty(original));
// Test empty array handling
diff --git a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
index a4b923d..c39b479 100644
--- a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.lang3.builder;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -282,15 +283,15 @@
public void testObjectBuild() {
TestObject o1 = new TestObject(4);
TestObject o2 = new TestObject(4);
- assertTrue(new CompareToBuilder().append(o1, o1).build() == 0);
- assertTrue(new CompareToBuilder().append(o1, o2).build() == 0);
+ assertEquals(Integer.valueOf(0), new CompareToBuilder().append(o1, o1).build());
+ assertEquals(Integer.valueOf(0), new CompareToBuilder().append(o1, o2).build());
o2.setA(5);
- assertTrue(new CompareToBuilder().append(o1, o2).build() < 0);
- assertTrue(new CompareToBuilder().append(o2, o1).build() > 0);
+ assertTrue(new CompareToBuilder().append(o1, o2).build().intValue() < 0);
+ assertTrue(new CompareToBuilder().append(o2, o1).build().intValue() > 0);
- assertTrue(new CompareToBuilder().append(o1, null).build() > 0);
- assertTrue(new CompareToBuilder().append((Object) null, (Object) null).build() == 0);
- assertTrue(new CompareToBuilder().append(null, o1).build() < 0);
+ assertTrue(new CompareToBuilder().append(o1, null).build().intValue() > 0);
+ assertEquals(Integer.valueOf(0), new CompareToBuilder().append((Object) null, (Object) null).build());
+ assertTrue(new CompareToBuilder().append(null, o1).build().intValue() < 0);
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java b/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
index 1ca71d4..72cde9c 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
@@ -179,7 +179,7 @@
BasicThreadFactory factory = builder.wrappedFactory(wrapped).daemon(
flag).build();
assertSame("Wrong thread", t, factory.newThread(r));
- assertEquals("Wrong daemon flag", flag, t.isDaemon());
+ assertTrue("Wrong daemon flag", flag == t.isDaemon());
EasyMock.verify(wrapped, r);
}
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
index 2098779..1c14c02 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
@@ -48,9 +48,9 @@
* @param expected the expected result
*/
private void checkEquals(Object obj, boolean expected) {
- assertEquals("Wrong result of equals", expected, init.equals(obj));
+ assertTrue("Wrong result of equals", expected == init.equals(obj));
if (obj != null) {
- assertEquals("Not symmetric", expected, obj.equals(init));
+ assertTrue("Not symmetric", expected == obj.equals(init));
if (expected) {
assertEquals("Different hash codes", init.hashCode(),
obj.hashCode());
diff --git a/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java b/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java
index 64a8205..2106f37 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java
@@ -62,7 +62,7 @@
triple.setRight(Boolean.FALSE);
assertEquals(42, triple.getLeft().intValue());
assertEquals("bar", triple.getMiddle());
- assertFalse(triple.getRight());
+ assertEquals(Boolean.FALSE, triple.getRight());
}
@Test
@@ -70,7 +70,7 @@
MutableTriple<Integer, String, Boolean> triple = MutableTriple.of(0, "foo", Boolean.TRUE);
assertEquals(0, triple.getLeft().intValue());
assertEquals("foo", triple.getMiddle());
- assertTrue(triple.getRight());
+ assertEquals(Boolean.TRUE, triple.getRight());
MutableTriple<Object, String, String> triple2 = MutableTriple.of(null, "bar", "hello");
assertNull(triple2.getLeft());
assertEquals("bar", triple2.getMiddle());
diff --git a/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java b/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java
index dd42ae0..630776f 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java
@@ -39,7 +39,7 @@
assertEquals(0, ((ImmutableTriple<Integer, String, Boolean>) triple).left.intValue());
assertEquals("foo", ((ImmutableTriple<Integer, String, Boolean>) triple).middle);
assertEquals(Boolean.TRUE, ((ImmutableTriple<Integer, String, Boolean>) triple).right);
- Triple<Object, String, Long> triple2 = Triple.of(null, "bar", 200L);
+ Triple<Object, String, Long> triple2 = Triple.of(null, "bar", Long.valueOf(200L));
assertTrue(triple2 instanceof ImmutableTriple<?, ?, ?>);
assertNull(((ImmutableTriple<Object, String, Long>) triple2).left);
assertEquals("bar", ((ImmutableTriple<Object, String, Long>) triple2).middle);
