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).

4 files changed, 113 insertions, 111 deletions

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 86372b63b..ef3b7c534 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);
 
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 d5b443e54..6fd77825d 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());
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 3e5a4ae21..e32145264 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(
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 dd725edf4..64bd28346 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());
     }