From a060733e63a9cc476342ca190d04ad027a241d33 Mon Sep 17 00:00:00 2001 From: pascalschumacher Date: Sat, 22 Apr 2017 22:25:52 +0200 Subject: [PATCH] use Assert#assertFalse instead of Assert#assertTrue with a negated condition --- .../apache/commons/lang3/BitFieldTest.java | 12 +- .../lang3/builder/EqualsBuilderTest.java | 170 +++++++++--------- .../AbstractExceptionContextTest.java | 7 +- .../lang3/exception/ExceptionUtilsTest.java | 4 +- 4 files changed, 97 insertions(+), 96 deletions(-) diff --git a/src/test/java/org/apache/commons/lang3/BitFieldTest.java b/src/test/java/org/apache/commons/lang3/BitFieldTest.java index 0c80f5a60..7d4ae9adf 100644 --- a/src/test/java/org/apache/commons/lang3/BitFieldTest.java +++ b/src/test/java/org/apache/commons/lang3/BitFieldTest.java @@ -88,15 +88,15 @@ public void testGetShortRawValue() { */ @Test public void testIsSet() { - assertTrue(!bf_multi.isSet(0)); - assertTrue(!bf_zero.isSet(0)); + assertFalse(bf_multi.isSet(0)); + assertFalse(bf_zero.isSet(0)); for (int j = 0x80; j <= 0x3F80; j += 0x80) { assertTrue(bf_multi.isSet(j)); } for (int j = 0x80; j <= 0x3F80; j += 0x80) { - assertTrue(!bf_zero.isSet(j)); + assertFalse(bf_zero.isSet(j)); } - assertTrue(!bf_single.isSet(0)); + assertFalse(bf_single.isSet(0)); assertTrue(bf_single.isSet(0x4000)); } @@ -106,11 +106,11 @@ public void testIsSet() { @Test public void testIsAllSet() { for (int j = 0; j < 0x3F80; j += 0x80) { - assertTrue(!bf_multi.isAllSet(j)); + assertFalse(bf_multi.isAllSet(j)); assertTrue(bf_zero.isAllSet(j)); } assertTrue(bf_multi.isAllSet(0x3F80)); - assertTrue(!bf_single.isAllSet(0)); + assertFalse(bf_single.isAllSet(0)); assertTrue(bf_single.isAllSet(0x4000)); } 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 bb7ca66d0..b5cfdfa0e 100644 --- a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java +++ b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java @@ -213,14 +213,14 @@ public void testReflectionEquals() { final TestObject o1 = new TestObject(4); final TestObject o2 = new TestObject(5); assertTrue(EqualsBuilder.reflectionEquals(o1, o1)); - assertTrue(!EqualsBuilder.reflectionEquals(o1, o2)); + assertFalse(EqualsBuilder.reflectionEquals(o1, o2)); o2.setA(4); assertTrue(EqualsBuilder.reflectionEquals(o1, o2)); - assertTrue(!EqualsBuilder.reflectionEquals(o1, this)); + assertFalse(EqualsBuilder.reflectionEquals(o1, this)); - assertTrue(!EqualsBuilder.reflectionEquals(o1, null)); - assertTrue(!EqualsBuilder.reflectionEquals(null, o2)); + assertFalse(EqualsBuilder.reflectionEquals(o1, null)); + assertFalse(EqualsBuilder.reflectionEquals(null, o2)); assertTrue(EqualsBuilder.reflectionEquals(null, null)); } @@ -231,9 +231,9 @@ public void testReflectionHierarchyEquals() { // Transients assertTrue(EqualsBuilder.reflectionEquals(new TestTTLeafObject(1, 2, 3, 4), new TestTTLeafObject(1, 2, 3, 4), true)); assertTrue(EqualsBuilder.reflectionEquals(new TestTTLeafObject(1, 2, 3, 4), new TestTTLeafObject(1, 2, 3, 4), false)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestTTLeafObject(1, 0, 0, 4), new TestTTLeafObject(1, 2, 3, 4), true)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestTTLeafObject(1, 2, 3, 4), new TestTTLeafObject(1, 2, 3, 0), true)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestTTLeafObject(0, 2, 3, 4), new TestTTLeafObject(1, 2, 3, 4), true)); + assertFalse(EqualsBuilder.reflectionEquals(new TestTTLeafObject(1, 0, 0, 4), new TestTTLeafObject(1, 2, 3, 4), true)); + assertFalse(EqualsBuilder.reflectionEquals(new TestTTLeafObject(1, 2, 3, 4), new TestTTLeafObject(1, 2, 3, 0), true)); + assertFalse(EqualsBuilder.reflectionEquals(new TestTTLeafObject(0, 2, 3, 4), new TestTTLeafObject(1, 2, 3, 4), true)); } private void testReflectionHierarchyEquals(final boolean testTransients) { @@ -259,11 +259,11 @@ private void testReflectionHierarchyEquals(final boolean testTransients) { assertTrue(EqualsBuilder.reflectionEquals(ttlo, ttlo, testTransients)); assertTrue(EqualsBuilder.reflectionEquals(new TestSubObject(1, 10), new TestSubObject(1, 10), testTransients)); // same super values, diff sub values - assertTrue(!EqualsBuilder.reflectionEquals(new TestSubObject(1, 10), new TestSubObject(1, 11), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestSubObject(1, 11), new TestSubObject(1, 10), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestSubObject(1, 10), new TestSubObject(1, 11), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestSubObject(1, 11), new TestSubObject(1, 10), testTransients)); // diff super values, same sub values - assertTrue(!EqualsBuilder.reflectionEquals(new TestSubObject(0, 10), new TestSubObject(1, 10), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestSubObject(1, 10), new TestSubObject(0, 10), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestSubObject(0, 10), new TestSubObject(1, 10), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestSubObject(1, 10), new TestSubObject(0, 10), testTransients)); // mix super and sub types: equals assertTrue(EqualsBuilder.reflectionEquals(to1, teso, testTransients)); @@ -279,17 +279,17 @@ private void testReflectionHierarchyEquals(final boolean testTransients) { assertTrue(EqualsBuilder.reflectionEquals(tttso, ttso, false)); // Force testTransients = false for this assert // mix super and sub types: NOT equals - assertTrue(!EqualsBuilder.reflectionEquals(new TestObject(0), new TestEmptySubObject(1), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestEmptySubObject(1), new TestObject(0), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestObject(0), new TestEmptySubObject(1), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestEmptySubObject(1), new TestObject(0), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestObject(0), new TestTSubObject(1, 1), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestTSubObject(1, 1), new TestObject(0), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestObject(0), new TestTSubObject(1, 1), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestTSubObject(1, 1), new TestObject(0), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestObject(1), new TestSubObject(0, 10), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(new TestSubObject(0, 10), new TestObject(1), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestObject(1), new TestSubObject(0, 10), testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(new TestSubObject(0, 10), new TestObject(1), testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(to1, ttlo)); - assertTrue(!EqualsBuilder.reflectionEquals(tso1, this)); + assertFalse(EqualsBuilder.reflectionEquals(to1, ttlo)); + assertFalse(EqualsBuilder.reflectionEquals(tso1, this)); } /** @@ -340,14 +340,14 @@ private void testReflectionEqualsEquivalenceRelationship( if (oToChange instanceof TestSubObject) { ((TestSubObject) oToChange).setB(((TestSubObject) to).getB() + 1); } - assertTrue(!EqualsBuilder.reflectionEquals(oToChange, to, testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(oToChange, to, testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(oToChange, to, testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(oToChange, to, testTransients)); // non-null reference test - assertTrue(!EqualsBuilder.reflectionEquals(to, null, testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(to2, null, testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(null, to, testTransients)); - assertTrue(!EqualsBuilder.reflectionEquals(null, to2, testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(to, null, testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(to2, null, testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(null, to, testTransients)); + assertFalse(EqualsBuilder.reflectionEquals(null, to2, testTransients)); assertTrue(EqualsBuilder.reflectionEquals(null, null, testTransients)); } @@ -366,14 +366,14 @@ public void testObject() { final TestObject o1 = new TestObject(4); final TestObject o2 = new TestObject(5); assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); o2.setA(4); assertTrue(new EqualsBuilder().append(o1, o2).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, this).isEquals()); + assertFalse(new EqualsBuilder().append(o1, this).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, null).isEquals()); - assertTrue(!new EqualsBuilder().append(null, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, null).isEquals()); + assertFalse(new EqualsBuilder().append(null, o2).isEquals()); assertTrue(new EqualsBuilder().append((Object) null, null).isEquals()); } @@ -454,7 +454,7 @@ public void testLong() { final long o1 = 1L; final long o2 = 2L; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); } @Test @@ -462,7 +462,7 @@ public void testInt() { final int o1 = 1; final int o2 = 2; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); } @Test @@ -470,7 +470,7 @@ public void testShort() { final short o1 = 1; final short o2 = 2; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); } @Test @@ -478,7 +478,7 @@ public void testChar() { final char o1 = 1; final char o2 = 2; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); } @Test @@ -486,7 +486,7 @@ public void testByte() { final byte o1 = 1; final byte o2 = 2; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); } @Test @@ -494,8 +494,8 @@ public void testDouble() { final double o1 = 1; final double o2 = 2; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, Double.NaN).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, Double.NaN).isEquals()); assertTrue(new EqualsBuilder().append(Double.NaN, Double.NaN).isEquals()); assertTrue(new EqualsBuilder().append(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY).isEquals()); } @@ -505,8 +505,8 @@ public void testFloat() { final float o1 = 1; final float o2 = 2; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, Float.NaN).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, Float.NaN).isEquals()); assertTrue(new EqualsBuilder().append(Float.NaN, Float.NaN).isEquals()); assertTrue(new EqualsBuilder().append(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY).isEquals()); } @@ -536,7 +536,7 @@ public void testBoolean() { final boolean o1 = true; final boolean o2 = false; assertTrue(new EqualsBuilder().append(o1, o1).isEquals()); - assertTrue(!new EqualsBuilder().append(o1, o2).isEquals()); + assertFalse(new EqualsBuilder().append(o1, o2).isEquals()); } @Test @@ -554,16 +554,16 @@ public void testObjectArray() { assertTrue(new EqualsBuilder().append(obj2, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1].setA(6); - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1].setA(5); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[2] = obj1[1]; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[2] = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -579,10 +579,10 @@ public void testLongArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -598,10 +598,10 @@ public void testIntArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -617,10 +617,10 @@ public void testShortArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -636,10 +636,10 @@ public void testCharArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -655,10 +655,10 @@ public void testByteArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -674,10 +674,10 @@ public void testDoubleArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -693,10 +693,10 @@ public void testFloatArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -712,10 +712,10 @@ public void testBooleanArray() { assertTrue(new EqualsBuilder().append(obj1, obj1).isEquals()); assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1[1] = true; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj2 = null; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); obj1 = null; assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); } @@ -733,7 +733,7 @@ public void testMultiLongArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -749,7 +749,7 @@ public void testMultiIntArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -765,7 +765,7 @@ public void testMultiShortArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -781,7 +781,7 @@ public void testMultiCharArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -797,7 +797,7 @@ public void testMultiByteArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -813,7 +813,7 @@ public void testMultiFloatArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -829,7 +829,7 @@ public void testMultiDoubleArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -845,7 +845,7 @@ public void testMultiBooleanArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = false; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); // compare 1 dim to 2. final boolean[] array3 = new boolean[]{true, true}; @@ -870,7 +870,7 @@ public void testRaggedArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); array1[1][1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -888,7 +888,7 @@ public void testMixedArray() { assertTrue(new EqualsBuilder().append(array1, array1).isEquals()); assertTrue(new EqualsBuilder().append(array1, array2).isEquals()); ((long[]) array1[1])[1] = 0; - assertTrue(!new EqualsBuilder().append(array1, array2).isEquals()); + assertFalse(new EqualsBuilder().append(array1, array2).isEquals()); } @Test @@ -906,7 +906,7 @@ public void testObjectArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1].setA(6); - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -924,7 +924,7 @@ public void testLongArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -942,7 +942,7 @@ public void testIntArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -960,7 +960,7 @@ public void testShortArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -978,7 +978,7 @@ public void testCharArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -996,7 +996,7 @@ public void testByteArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -1014,7 +1014,7 @@ public void testDoubleArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -1032,7 +1032,7 @@ public void testFloatArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = 7; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } @Test @@ -1050,7 +1050,7 @@ public void testBooleanArrayHiddenByObject() { assertTrue(new EqualsBuilder().append(obj1, obj2).isEquals()); assertTrue(new EqualsBuilder().append(obj1, array2).isEquals()); array1[1] = true; - assertTrue(!new EqualsBuilder().append(obj1, obj2).isEquals()); + assertFalse(new EqualsBuilder().append(obj1, obj2).isEquals()); } public static class TestACanEqualB { @@ -1160,16 +1160,16 @@ public void testReflectionEqualsExcludeFields() throws Exception { final TestObjectWithMultipleFields x2 = new TestObjectWithMultipleFields(1, 3, 4); // not equal when including all fields - assertTrue(!EqualsBuilder.reflectionEquals(x1, x2)); + assertFalse(EqualsBuilder.reflectionEquals(x1, x2)); // doesn't barf on null, empty array, or non-existent field, but still tests as not equal - assertTrue(!EqualsBuilder.reflectionEquals(x1, x2, (String[]) null)); - assertTrue(!EqualsBuilder.reflectionEquals(x1, x2, new String[] {})); - assertTrue(!EqualsBuilder.reflectionEquals(x1, x2, new String[] {"xxx"})); + assertFalse(EqualsBuilder.reflectionEquals(x1, x2, (String[]) null)); + assertFalse(EqualsBuilder.reflectionEquals(x1, x2, new String[] {})); + assertFalse(EqualsBuilder.reflectionEquals(x1, x2, new String[] {"xxx"})); // not equal if only one of the differing fields excluded - assertTrue(!EqualsBuilder.reflectionEquals(x1, x2, new String[] {"two"})); - assertTrue(!EqualsBuilder.reflectionEquals(x1, x2, new String[] {"three"})); + assertFalse(EqualsBuilder.reflectionEquals(x1, x2, new String[] {"two"})); + assertFalse(EqualsBuilder.reflectionEquals(x1, x2, new String[] {"three"})); // equal if both differing fields excluded assertTrue(EqualsBuilder.reflectionEquals(x1, x2, new String[] {"two", "three"})); @@ -1253,7 +1253,7 @@ public void testReflectionArrays() throws Exception { final Object[] o2 = new Object[] { two }; final Object[] o3 = new Object[] { one }; - assertTrue(!EqualsBuilder.reflectionEquals(o1, o2)); + assertFalse(EqualsBuilder.reflectionEquals(o1, o2)); assertTrue(EqualsBuilder.reflectionEquals(o1, o1)); assertTrue(EqualsBuilder.reflectionEquals(o1, o3)); @@ -1261,7 +1261,7 @@ public void testReflectionArrays() throws Exception { final double[] d2 = { 2, 3 }; final double[] d3 = { 0, 1 }; - assertTrue(!EqualsBuilder.reflectionEquals(d1, d2)); + assertFalse(EqualsBuilder.reflectionEquals(d1, d2)); assertTrue(EqualsBuilder.reflectionEquals(d1, d1)); assertTrue(EqualsBuilder.reflectionEquals(d1, d3)); } 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 85b5243ab..ce9412208 100644 --- a/src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java +++ b/src/test/java/org/apache/commons/lang3/exception/AbstractExceptionContextTest.java @@ -20,6 +20,7 @@ import org.junit.Before; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.Serializable; @@ -85,7 +86,7 @@ public void testAddContextValue() { assertTrue(exceptionContext.getContextLabels().contains("test2")); final String contextMessage = exceptionContext.getFormattedExceptionMessage(null); - assertTrue(!contextMessage.contains(TEST_MESSAGE)); + assertFalse(contextMessage.contains(TEST_MESSAGE)); } @Test @@ -105,7 +106,7 @@ public void testSetContextValue() { assertEquals(6, exceptionContext.getContextLabels().size()); assertTrue(exceptionContext.getContextLabels().contains("test Poorly written obj")); - assertTrue(!exceptionContext.getContextLabels().contains("crap")); + assertFalse(exceptionContext.getContextLabels().contains("crap")); exceptionContext.setContextValue("test Poorly written obj", "replacement"); @@ -118,7 +119,7 @@ public void testSetContextValue() { assertEquals(6, exceptionContext.getContextLabels().size()); final String contextMessage = exceptionContext.getFormattedExceptionMessage(null); - assertTrue(!contextMessage.contains(TEST_MESSAGE)); + assertFalse(contextMessage.contains(TEST_MESSAGE)); } @Test diff --git a/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java b/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java index 7a4cf9d44..af8b847b3 100644 --- a/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/exception/ExceptionUtilsTest.java @@ -393,7 +393,7 @@ public void testPrintRootCauseStackTrace_ThrowableStream() throws Exception { out = new ByteArrayOutputStream(1024); ExceptionUtils.printRootCauseStackTrace(withoutCause, new PrintStream(out)); stackTrace = out.toString(); - assertTrue(!stackTrace.contains(ExceptionUtils.WRAPPED_MARKER)); + assertFalse(stackTrace.contains(ExceptionUtils.WRAPPED_MARKER)); } @Test @@ -419,7 +419,7 @@ public void testPrintRootCauseStackTrace_ThrowableWriter() throws Exception { writer = new StringWriter(1024); ExceptionUtils.printRootCauseStackTrace(withoutCause, new PrintWriter(writer)); stackTrace = writer.toString(); - assertTrue(!stackTrace.contains(ExceptionUtils.WRAPPED_MARKER)); + assertFalse(stackTrace.contains(ExceptionUtils.WRAPPED_MARKER)); } //-----------------------------------------------------------------------