You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2018/10/13 19:11:18 UTC
[14/14] [lang] Clean up assertions (closes #376)
Clean up assertions (closes #376)
Use built-in assertion methods provides by
org.junit.jupiter.api.Assertions instead of reimplementing the same
logic with assertTrue and assertFalse.
Note that JUnit Jupiter 5.3.1 does not support deltas of 0 for
assertEquals(double, double, double) and
assertEquals(float, float, float), so these usages of assertTrue were
left untouched, and will be addressed when JUnit Jupiter 5.4, that
addresses this isssue, will be available (see
https://github.com/junit-team/junit5/pull/1613 for details).
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/3609993f
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/3609993f
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/3609993f
Branch: refs/heads/master
Commit: 3609993fb588017c77fc1781d697dcf1717cd73a
Parents: b3d86ca
Author: Allon Mureinik <mu...@gmail.com>
Authored: Sat Oct 13 20:05:40 2018 +0300
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sat Oct 13 21:10:54 2018 +0200
----------------------------------------------------------------------
.../commons/lang3/AnnotationUtilsTest.java | 9 +-
.../commons/lang3/ArrayUtilsInsertTest.java | 20 +-
.../apache/commons/lang3/ArrayUtilsTest.java | 32 +-
.../apache/commons/lang3/BooleanUtilsTest.java | 4 +-
.../org/apache/commons/lang3/CharRangeTest.java | 43 +-
.../org/apache/commons/lang3/CharSetTest.java | 27 +-
.../org/apache/commons/lang3/CharUtilsTest.java | 7 +-
.../apache/commons/lang3/ClassUtilsTest.java | 2 +-
.../org/apache/commons/lang3/RangeTest.java | 13 +-
.../lang3/StringUtilsEqualsIndexOfTest.java | 20 +-
.../apache/commons/lang3/StringUtilsTest.java | 22 +-
.../lang3/builder/CompareToBuilderTest.java | 190 +++---
.../commons/lang3/builder/DiffBuilderTest.java | 17 +-
.../commons/lang3/builder/DiffResultTest.java | 2 +-
.../lang3/builder/EqualsBuilderTest.java | 15 +-
.../concurrent/BasicThreadFactoryTest.java | 2 +-
.../concurrent/ConstantInitializerTest.java | 4 +-
.../exception/AbstractExceptionContextTest.java | 17 +-
.../lang3/exception/ContextedExceptionTest.java | 3 +-
.../ContextedRuntimeExceptionTest.java | 3 +-
.../apache/commons/lang3/math/FractionTest.java | 42 +-
.../commons/lang3/math/NumberUtilsTest.java | 627 +++++++++----------
.../lang3/mutable/MutableBooleanTest.java | 21 +-
.../commons/lang3/mutable/MutableByteTest.java | 27 +-
.../lang3/mutable/MutableDoubleTest.java | 27 +-
.../commons/lang3/mutable/MutableFloatTest.java | 27 +-
.../commons/lang3/mutable/MutableIntTest.java | 27 +-
.../commons/lang3/mutable/MutableLongTest.java | 27 +-
.../commons/lang3/mutable/MutableShortTest.java | 27 +-
.../lang3/text/ExtendedMessageFormatTest.java | 22 +-
.../commons/lang3/text/StrBuilderTest.java | 27 +-
.../commons/lang3/text/StrTokenizerTest.java | 11 +-
.../lang3/time/DateUtilsRoundingTest.java | 18 +-
.../lang3/time/DurationFormatUtilsTest.java | 11 +-
.../commons/lang3/time/FastDateFormatTest.java | 17 +-
.../commons/lang3/time/FastDateParserTest.java | 5 +-
.../commons/lang3/time/FastDatePrinterTest.java | 4 +-
.../commons/lang3/time/StopWatchTest.java | 2 +-
.../commons/lang3/tuple/ImmutablePairTest.java | 11 +-
.../lang3/tuple/ImmutableTripleTest.java | 11 +-
.../commons/lang3/tuple/MutablePairTest.java | 11 +-
.../commons/lang3/tuple/MutableTripleTest.java | 13 +-
.../apache/commons/lang3/tuple/PairTest.java | 11 +-
.../apache/commons/lang3/tuple/TripleTest.java | 16 +-
44 files changed, 730 insertions(+), 764 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java b/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java
index fb129d0..f4ed2a0 100644
--- a/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java
@@ -24,6 +24,7 @@ import static org.apache.commons.lang3.AnnotationUtilsTest.Stooge.MOE;
import static org.apache.commons.lang3.AnnotationUtilsTest.Stooge.SHEMP;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -484,16 +485,16 @@ public class AnnotationUtilsTest {
final Test generated = (Test) Proxy.newProxyInstance(Thread.currentThread()
.getContextClassLoader(), new Class[]{Test.class},
generatedTestInvocationHandler);
- assertTrue(real.equals(generated));
- assertFalse(generated.equals(real));
+ assertEquals(real, generated);
+ assertNotEquals(generated, real);
assertTrue(AnnotationUtils.equals(generated, real));
assertTrue(AnnotationUtils.equals(real, generated));
final Test generated2 = (Test) Proxy.newProxyInstance(Thread.currentThread()
.getContextClassLoader(), new Class[]{Test.class},
generatedTestInvocationHandler);
- assertFalse(generated.equals(generated2));
- assertFalse(generated2.equals(generated));
+ assertNotEquals(generated, generated2);
+ assertNotEquals(generated2, generated);
assertTrue(AnnotationUtils.equals(generated, generated2));
assertTrue(AnnotationUtils.equals(generated2, generated));
});
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/ArrayUtilsInsertTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsInsertTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsInsertTest.java
index 63b6386..689e79d 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsInsertTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsInsertTest.java
@@ -18,7 +18,7 @@
package org.apache.commons.lang3;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -36,7 +36,7 @@ public class ArrayUtilsInsertTest {
final boolean[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new boolean[0], ArrayUtils.insert(0, new boolean[0], null));
@@ -61,7 +61,7 @@ public class ArrayUtilsInsertTest {
final byte[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new byte[0], ArrayUtils.insert(0, new byte[0], null));
@@ -85,7 +85,7 @@ public class ArrayUtilsInsertTest {
final char[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new char[0], ArrayUtils.insert(0, new char[0], null));
@@ -110,7 +110,7 @@ public class ArrayUtilsInsertTest {
final double[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result, delta);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new double[0], ArrayUtils.insert(0, new double[0], null), delta);
@@ -135,7 +135,7 @@ public class ArrayUtilsInsertTest {
final float[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result, delta);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new float[0], ArrayUtils.insert(0, new float[0], null), delta);
@@ -159,7 +159,7 @@ public class ArrayUtilsInsertTest {
final int[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new int[0], ArrayUtils.insert(0, new int[0], null));
@@ -184,7 +184,7 @@ public class ArrayUtilsInsertTest {
final long[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new long[0], ArrayUtils.insert(0, new long[0], null));
@@ -209,7 +209,7 @@ public class ArrayUtilsInsertTest {
final short[] result = ArrayUtils.insert(42, array, null);
assertArrayEquals(array, result);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new short[0], ArrayUtils.insert(0, new short[0], null));
@@ -234,7 +234,7 @@ public class ArrayUtilsInsertTest {
final String[] result = ArrayUtils.insert(42, array, (String[]) null);
assertArrayEquals(array, result);
- assertFalse(array == result);
+ assertNotSame(array, result);
assertNull(ArrayUtils.insert(42, null, array));
assertArrayEquals(new String[0], ArrayUtils.insert(0, new String[0], (String[]) null));
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index 97658f8..c504409 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -77,17 +77,17 @@ public class ArrayUtilsTest {
public void testHashCode() {
final long[][] array1 = new long[][]{{2, 5}, {4, 5}};
final long[][] array2 = new long[][]{{2, 5}, {4, 6}};
- assertTrue(ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array1));
+ assertEquals(ArrayUtils.hashCode(array1), ArrayUtils.hashCode(array1));
assertFalse(ArrayUtils.hashCode(array1) == ArrayUtils.hashCode(array2));
final Object[] array3 = new Object[]{new String(new char[]{'A', 'B'})};
final Object[] array4 = new Object[]{"AB"};
- assertTrue(ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array3));
- assertTrue(ArrayUtils.hashCode(array3) == ArrayUtils.hashCode(array4));
+ assertEquals(ArrayUtils.hashCode(array3), ArrayUtils.hashCode(array3));
+ assertEquals(ArrayUtils.hashCode(array3), ArrayUtils.hashCode(array4));
final Object[] arrayA = new Object[]{new boolean[]{true, false}, new int[]{6, 7}};
final Object[] arrayB = new Object[]{new boolean[]{true, false}, new int[]{6, 7}};
- assertTrue(ArrayUtils.hashCode(arrayB) == ArrayUtils.hashCode(arrayA));
+ assertEquals(ArrayUtils.hashCode(arrayB), ArrayUtils.hashCode(arrayA));
}
//-----------------------------------------------------------------------
@@ -272,13 +272,13 @@ public class ArrayUtilsTest {
Object[] original1 = new Object[0];
Object[] cloned1 = ArrayUtils.clone(original1);
assertTrue(Arrays.equals(original1, cloned1));
- assertTrue(original1 != cloned1);
+ assertNotSame(original1, cloned1);
final StringBuilder builder = new StringBuilder("pick");
original1 = new Object[]{builder, "a", new String[]{"stick"}};
cloned1 = ArrayUtils.clone(original1);
assertTrue(Arrays.equals(original1, cloned1));
- assertTrue(original1 != cloned1);
+ assertNotSame(original1, cloned1);
assertSame(original1[0], cloned1[0]);
assertSame(original1[1], cloned1[1]);
assertSame(original1[2], cloned1[2]);
@@ -290,7 +290,7 @@ public class ArrayUtilsTest {
final boolean[] original = new boolean[]{true, false};
final boolean[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
@Test
@@ -299,7 +299,7 @@ public class ArrayUtilsTest {
final long[] original = new long[]{0L, 1L};
final long[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
@Test
@@ -308,7 +308,7 @@ public class ArrayUtilsTest {
final int[] original = new int[]{5, 8};
final int[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
@Test
@@ -317,7 +317,7 @@ public class ArrayUtilsTest {
final short[] original = new short[]{1, 4};
final short[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
@Test
@@ -326,7 +326,7 @@ public class ArrayUtilsTest {
final char[] original = new char[]{'a', '4'};
final char[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
@Test
@@ -335,7 +335,7 @@ public class ArrayUtilsTest {
final byte[] original = new byte[]{1, 6};
final byte[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
@Test
@@ -344,7 +344,7 @@ public class ArrayUtilsTest {
final double[] original = new double[]{2.4d, 5.7d};
final double[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
@Test
@@ -353,7 +353,7 @@ public class ArrayUtilsTest {
final float[] original = new float[]{2.6f, 6.4f};
final float[] cloned = ArrayUtils.clone(original);
assertTrue(Arrays.equals(original, cloned));
- assertTrue(original != cloned);
+ assertNotSame(original, cloned);
}
//-----------------------------------------------------------------------
@@ -365,8 +365,8 @@ public class ArrayUtilsTest {
public void testNullToEmptyGenericNull() {
final TestClass[] output = ArrayUtils.nullToEmpty(null, TestClass[].class);
- assertTrue(output != null);
- assertTrue(output.length == 0);
+ assertNotNull(output);
+ assertEquals(0, output.length);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java b/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
index bea660d..dddb416 100644
--- a/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
@@ -1009,8 +1009,8 @@ public class BooleanUtilsTest {
@Test
public void testCompare(){
assertTrue(BooleanUtils.compare(true, false) > 0);
- assertTrue(BooleanUtils.compare(true, true) == 0);
- assertTrue(BooleanUtils.compare(false, false) == 0);
+ assertEquals(0, BooleanUtils.compare(true, true));
+ assertEquals(0, BooleanUtils.compare(false, false));
assertTrue(BooleanUtils.compare(false, true) < 0);
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/CharRangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/CharRangeTest.java b/src/test/java/org/apache/commons/lang3/CharRangeTest.java
index 9704dfe..5e9c019 100644
--- a/src/test/java/org/apache/commons/lang3/CharRangeTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharRangeTest.java
@@ -20,6 +20,7 @@ package org.apache.commons.lang3;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -123,21 +124,21 @@ public class CharRangeTest {
final CharRange rangeae = CharRange.isIn('a', 'e');
final CharRange rangenotbf = CharRange.isIn('b', 'f');
- assertFalse(rangea.equals(null));
-
- assertTrue(rangea.equals(rangea));
- assertTrue(rangea.equals(CharRange.is('a')));
- assertTrue(rangeae.equals(rangeae));
- assertTrue(rangeae.equals(CharRange.isIn('a', 'e')));
- assertTrue(rangenotbf.equals(rangenotbf));
- assertTrue(rangenotbf.equals(CharRange.isIn('b', 'f')));
-
- assertFalse(rangea.equals(rangeae));
- assertFalse(rangea.equals(rangenotbf));
- assertFalse(rangeae.equals(rangea));
- assertFalse(rangeae.equals(rangenotbf));
- assertFalse(rangenotbf.equals(rangea));
- assertFalse(rangenotbf.equals(rangeae));
+ assertNotEquals(null, rangea);
+
+ assertEquals(rangea, rangea);
+ assertEquals(rangea, CharRange.is('a'));
+ assertEquals(rangeae, rangeae);
+ assertEquals(rangeae, CharRange.isIn('a', 'e'));
+ assertEquals(rangenotbf, rangenotbf);
+ assertEquals(rangenotbf, CharRange.isIn('b', 'f'));
+
+ assertNotEquals(rangea, rangeae);
+ assertNotEquals(rangea, rangenotbf);
+ assertNotEquals(rangeae, rangea);
+ assertNotEquals(rangeae, rangenotbf);
+ assertNotEquals(rangenotbf, rangea);
+ assertNotEquals(rangenotbf, rangeae);
}
@Test
@@ -146,12 +147,12 @@ public class CharRangeTest {
final CharRange rangeae = CharRange.isIn('a', 'e');
final CharRange rangenotbf = CharRange.isIn('b', 'f');
- 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());
+ assertEquals(rangea.hashCode(), rangea.hashCode());
+ assertEquals(rangea.hashCode(), CharRange.is('a').hashCode());
+ assertEquals(rangeae.hashCode(), rangeae.hashCode());
+ assertEquals(rangeae.hashCode(), CharRange.isIn('a', 'e').hashCode());
+ assertEquals(rangenotbf.hashCode(), rangenotbf.hashCode());
+ assertEquals(rangenotbf.hashCode(), CharRange.isIn('b', 'f').hashCode());
assertFalse(rangea.hashCode() == rangeae.hashCode());
assertFalse(rangea.hashCode() == rangenotbf.hashCode());
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/CharSetTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/CharSetTest.java b/src/test/java/org/apache/commons/lang3/CharSetTest.java
index 50683f9..e0f318d 100644
--- a/src/test/java/org/apache/commons/lang3/CharSetTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharSetTest.java
@@ -20,6 +20,7 @@ package org.apache.commons.lang3;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -349,22 +350,22 @@ public class CharSetTest {
final CharSet notatoc = CharSet.getInstance("^a-c");
final CharSet notatoc2 = CharSet.getInstance("^a-c");
- assertFalse(abc.equals(null));
+ assertNotEquals(null, abc);
- assertTrue(abc.equals(abc));
- assertTrue(abc.equals(abc2));
- assertFalse(abc.equals(atoc));
- assertFalse(abc.equals(notatoc));
+ assertEquals(abc, abc);
+ assertEquals(abc, abc2);
+ assertNotEquals(abc, atoc);
+ assertNotEquals(abc, notatoc);
- assertFalse(atoc.equals(abc));
- assertTrue(atoc.equals(atoc));
- assertTrue(atoc.equals(atoc2));
- assertFalse(atoc.equals(notatoc));
+ assertNotEquals(atoc, abc);
+ assertEquals(atoc, atoc);
+ assertEquals(atoc, atoc2);
+ assertNotEquals(atoc, notatoc);
- assertFalse(notatoc.equals(abc));
- assertFalse(notatoc.equals(atoc));
- assertTrue(notatoc.equals(notatoc));
- assertTrue(notatoc.equals(notatoc2));
+ assertNotEquals(notatoc, abc);
+ assertNotEquals(notatoc, atoc);
+ assertEquals(notatoc, notatoc);
+ assertEquals(notatoc, notatoc2);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
index 5d4d69a..d4ba3e6 100644
--- a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.lang3;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -41,7 +42,7 @@ public class CharUtilsTest {
@Test
public void testCompare() {
assertTrue(CharUtils.compare('a', 'b') < 0);
- assertTrue(CharUtils.compare('c', 'c') == 0);
+ assertEquals(0, CharUtils.compare('c', 'c'));
assertTrue(CharUtils.compare('c', 'a') > 0);
}
@@ -241,7 +242,7 @@ public class CharUtilsTest {
final Character ch = CharUtils.toCharacterObject((char) i);
final Character ch2 = CharUtils.toCharacterObject((char) i);
assertEquals(ch, ch2);
- assertTrue(ch != ch2);
+ assertNotSame(ch, ch2);
assertEquals(i, ch.charValue());
assertEquals(i, ch2.charValue());
}
@@ -311,7 +312,7 @@ public class CharUtilsTest {
final String str = CharUtils.toString((char) i);
final String str2 = CharUtils.toString((char) i);
assertEquals(str, str2);
- assertTrue(str != str2);
+ assertNotSame(str, str2);
assertEquals(1, str.length());
assertEquals(i, str.charAt(0));
assertEquals(1, str2.length());
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
index 219f0b8..59c9dad 100644
--- a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
@@ -663,7 +663,7 @@ public class ClassUtilsTest {
assertEquals("Inner", ClassUtils.getSimpleName(new Inner(), "<null>"));
assertEquals("String", ClassUtils.getSimpleName("hello", "<null>"));
assertEquals("<null>", ClassUtils.getSimpleName(null, "<null>"));
- assertEquals(null, ClassUtils.getSimpleName(null, null));
+ assertNull(ClassUtils.getSimpleName(null, null));
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/RangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/RangeTest.java b/src/test/java/org/apache/commons/lang3/RangeTest.java
index 32173c8..3c2cd48 100644
--- a/src/test/java/org/apache/commons/lang3/RangeTest.java
+++ b/src/test/java/org/apache/commons/lang3/RangeTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.lang3;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -147,12 +148,12 @@ public class RangeTest {
assertEquals(byteRange, byteRange);
assertEquals(byteRange, byteRange2);
assertEquals(byteRange2, byteRange2);
- assertTrue(byteRange.equals(byteRange));
- assertTrue(byteRange2.equals(byteRange2));
- assertTrue(byteRange3.equals(byteRange3));
- assertFalse(byteRange2.equals(byteRange3));
- assertFalse(byteRange2.equals(null));
- assertFalse(byteRange2.equals("Ni!"));
+ assertEquals(byteRange, byteRange);
+ assertEquals(byteRange2, byteRange2);
+ assertEquals(byteRange3, byteRange3);
+ assertNotEquals(byteRange2, byteRange3);
+ assertNotEquals(null, byteRange2);
+ assertNotEquals("Ni!", byteRange2);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
index c9a9fd1..070fe90 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
@@ -200,10 +200,10 @@ public class StringUtilsEqualsIndexOfTest {
//-----------------------------------------------------------------------
@Test
public void testCompare_StringString() {
- assertTrue(StringUtils.compare(null, null) == 0);
+ assertEquals(0, StringUtils.compare(null, null));
assertTrue(StringUtils.compare(null, "a") < 0);
assertTrue(StringUtils.compare("a", null) > 0);
- assertTrue(StringUtils.compare("abc", "abc") == 0);
+ assertEquals(0, StringUtils.compare("abc", "abc"));
assertTrue(StringUtils.compare("a", "b") < 0);
assertTrue(StringUtils.compare("b", "a") > 0);
assertTrue(StringUtils.compare("a", "B") > 0);
@@ -215,12 +215,12 @@ public class StringUtilsEqualsIndexOfTest {
@Test
public void testCompare_StringStringBoolean() {
- assertTrue(StringUtils.compare(null, null, false) == 0);
+ assertEquals(0, StringUtils.compare(null, null, false));
assertTrue(StringUtils.compare(null, "a", true) < 0);
assertTrue(StringUtils.compare(null, "a", false) > 0);
assertTrue(StringUtils.compare("a", null, true) > 0);
assertTrue(StringUtils.compare("a", null, false) < 0);
- assertTrue(StringUtils.compare("abc", "abc", false) == 0);
+ assertEquals(0, StringUtils.compare("abc", "abc", false));
assertTrue(StringUtils.compare("a", "b", false) < 0);
assertTrue(StringUtils.compare("b", "a", false) > 0);
assertTrue(StringUtils.compare("a", "B", false) > 0);
@@ -232,11 +232,11 @@ public class StringUtilsEqualsIndexOfTest {
@Test
public void testCompareIgnoreCase_StringString() {
- assertTrue(StringUtils.compareIgnoreCase(null, null) == 0);
+ assertEquals(0, StringUtils.compareIgnoreCase(null, null));
assertTrue(StringUtils.compareIgnoreCase(null, "a") < 0);
assertTrue(StringUtils.compareIgnoreCase("a", null) > 0);
- assertTrue(StringUtils.compareIgnoreCase("abc", "abc") == 0);
- assertTrue(StringUtils.compareIgnoreCase("abc", "ABC") == 0);
+ assertEquals(0, StringUtils.compareIgnoreCase("abc", "abc"));
+ assertEquals(0, StringUtils.compareIgnoreCase("abc", "ABC"));
assertTrue(StringUtils.compareIgnoreCase("a", "b") < 0);
assertTrue(StringUtils.compareIgnoreCase("b", "a") > 0);
assertTrue(StringUtils.compareIgnoreCase("a", "B") < 0);
@@ -249,13 +249,13 @@ public class StringUtilsEqualsIndexOfTest {
@Test
public void testCompareIgnoreCase_StringStringBoolean() {
- assertTrue(StringUtils.compareIgnoreCase(null, null, false) == 0);
+ assertEquals(0, StringUtils.compareIgnoreCase(null, null, false));
assertTrue(StringUtils.compareIgnoreCase(null, "a", true) < 0);
assertTrue(StringUtils.compareIgnoreCase(null, "a", false) > 0);
assertTrue(StringUtils.compareIgnoreCase("a", null, true) > 0);
assertTrue(StringUtils.compareIgnoreCase("a", null, false) < 0);
- assertTrue(StringUtils.compareIgnoreCase("abc", "abc", false) == 0);
- assertTrue(StringUtils.compareIgnoreCase("abc", "ABC", false) == 0);
+ assertEquals(0, StringUtils.compareIgnoreCase("abc", "abc", false));
+ assertEquals(0, StringUtils.compareIgnoreCase("abc", "ABC", false));
assertTrue(StringUtils.compareIgnoreCase("a", "b", false) < 0);
assertTrue(StringUtils.compareIgnoreCase("b", "a", false) > 0);
assertTrue(StringUtils.compareIgnoreCase("a", "B", false) < 0);
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
index 4da5f0b..afcd6b2 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
@@ -1653,9 +1653,9 @@ public class StringUtilsTest {
assertEquals("", StringUtils.chomp("", "foo"), "chomp(String, String) failed");
assertEquals("", StringUtils.chomp("", null), "chomp(String, String) failed");
assertEquals("", StringUtils.chomp("", ""), "chomp(String, String) failed");
- assertEquals(null, StringUtils.chomp(null, "foo"), "chomp(String, String) failed");
- assertEquals(null, StringUtils.chomp(null, null), "chomp(String, String) failed");
- assertEquals(null, StringUtils.chomp(null, ""), "chomp(String, String) failed");
+ assertNull(StringUtils.chomp(null, "foo"), "chomp(String, String) failed");
+ assertNull(StringUtils.chomp(null, null), "chomp(String, String) failed");
+ assertNull(StringUtils.chomp(null, ""), "chomp(String, String) failed");
assertEquals("", StringUtils.chomp("foo", "foo"), "chomp(String, String) failed");
assertEquals(" ", StringUtils.chomp(" foo", "foo"), "chomp(String, String) failed");
assertEquals("foo ", StringUtils.chomp("foo ", "foo"), "chomp(String, String) failed");
@@ -2920,14 +2920,14 @@ public class StringUtilsTest {
*/
@Test
public void testAppendIfMissing() {
- assertEquals(null, StringUtils.appendIfMissing(null, null), "appendIfMissing(null,null)");
+ assertNull(StringUtils.appendIfMissing(null, null), "appendIfMissing(null,null)");
assertEquals("abc", StringUtils.appendIfMissing("abc", null), "appendIfMissing(abc,null)");
assertEquals("xyz", StringUtils.appendIfMissing("", "xyz"), "appendIfMissing(\"\",xyz)");
assertEquals("abcxyz", StringUtils.appendIfMissing("abc", "xyz"), "appendIfMissing(abc,xyz)");
assertEquals("abcxyz", StringUtils.appendIfMissing("abcxyz", "xyz"), "appendIfMissing(abcxyz,xyz)");
assertEquals("aXYZxyz", StringUtils.appendIfMissing("aXYZ", "xyz"), "appendIfMissing(aXYZ,xyz)");
- assertEquals(null, StringUtils.appendIfMissing(null, null, (CharSequence[]) null), "appendIfMissing(null,null,null)");
+ assertNull(StringUtils.appendIfMissing(null, null, (CharSequence[]) null), "appendIfMissing(null,null,null)");
assertEquals("abc", StringUtils.appendIfMissing("abc", null, (CharSequence[]) null), "appendIfMissing(abc,null,null)");
assertEquals("xyz", StringUtils.appendIfMissing("", "xyz", (CharSequence[]) null), "appendIfMissing(\"\",xyz,null))");
assertEquals("abcxyz", StringUtils.appendIfMissing("abc", "xyz", new CharSequence[]{null}), "appendIfMissing(abc,xyz,{null})");
@@ -2944,14 +2944,14 @@ public class StringUtilsTest {
*/
@Test
public void testAppendIfMissingIgnoreCase() {
- assertEquals(null, StringUtils.appendIfMissingIgnoreCase(null, null), "appendIfMissingIgnoreCase(null,null)");
+ assertNull(StringUtils.appendIfMissingIgnoreCase(null, null), "appendIfMissingIgnoreCase(null,null)");
assertEquals("abc", StringUtils.appendIfMissingIgnoreCase("abc", null), "appendIfMissingIgnoreCase(abc,null)");
assertEquals("xyz", StringUtils.appendIfMissingIgnoreCase("", "xyz"), "appendIfMissingIgnoreCase(\"\",xyz)");
assertEquals("abcxyz", StringUtils.appendIfMissingIgnoreCase("abc", "xyz"), "appendIfMissingIgnoreCase(abc,xyz)");
assertEquals("abcxyz", StringUtils.appendIfMissingIgnoreCase("abcxyz", "xyz"), "appendIfMissingIgnoreCase(abcxyz,xyz)");
assertEquals("abcXYZ", StringUtils.appendIfMissingIgnoreCase("abcXYZ", "xyz"), "appendIfMissingIgnoreCase(abcXYZ,xyz)");
- assertEquals(null, StringUtils.appendIfMissingIgnoreCase(null, null, (CharSequence[]) null), "appendIfMissingIgnoreCase(null,null,null)");
+ assertNull(StringUtils.appendIfMissingIgnoreCase(null, null, (CharSequence[]) null), "appendIfMissingIgnoreCase(null,null,null)");
assertEquals("abc", StringUtils.appendIfMissingIgnoreCase("abc", null, (CharSequence[]) null), "appendIfMissingIgnoreCase(abc,null,null)");
assertEquals("xyz", StringUtils.appendIfMissingIgnoreCase("", "xyz", (CharSequence[]) null), "appendIfMissingIgnoreCase(\"\",xyz,null)");
assertEquals("abcxyz", StringUtils.appendIfMissingIgnoreCase("abc", "xyz", new CharSequence[]{null}), "appendIfMissingIgnoreCase(abc,xyz,{null})");
@@ -2968,14 +2968,14 @@ public class StringUtilsTest {
*/
@Test
public void testPrependIfMissing() {
- assertEquals(null, StringUtils.prependIfMissing(null, null), "prependIfMissing(null,null)");
+ assertNull(StringUtils.prependIfMissing(null, null), "prependIfMissing(null,null)");
assertEquals("abc", StringUtils.prependIfMissing("abc", null), "prependIfMissing(abc,null)");
assertEquals("xyz", StringUtils.prependIfMissing("", "xyz"), "prependIfMissing(\"\",xyz)");
assertEquals("xyzabc", StringUtils.prependIfMissing("abc", "xyz"), "prependIfMissing(abc,xyz)");
assertEquals("xyzabc", StringUtils.prependIfMissing("xyzabc", "xyz"), "prependIfMissing(xyzabc,xyz)");
assertEquals("xyzXYZabc", StringUtils.prependIfMissing("XYZabc", "xyz"), "prependIfMissing(XYZabc,xyz)");
- assertEquals(null, StringUtils.prependIfMissing(null, null, (CharSequence[]) null), "prependIfMissing(null,null null)");
+ assertNull(StringUtils.prependIfMissing(null, null, (CharSequence[]) null), "prependIfMissing(null,null null)");
assertEquals("abc", StringUtils.prependIfMissing("abc", null, (CharSequence[]) null), "prependIfMissing(abc,null,null)");
assertEquals("xyz", StringUtils.prependIfMissing("", "xyz", (CharSequence[]) null), "prependIfMissing(\"\",xyz,null)");
assertEquals("xyzabc", StringUtils.prependIfMissing("abc", "xyz", new CharSequence[]{null}), "prependIfMissing(abc,xyz,{null})");
@@ -2992,14 +2992,14 @@ public class StringUtilsTest {
*/
@Test
public void testPrependIfMissingIgnoreCase() {
- assertEquals(null, StringUtils.prependIfMissingIgnoreCase(null, null), "prependIfMissingIgnoreCase(null,null)");
+ assertNull(StringUtils.prependIfMissingIgnoreCase(null, null), "prependIfMissingIgnoreCase(null,null)");
assertEquals("abc", StringUtils.prependIfMissingIgnoreCase("abc", null), "prependIfMissingIgnoreCase(abc,null)");
assertEquals("xyz", StringUtils.prependIfMissingIgnoreCase("", "xyz"), "prependIfMissingIgnoreCase(\"\",xyz)");
assertEquals("xyzabc", StringUtils.prependIfMissingIgnoreCase("abc", "xyz"), "prependIfMissingIgnoreCase(abc,xyz)");
assertEquals("xyzabc", StringUtils.prependIfMissingIgnoreCase("xyzabc", "xyz"), "prependIfMissingIgnoreCase(xyzabc,xyz)");
assertEquals("XYZabc", StringUtils.prependIfMissingIgnoreCase("XYZabc", "xyz"), "prependIfMissingIgnoreCase(XYZabc,xyz)");
- assertEquals(null, StringUtils.prependIfMissingIgnoreCase(null, null, (CharSequence[]) null), "prependIfMissingIgnoreCase(null,null null)");
+ assertNull(StringUtils.prependIfMissingIgnoreCase(null, null, (CharSequence[]) null), "prependIfMissingIgnoreCase(null,null null)");
assertEquals("abc", StringUtils.prependIfMissingIgnoreCase("abc", null, (CharSequence[]) null), "prependIfMissingIgnoreCase(abc,null,null)");
assertEquals("xyz", StringUtils.prependIfMissingIgnoreCase("", "xyz", (CharSequence[]) null), "prependIfMissingIgnoreCase(\"\",xyz,null)");
assertEquals("xyzabc", StringUtils.prependIfMissingIgnoreCase("abc", "xyz", new CharSequence[]{null}), "prependIfMissingIgnoreCase(abc,xyz,{null})");
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
----------------------------------------------------------------------
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 86372b6..ef3b7c5 100644
--- a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
@@ -101,8 +101,8 @@ public class CompareToBuilderTest {
public void testReflectionCompare() {
final TestObject o1 = new TestObject(4);
final TestObject o2 = new TestObject(4);
- assertTrue(CompareToBuilder.reflectionCompare(o1, o1) == 0);
- assertTrue(CompareToBuilder.reflectionCompare(o1, o2) == 0);
+ assertEquals(0, CompareToBuilder.reflectionCompare(o1, o1));
+ assertEquals(0, CompareToBuilder.reflectionCompare(o1, o2));
o2.setA(5);
assertTrue(CompareToBuilder.reflectionCompare(o1, o2) < 0);
assertTrue(CompareToBuilder.reflectionCompare(o2, o1) > 0);
@@ -166,9 +166,9 @@ public class CompareToBuilderTest {
}
private void assertXYZCompareOrder(final Object x, final Object y, final Object z, final boolean testTransients, final String[] excludeFields) {
- assertTrue(0 == CompareToBuilder.reflectionCompare(x, x, testTransients, null, excludeFields));
- assertTrue(0 == CompareToBuilder.reflectionCompare(y, y, testTransients, null, excludeFields));
- assertTrue(0 == CompareToBuilder.reflectionCompare(z, z, testTransients, null, excludeFields));
+ assertEquals(0, CompareToBuilder.reflectionCompare(x, x, testTransients, null, excludeFields));
+ assertEquals(0, CompareToBuilder.reflectionCompare(y, y, testTransients, null, excludeFields));
+ assertEquals(0, CompareToBuilder.reflectionCompare(z, z, testTransients, null, excludeFields));
assertTrue(0 > CompareToBuilder.reflectionCompare(x, y, testTransients, null, excludeFields));
assertTrue(0 > CompareToBuilder.reflectionCompare(x, z, testTransients, null, excludeFields));
@@ -214,7 +214,7 @@ public class CompareToBuilderTest {
private void assertReflectionCompareContract(final Object x, final Object y, final Object z, final boolean testTransients, final String[] excludeFields) {
// signum
- assertTrue(reflectionCompareSignum(x, y, testTransients, excludeFields) == -reflectionCompareSignum(y, x, testTransients, excludeFields));
+ assertEquals(reflectionCompareSignum(x, y, testTransients, excludeFields), -reflectionCompareSignum(y, x, testTransients, excludeFields));
// transitive
if (CompareToBuilder.reflectionCompare(x, y, testTransients, null, excludeFields) > 0
@@ -224,7 +224,7 @@ public class CompareToBuilderTest {
// un-named
if (CompareToBuilder.reflectionCompare(x, y, testTransients, null, excludeFields) == 0) {
- assertTrue(reflectionCompareSignum(x, z, testTransients, excludeFields) == -reflectionCompareSignum(y, z, testTransients, excludeFields));
+ assertEquals(reflectionCompareSignum(x, z, testTransients, excludeFields), -reflectionCompareSignum(y, z, testTransients, excludeFields));
}
// strongly recommended but not strictly required
@@ -249,7 +249,7 @@ public class CompareToBuilderTest {
public void testAppendSuper() {
final TestObject o1 = new TestObject(4);
final TestObject o2 = new TestObject(5);
- assertTrue(new CompareToBuilder().appendSuper(0).append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().appendSuper(0).append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().appendSuper(0).append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().appendSuper(0).append(o2, o1).toComparison() > 0);
@@ -264,14 +264,14 @@ public class CompareToBuilderTest {
public void testObject() {
final TestObject o1 = new TestObject(4);
final TestObject o2 = new TestObject(4);
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(o1, o2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(o1, o2).toComparison());
o2.setA(5);
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((Object) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((Object) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, o1).toComparison() < 0);
}
@@ -301,17 +301,17 @@ public class CompareToBuilderTest {
public void testObjectComparator() {
final String o1 = "Fred";
String o2 = "Fred";
- assertTrue(new CompareToBuilder().append(o1, o1, String.CASE_INSENSITIVE_ORDER).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(o1, o2, String.CASE_INSENSITIVE_ORDER).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1, String.CASE_INSENSITIVE_ORDER).toComparison());
+ assertEquals(0, new CompareToBuilder().append(o1, o2, String.CASE_INSENSITIVE_ORDER).toComparison());
o2 = "FRED";
- assertTrue(new CompareToBuilder().append(o1, o2, String.CASE_INSENSITIVE_ORDER).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(o2, o1, String.CASE_INSENSITIVE_ORDER).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o2, String.CASE_INSENSITIVE_ORDER).toComparison());
+ assertEquals(0, new CompareToBuilder().append(o2, o1, String.CASE_INSENSITIVE_ORDER).toComparison());
o2 = "FREDA";
assertTrue(new CompareToBuilder().append(o1, o2, 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(null, null, String.CASE_INSENSITIVE_ORDER).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(null, null, String.CASE_INSENSITIVE_ORDER).toComparison());
assertTrue(new CompareToBuilder().append(null, o1, String.CASE_INSENSITIVE_ORDER).toComparison() < 0);
}
@@ -319,14 +319,14 @@ public class CompareToBuilderTest {
public void testObjectComparatorNull() {
final String o1 = "Fred";
String o2 = "Fred";
- assertTrue(new CompareToBuilder().append(o1, o1, null).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(o1, o2, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1, null).toComparison());
+ assertEquals(0, new CompareToBuilder().append(o1, o2, null).toComparison());
o2 = "Zebra";
assertTrue(new CompareToBuilder().append(o1, o2, 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(null, null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(null, null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, o1, null).toComparison() < 0);
}
@@ -334,7 +334,7 @@ public class CompareToBuilderTest {
public void testLong() {
final long o1 = 1L;
final long o2 = 2L;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Long.MAX_VALUE).toComparison() < 0);
@@ -347,7 +347,7 @@ public class CompareToBuilderTest {
public void testInt() {
final int o1 = 1;
final int o2 = 2;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Integer.MAX_VALUE).toComparison() < 0);
@@ -360,7 +360,7 @@ public class CompareToBuilderTest {
public void testShort() {
final short o1 = 1;
final short o2 = 2;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Short.MAX_VALUE).toComparison() < 0);
@@ -373,7 +373,7 @@ public class CompareToBuilderTest {
public void testChar() {
final char o1 = 1;
final char o2 = 2;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Character.MAX_VALUE).toComparison() < 0);
@@ -386,7 +386,7 @@ public class CompareToBuilderTest {
public void testByte() {
final byte o1 = 1;
final byte o2 = 2;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Byte.MAX_VALUE).toComparison() < 0);
@@ -399,14 +399,14 @@ public class CompareToBuilderTest {
public void testDouble() {
final double o1 = 1;
final double o2 = 2;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Double.MAX_VALUE).toComparison() < 0);
assertTrue(new CompareToBuilder().append(Double.MAX_VALUE, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Double.MIN_VALUE).toComparison() > 0);
assertTrue(new CompareToBuilder().append(Double.MIN_VALUE, o1).toComparison() < 0);
- assertTrue(new CompareToBuilder().append(Double.NaN, Double.NaN).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(Double.NaN, Double.NaN).toComparison());
assertTrue(new CompareToBuilder().append(Double.NaN, Double.MAX_VALUE).toComparison() > 0);
assertTrue(new CompareToBuilder().append(Double.POSITIVE_INFINITY, Double.MAX_VALUE).toComparison() > 0);
assertTrue(new CompareToBuilder().append(Double.NEGATIVE_INFINITY, Double.MIN_VALUE).toComparison() < 0);
@@ -420,14 +420,14 @@ public class CompareToBuilderTest {
public void testFloat() {
final float o1 = 1;
final float o2 = 2;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() < 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Float.MAX_VALUE).toComparison() < 0);
assertTrue(new CompareToBuilder().append(Float.MAX_VALUE, o1).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o1, Float.MIN_VALUE).toComparison() > 0);
assertTrue(new CompareToBuilder().append(Float.MIN_VALUE, o1).toComparison() < 0);
- assertTrue(new CompareToBuilder().append(Float.NaN, Float.NaN).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(Float.NaN, Float.NaN).toComparison());
assertTrue(new CompareToBuilder().append(Float.NaN, Float.MAX_VALUE).toComparison() > 0);
assertTrue(new CompareToBuilder().append(Float.POSITIVE_INFINITY, Float.MAX_VALUE).toComparison() > 0);
assertTrue(new CompareToBuilder().append(Float.NEGATIVE_INFINITY, Float.MIN_VALUE).toComparison() < 0);
@@ -441,8 +441,8 @@ public class CompareToBuilderTest {
public void testBoolean() {
final boolean o1 = true;
final boolean o2 = false;
- assertTrue(new CompareToBuilder().append(o1, o1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(o2, o2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(o1, o1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(o2, o2).toComparison());
assertTrue(new CompareToBuilder().append(o1, o2).toComparison() > 0);
assertTrue(new CompareToBuilder().append(o2, o1).toComparison() < 0);
}
@@ -460,8 +460,8 @@ public class CompareToBuilderTest {
obj3[1] = new TestObject(5);
obj3[2] = new TestObject(6);
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -470,7 +470,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((Object[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((Object[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -487,8 +487,8 @@ public class CompareToBuilderTest {
obj3[1] = 6L;
obj3[2] = 7L;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -497,7 +497,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((long[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((long[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -514,8 +514,8 @@ public class CompareToBuilderTest {
obj3[1] = 6;
obj3[2] = 7;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -524,7 +524,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((int[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((int[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -541,8 +541,8 @@ public class CompareToBuilderTest {
obj3[1] = 6;
obj3[2] = 7;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -551,7 +551,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((short[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((short[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -568,8 +568,8 @@ public class CompareToBuilderTest {
obj3[1] = 6;
obj3[2] = 7;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -578,7 +578,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((char[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((char[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -595,8 +595,8 @@ public class CompareToBuilderTest {
obj3[1] = 6;
obj3[2] = 7;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -605,7 +605,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((byte[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((byte[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -622,8 +622,8 @@ public class CompareToBuilderTest {
obj3[1] = 6;
obj3[2] = 7;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -632,7 +632,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((double[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((double[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -649,8 +649,8 @@ public class CompareToBuilderTest {
obj3[1] = 6;
obj3[2] = 7;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -659,7 +659,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((float[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((float[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -676,8 +676,8 @@ public class CompareToBuilderTest {
obj3[1] = false;
obj3[2] = true;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -686,7 +686,7 @@ public class CompareToBuilderTest {
assertTrue(new CompareToBuilder().append(obj2, obj1).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj1, null).toComparison() > 0);
- assertTrue(new CompareToBuilder().append((boolean[]) null, null).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append((boolean[]) null, null).toComparison());
assertTrue(new CompareToBuilder().append(null, obj1).toComparison() < 0);
}
@@ -705,8 +705,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 200;
@@ -729,8 +729,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 200;
@@ -753,8 +753,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 200;
@@ -777,8 +777,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 200;
@@ -801,8 +801,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 127;
@@ -825,8 +825,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 127;
@@ -849,8 +849,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 127;
@@ -873,8 +873,8 @@ public class CompareToBuilderTest {
array3[1][2] = false;
array3[1][2] = false;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = true;
@@ -901,8 +901,8 @@ public class CompareToBuilderTest {
array3[1][2] = 100;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
array1[1][1] = 200;
@@ -927,8 +927,8 @@ public class CompareToBuilderTest {
}
((long[]) array3[0])[2] = 1;
((long[]) array3[1])[2] = 1;
- assertTrue(new CompareToBuilder().append(array1, array1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(array1, array2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(array1, array1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(array1, array2).toComparison());
assertTrue(new CompareToBuilder().append(array1, array3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(array3, array1).toComparison() > 0);
((long[]) array1[1])[1] = 200;
@@ -953,8 +953,8 @@ public class CompareToBuilderTest {
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -978,8 +978,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -1003,8 +1003,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -1028,8 +1028,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -1053,8 +1053,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -1078,8 +1078,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -1103,8 +1103,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -1128,8 +1128,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
@@ -1153,8 +1153,8 @@ public class CompareToBuilderTest {
final Object obj1 = array1;
final Object obj2 = array2;
final Object obj3 = array3;
- assertTrue(new CompareToBuilder().append(obj1, obj1).toComparison() == 0);
- assertTrue(new CompareToBuilder().append(obj1, obj2).toComparison() == 0);
+ assertEquals(0, new CompareToBuilder().append(obj1, obj1).toComparison());
+ assertEquals(0, new CompareToBuilder().append(obj1, obj2).toComparison());
assertTrue(new CompareToBuilder().append(obj1, obj3).toComparison() < 0);
assertTrue(new CompareToBuilder().append(obj3, obj1).toComparison() > 0);
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
index d5b443e..6fd7782 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
@@ -20,9 +20,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.lang3.ArrayUtils;
import org.hamcrest.Matcher;
@@ -333,8 +334,8 @@ public class DiffBuilderTest {
left.objectField = sameObject;
final TypeTestClass right = new TypeTestClass();
right.objectField = sameObject;
- assertTrue(left.objectField == right.objectField);
- assertTrue(left.objectField.equals(right.objectField));
+ assertSame(left.objectField, right.objectField);
+ assertEquals(left.objectField, right.objectField);
final DiffResult list = left.diff(right);
assertEquals(0, list.getNumberOfDiffs());
@@ -349,8 +350,8 @@ public class DiffBuilderTest {
left.objectField = new Integer(1);
final TypeTestClass right = new TypeTestClass();
right.objectField = new Integer(1);
- assertFalse(left.objectField == right.objectField);
- assertTrue(left.objectField.equals(right.objectField));
+ assertNotSame(left.objectField, right.objectField);
+ assertEquals(left.objectField, right.objectField);
final DiffResult list = left.diff(right);
assertEquals(0, list.getNumberOfDiffs());
@@ -365,8 +366,8 @@ public class DiffBuilderTest {
left.objectField = 4;
final TypeTestClass right = new TypeTestClass();
right.objectField = 100;
- assertFalse(left.objectField == right.objectField);
- assertFalse(left.objectField.equals(right.objectField));
+ assertNotSame(left.objectField, right.objectField);
+ assertNotEquals(left.objectField, right.objectField);
final DiffResult list = left.diff(right);
assertEquals(1, list.getNumberOfDiffs());
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java b/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
index 3e5a4ae..e321452 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
@@ -99,7 +99,7 @@ public class DiffResultTest {
@Test
public void testToStringSpecifyStyleOutput() {
final DiffResult list = SIMPLE_FALSE.diff(SIMPLE_TRUE);
- assertTrue(list.getToStringStyle().equals(SHORT_STYLE));
+ assertEquals(list.getToStringStyle(), SHORT_STYLE);
final String lhsString = new ToStringBuilder(SIMPLE_FALSE,
ToStringStyle.MULTI_LINE_STYLE).append(
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
index dd725ed..64bd283 100644
--- a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
@@ -18,6 +18,7 @@ package org.apache.commons.lang3.builder;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -1198,10 +1199,10 @@ public class EqualsBuilderTest {
assertTrue(Arrays.equals(x, y));
assertTrue(Arrays.equals(y, x));
// real tests:
- assertTrue(x[0].equals(x[0]));
- assertTrue(y[0].equals(y[0]));
- assertTrue(x[0].equals(y[0]));
- assertTrue(y[0].equals(x[0]));
+ assertEquals(x[0], x[0]);
+ assertEquals(y[0], y[0]);
+ assertEquals(x[0], y[0]);
+ assertEquals(y[0], x[0]);
assertTrue(new EqualsBuilder().append(x, x).isEquals());
assertTrue(new EqualsBuilder().append(y, y).isEquals());
assertTrue(new EqualsBuilder().append(x, y).isEquals());
@@ -1282,11 +1283,11 @@ public class EqualsBuilderTest {
x3.setObjectReference(refX3);
refX3.setObjectReference(x3);
- assertTrue(x1.equals(x2));
+ assertEquals(x1, x2);
assertNull(EqualsBuilder.getRegistry());
- assertFalse(x1.equals(x3));
+ assertNotEquals(x1, x3);
assertNull(EqualsBuilder.getRegistry());
- assertFalse(x2.equals(x3));
+ assertNotEquals(x2, x3);
assertNull(EqualsBuilder.getRegistry());
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
----------------------------------------------------------------------
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 9d481f5..6cc083f 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
@@ -175,7 +175,7 @@ public class BasicThreadFactoryTest {
final BasicThreadFactory factory = builder.wrappedFactory(wrapped).daemon(
flag).build();
assertSame(t, factory.newThread(r), "Wrong thread");
- assertTrue(flag == t.isDaemon(), "Wrong daemon flag");
+ assertEquals(flag, t.isDaemon(), "Wrong daemon flag");
EasyMock.verify(wrapped, r);
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
----------------------------------------------------------------------
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 7e7055a..59164e7 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
@@ -46,9 +46,9 @@ public class ConstantInitializerTest {
* @param expected the expected result
*/
private void checkEquals(final Object obj, final boolean expected) {
- assertTrue(expected == init.equals(obj), "Wrong result of equals");
+ assertEquals(expected, init.equals(obj), "Wrong result of equals");
if (obj != null) {
- assertTrue(expected == obj.equals(init), "Not symmetric");
+ assertEquals(expected, obj.equals(init), "Not symmetric");
if (expected) {
assertEquals(init.hashCode(), obj.hashCode(), "Different hash codes");
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java b/src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java
index b9808d4..81b3673 100644
--- a/src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java
+++ b/src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java
@@ -21,6 +21,7 @@ import org.junit.jupiter.api.BeforeEach;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.Serializable;
@@ -72,8 +73,8 @@ public abstract class AbstractExceptionContextTest<T extends ExceptionContext &
assertTrue(message.contains("some value"));
assertTrue(message.contains("5"));
- assertTrue(exceptionContext.getFirstContextValue("test1") == null);
- assertTrue(exceptionContext.getFirstContextValue("test2").equals("some value"));
+ assertNull(exceptionContext.getFirstContextValue("test1"));
+ assertEquals("some value", exceptionContext.getFirstContextValue("test2"));
assertEquals(5, exceptionContext.getContextLabels().size());
assertTrue(exceptionContext.getContextLabels().contains("test1"));
@@ -99,7 +100,7 @@ public abstract class AbstractExceptionContextTest<T extends ExceptionContext &
assertTrue(message.contains("test Poorly written obj"));
assertTrue(message.contains("Crap"));
- assertTrue(exceptionContext.getFirstContextValue("crap") == null);
+ assertNull(exceptionContext.getFirstContextValue("crap"));
assertTrue(exceptionContext.getFirstContextValue("test Poorly written obj") instanceof ObjectWithFaultyToString);
assertEquals(7, exceptionContext.getContextEntries().size());
@@ -126,13 +127,13 @@ public abstract class AbstractExceptionContextTest<T extends ExceptionContext &
public void testGetFirstContextValue() {
exceptionContext.addContextValue("test2", "different value");
- assertTrue(exceptionContext.getFirstContextValue("test1") == null);
- assertTrue(exceptionContext.getFirstContextValue("test2").equals("some value"));
- assertTrue(exceptionContext.getFirstContextValue("crap") == null);
+ assertNull(exceptionContext.getFirstContextValue("test1"));
+ assertEquals("some value", exceptionContext.getFirstContextValue("test2"));
+ assertNull(exceptionContext.getFirstContextValue("crap"));
exceptionContext.setContextValue("test2", "another");
- assertTrue(exceptionContext.getFirstContextValue("test2").equals("another"));
+ assertEquals("another", exceptionContext.getFirstContextValue("test2"));
}
@Test
@@ -144,7 +145,7 @@ public abstract class AbstractExceptionContextTest<T extends ExceptionContext &
exceptionContext.setContextValue("test2", "another");
- assertTrue(exceptionContext.getFirstContextValue("test2").equals("another"));
+ assertEquals("another", exceptionContext.getFirstContextValue("test2"));
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3609993f/src/test/java/org/apache/commons/lang3/exception/ContextedExceptionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/exception/ContextedExceptionTest.java b/src/test/java/org/apache/commons/lang3/exception/ContextedExceptionTest.java
index 199e09e..27b7032 100644
--- a/src/test/java/org/apache/commons/lang3/exception/ContextedExceptionTest.java
+++ b/src/test/java/org/apache/commons/lang3/exception/ContextedExceptionTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.lang3.exception;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -98,7 +99,7 @@ public class ContextedExceptionTest extends AbstractExceptionContextTest<Context
.addContextValue("test Poorly written obj", new ObjectWithFaultyToString());
final String message = exceptionContext.getMessage();
- assertTrue(message != null);
+ assertNotNull(message);
}
@Test