You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/09/19 03:41:28 UTC
svn commit: r1387426 - in
/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3: ./
mutable/
Author: sebb
Date: Wed Sep 19 01:41:27 2012
New Revision: 1387426
URL: http://svn.apache.org/viewvc?rev=1387426&view=rev
Log:
Simplify boolean tests and avoid boxing
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java Wed Sep 19 01:41:27 2012
@@ -73,17 +73,17 @@ public class ArrayUtilsTest {
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));
}
//-----------------------------------------------------------------------
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java Wed Sep 19 01:41:27 2012
@@ -148,12 +148,12 @@ public class CharRangeTest {
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());
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java Wed Sep 19 01:41:27 2012
@@ -92,10 +92,10 @@ public class MutableByteTest {
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
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java Wed Sep 19 01:41:27 2012
@@ -104,10 +104,10 @@ public class MutableDoubleTest {
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
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java Wed Sep 19 01:41:27 2012
@@ -104,10 +104,10 @@ public class MutableFloatTest {
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
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java Wed Sep 19 01:41:27 2012
@@ -99,10 +99,10 @@ public class MutableIntTest {
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
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java Wed Sep 19 01:41:27 2012
@@ -92,10 +92,10 @@ public class MutableLongTest {
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
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java Wed Sep 19 01:41:27 2012
@@ -79,11 +79,11 @@ public class MutableObjectTest {
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());
}
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java?rev=1387426&r1=1387425&r2=1387426&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java Wed Sep 19 01:41:27 2012
@@ -92,10 +92,10 @@ public class MutableShortTest {
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