Simplify boolean tests and avoid boxing
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1387426 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 2008e4c..99b93e4 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -73,17 +73,17 @@
public void testHashCode() {
long[][] array1 = new long[][] {{2,5}, {4,5}};
long[][] array2 = new long[][] {{2,5}, {4,6}};
- assertEquals(true, ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array1));
- assertEquals(false, ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array2));
+ assertTrue(ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array1));
+ assertFalse(ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array2));
Object[] array3 = new Object[] {new String(new char[] {'A', 'B'})};
Object[] array4 = new Object[] {"AB"};
- assertEquals(true, ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array3));
- assertEquals(true, ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array4));
+ assertTrue(ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array3));
+ assertTrue(ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array4));
Object[] arrayA = new Object[] {new boolean[] {true, false}, new int[] {6, 7}};
Object[] arrayB = new Object[] {new boolean[] {true, false}, new int[] {6, 7}};
- assertEquals(true, ArrayUtils.hashCode(arrayB) == ArrayUtils.hashCode(arrayA));
+ assertTrue(ArrayUtils.hashCode(arrayB) == ArrayUtils.hashCode(arrayA));
}
//-----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/CharRangeTest.java b/src/test/java/org/apache/commons/lang3/CharRangeTest.java
index 7f3a14c..8410494 100644
--- a/src/test/java/org/apache/commons/lang3/CharRangeTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharRangeTest.java
@@ -148,12 +148,12 @@
CharRange rangeae = CharRange.isIn('a', 'e');
CharRange rangenotbf = CharRange.isIn('b', 'f');
- assertEquals(true, rangea.hashCode() == rangea.hashCode());
- assertEquals(true, rangea.hashCode() == CharRange.is('a').hashCode());
- assertEquals(true, rangeae.hashCode() == rangeae.hashCode());
- assertEquals(true, rangeae.hashCode() == CharRange.isIn('a', 'e').hashCode());
- assertEquals(true, rangenotbf.hashCode() == rangenotbf.hashCode());
- assertEquals(true, rangenotbf.hashCode() == CharRange.isIn('b', 'f').hashCode());
+ assertTrue(rangea.hashCode() == rangea.hashCode());
+ assertTrue(rangea.hashCode() == CharRange.is('a').hashCode());
+ assertTrue(rangeae.hashCode() == rangeae.hashCode());
+ assertTrue(rangeae.hashCode() == CharRange.isIn('a', 'e').hashCode());
+ assertTrue(rangenotbf.hashCode() == rangenotbf.hashCode());
+ assertTrue(rangenotbf.hashCode() == CharRange.isIn('b', 'f').hashCode());
assertFalse(rangea.hashCode() == rangeae.hashCode());
assertFalse(rangea.hashCode() == rangenotbf.hashCode());
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
index 729cbad..5c4b87e 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
@@ -92,10 +92,10 @@
final MutableByte mutNumB = new MutableByte((byte) 0);
final MutableByte mutNumC = new MutableByte((byte) 1);
- assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
- assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
- assertEquals(true, mutNumA.hashCode() == Byte.valueOf((byte) 0).hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
+ assertTrue(mutNumA.hashCode() == Byte.valueOf((byte) 0).hashCode());
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
index e564b4b..05adcf4 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
@@ -104,10 +104,10 @@
final MutableDouble mutNumB = new MutableDouble(0d);
final MutableDouble mutNumC = new MutableDouble(1d);
- assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
- assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
- assertEquals(true, mutNumA.hashCode() == Double.valueOf(0d).hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
+ assertTrue(mutNumA.hashCode() == Double.valueOf(0d).hashCode());
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
index 0a80b70..048c1c3 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
@@ -104,10 +104,10 @@
final MutableFloat mutNumB = new MutableFloat(0f);
final MutableFloat mutNumC = new MutableFloat(1f);
- assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
- assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
- assertEquals(true, mutNumA.hashCode() == Float.valueOf(0f).hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
+ assertTrue(mutNumA.hashCode() == Float.valueOf(0f).hashCode());
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
index 8da3973..446dc0c 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
@@ -99,10 +99,10 @@
final MutableInt mutNumB = new MutableInt(0);
final MutableInt mutNumC = new MutableInt(1);
- assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
- assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
- assertEquals(true, mutNumA.hashCode() == Integer.valueOf(0).hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
+ assertTrue(mutNumA.hashCode() == Integer.valueOf(0).hashCode());
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
index 02ac6d9..cf0b197 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
@@ -92,10 +92,10 @@
final MutableLong mutNumB = new MutableLong(0);
final MutableLong mutNumC = new MutableLong(1);
- assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
- assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
- assertEquals(true, mutNumA.hashCode() == Long.valueOf(0).hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
+ assertTrue(mutNumA.hashCode() == Long.valueOf(0).hashCode());
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
index a4742f7..4e5a7a1 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
@@ -79,11 +79,11 @@
final MutableObject<String> mutNumC = new MutableObject<String>("BETA");
final MutableObject<String> mutNumD = new MutableObject<String>(null);
- assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
- assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumD.hashCode());
- assertEquals(true, mutNumA.hashCode() == "ALPHA".hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumD.hashCode());
+ assertTrue(mutNumA.hashCode() == "ALPHA".hashCode());
assertEquals(0, mutNumD.hashCode());
}
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
index 136eebd..051e14d 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
@@ -92,10 +92,10 @@
final MutableShort mutNumB = new MutableShort((short) 0);
final MutableShort mutNumC = new MutableShort((short) 1);
- assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
- assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
- assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
- assertEquals(true, mutNumA.hashCode() == Short.valueOf((short) 0).hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
+ assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
+ assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
+ assertTrue(mutNumA.hashCode() == Short.valueOf((short) 0).hashCode());
}
@Test
