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
This commit is contained in:
parent
abecd96359
commit
bf57689e44
|
@ -73,17 +73,17 @@ public void testToString() {
|
||||||
public void testHashCode() {
|
public void testHashCode() {
|
||||||
long[][] array1 = new long[][] {{2,5}, {4,5}};
|
long[][] array1 = new long[][] {{2,5}, {4,5}};
|
||||||
long[][] array2 = new long[][] {{2,5}, {4,6}};
|
long[][] array2 = new long[][] {{2,5}, {4,6}};
|
||||||
assertEquals(true, ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array1));
|
assertTrue(ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array1));
|
||||||
assertEquals(false, ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array2));
|
assertFalse(ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array2));
|
||||||
|
|
||||||
Object[] array3 = new Object[] {new String(new char[] {'A', 'B'})};
|
Object[] array3 = new Object[] {new String(new char[] {'A', 'B'})};
|
||||||
Object[] array4 = new Object[] {"AB"};
|
Object[] array4 = new Object[] {"AB"};
|
||||||
assertEquals(true, ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array3));
|
assertTrue(ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array3));
|
||||||
assertEquals(true, ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array4));
|
assertTrue(ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array4));
|
||||||
|
|
||||||
Object[] arrayA = new Object[] {new boolean[] {true, false}, new int[] {6, 7}};
|
Object[] arrayA = new Object[] {new boolean[] {true, false}, new int[] {6, 7}};
|
||||||
Object[] arrayB = 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------
|
//-----------------------------------------------------------------------
|
||||||
|
|
|
@ -148,12 +148,12 @@ public void testHashCode() {
|
||||||
CharRange rangeae = CharRange.isIn('a', 'e');
|
CharRange rangeae = CharRange.isIn('a', 'e');
|
||||||
CharRange rangenotbf = CharRange.isIn('b', 'f');
|
CharRange rangenotbf = CharRange.isIn('b', 'f');
|
||||||
|
|
||||||
assertEquals(true, rangea.hashCode() == rangea.hashCode());
|
assertTrue(rangea.hashCode() == rangea.hashCode());
|
||||||
assertEquals(true, rangea.hashCode() == CharRange.is('a').hashCode());
|
assertTrue(rangea.hashCode() == CharRange.is('a').hashCode());
|
||||||
assertEquals(true, rangeae.hashCode() == rangeae.hashCode());
|
assertTrue(rangeae.hashCode() == rangeae.hashCode());
|
||||||
assertEquals(true, rangeae.hashCode() == CharRange.isIn('a', 'e').hashCode());
|
assertTrue(rangeae.hashCode() == CharRange.isIn('a', 'e').hashCode());
|
||||||
assertEquals(true, rangenotbf.hashCode() == rangenotbf.hashCode());
|
assertTrue(rangenotbf.hashCode() == rangenotbf.hashCode());
|
||||||
assertEquals(true, rangenotbf.hashCode() == CharRange.isIn('b', 'f').hashCode());
|
assertTrue(rangenotbf.hashCode() == CharRange.isIn('b', 'f').hashCode());
|
||||||
|
|
||||||
assertFalse(rangea.hashCode() == rangeae.hashCode());
|
assertFalse(rangea.hashCode() == rangeae.hashCode());
|
||||||
assertFalse(rangea.hashCode() == rangenotbf.hashCode());
|
assertFalse(rangea.hashCode() == rangenotbf.hashCode());
|
||||||
|
|
|
@ -92,10 +92,10 @@ public void testHashCode() {
|
||||||
final MutableByte mutNumB = new MutableByte((byte) 0);
|
final MutableByte mutNumB = new MutableByte((byte) 0);
|
||||||
final MutableByte mutNumC = new MutableByte((byte) 1);
|
final MutableByte mutNumC = new MutableByte((byte) 1);
|
||||||
|
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == Byte.valueOf((byte) 0).hashCode());
|
assertTrue(mutNumA.hashCode() == Byte.valueOf((byte) 0).hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -104,10 +104,10 @@ public void testHashCode() {
|
||||||
final MutableDouble mutNumB = new MutableDouble(0d);
|
final MutableDouble mutNumB = new MutableDouble(0d);
|
||||||
final MutableDouble mutNumC = new MutableDouble(1d);
|
final MutableDouble mutNumC = new MutableDouble(1d);
|
||||||
|
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == Double.valueOf(0d).hashCode());
|
assertTrue(mutNumA.hashCode() == Double.valueOf(0d).hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -104,10 +104,10 @@ public void testHashCode() {
|
||||||
final MutableFloat mutNumB = new MutableFloat(0f);
|
final MutableFloat mutNumB = new MutableFloat(0f);
|
||||||
final MutableFloat mutNumC = new MutableFloat(1f);
|
final MutableFloat mutNumC = new MutableFloat(1f);
|
||||||
|
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == Float.valueOf(0f).hashCode());
|
assertTrue(mutNumA.hashCode() == Float.valueOf(0f).hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -99,10 +99,10 @@ public void testHashCode() {
|
||||||
final MutableInt mutNumB = new MutableInt(0);
|
final MutableInt mutNumB = new MutableInt(0);
|
||||||
final MutableInt mutNumC = new MutableInt(1);
|
final MutableInt mutNumC = new MutableInt(1);
|
||||||
|
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == Integer.valueOf(0).hashCode());
|
assertTrue(mutNumA.hashCode() == Integer.valueOf(0).hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -92,10 +92,10 @@ public void testHashCode() {
|
||||||
final MutableLong mutNumB = new MutableLong(0);
|
final MutableLong mutNumB = new MutableLong(0);
|
||||||
final MutableLong mutNumC = new MutableLong(1);
|
final MutableLong mutNumC = new MutableLong(1);
|
||||||
|
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == Long.valueOf(0).hashCode());
|
assertTrue(mutNumA.hashCode() == Long.valueOf(0).hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -79,11 +79,11 @@ public void testHashCode() {
|
||||||
final MutableObject<String> mutNumC = new MutableObject<String>("BETA");
|
final MutableObject<String> mutNumC = new MutableObject<String>("BETA");
|
||||||
final MutableObject<String> mutNumD = new MutableObject<String>(null);
|
final MutableObject<String> mutNumD = new MutableObject<String>(null);
|
||||||
|
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumD.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumD.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == "ALPHA".hashCode());
|
assertTrue(mutNumA.hashCode() == "ALPHA".hashCode());
|
||||||
assertEquals(0, mutNumD.hashCode());
|
assertEquals(0, mutNumD.hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,10 +92,10 @@ public void testHashCode() {
|
||||||
final MutableShort mutNumB = new MutableShort((short) 0);
|
final MutableShort mutNumB = new MutableShort((short) 0);
|
||||||
final MutableShort mutNumC = new MutableShort((short) 1);
|
final MutableShort mutNumC = new MutableShort((short) 1);
|
||||||
|
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumA.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
|
assertTrue(mutNumA.hashCode() == mutNumB.hashCode());
|
||||||
assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
|
assertFalse(mutNumA.hashCode() == mutNumC.hashCode());
|
||||||
assertEquals(true, mutNumA.hashCode() == Short.valueOf((short) 0).hashCode());
|
assertTrue(mutNumA.hashCode() == Short.valueOf((short) 0).hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue