You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2021/06/01 07:17:18 UTC

[logging-log4j2] branch master updated: Replace assert calls with simpler but equivalent calls. (#498)

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/master by this push:
     new 2cf9c22  Replace assert calls with simpler but equivalent calls. (#498)
2cf9c22 is described below

commit 2cf9c221a6d8e8feb2c4cc7bfa43c3a9adbfd0f7
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Tue Jun 1 09:17:12 2021 +0200

    Replace assert calls with simpler but equivalent calls. (#498)
---
 .../core/appender/rolling/RandomRollingAppenderOnStartupTest.java   | 4 ++--
 .../log4j/core/appender/rolling/RollingAppenderCronTest.java        | 3 ++-
 .../core/appender/rolling/RollingAppenderDeleteScriptTest.java      | 3 ++-
 .../RollingAppenderDirectWriteTempCompressedFilePatternTest.java    | 4 ++--
 .../rolling/RollingAppenderTempCompressedFilePatternTest.java       | 5 +++--
 .../core/appender/rolling/RollingFileAppenderUpdateDataTest.java    | 2 +-
 .../log4j/core/appender/rolling/RolloverWithDeletedOldFileTest.java | 2 +-
 .../log4j/core/appender/rolling/RolloverWithPaddingTest.java        | 2 +-
 .../log4j/core/appender/routing/JsonRoutingAppender2Test.java       | 3 ++-
 .../log4j/core/appender/routing/JsonRoutingAppenderTest.java        | 3 ++-
 .../log4j/core/appender/routing/PropertiesRoutingAppenderTest.java  | 3 ++-
 .../logging/log4j/core/appender/routing/RoutingAppenderTest.java    | 2 +-
 .../log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java | 2 +-
 .../log4j/core/appender/routing/RoutingDefaultAppenderTest.java     | 3 ++-
 .../java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java   | 2 +-
 .../logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java   | 2 +-
 .../log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java     | 6 +++---
 .../logging/log4j/core/time/internal/format/FastDateParserTest.java | 5 +++--
 18 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
index 472316c..b397eb2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -86,8 +87,7 @@ public class RandomRollingAppenderOnStartupTest {
                     size = Files.size(path);
                 } else {
                     final long fileSize = Files.size(path);
-                    assertTrue("Expected size: " + size + " Size of " + path.getFileName() + ": " + fileSize,
-                            size == fileSize);
+                    assertEquals("Expected size: " + size + " Size of " + path.getFileName() + ": " + fileSize, size, fileSize);
                 }
                 Files.delete(path);
             }
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
index 447e6e4..42f324a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
@@ -20,6 +20,7 @@ import static org.apache.logging.log4j.core.test.hamcrest.Descriptors.that;
 import static org.apache.logging.log4j.core.test.hamcrest.FileMatchers.hasName;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.hasItemInArray;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -99,7 +100,7 @@ public class RollingAppenderCronTest {
         assertNotNull("No triggering policy", policy);
         assertTrue("Incorrect policy type", policy instanceof CronTriggeringPolicy);
         final CronExpression expression = ((CronTriggeringPolicy) policy).getCronExpression();
-        assertTrue("Incorrect triggering policy", expression.getCronExpression().equals("* * * ? * *"));
+        assertEquals("Incorrect triggering policy", "* * * ? * *", expression.getCronExpression());
 
     }
 
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptTest.java
index 0b7201a..e218f6b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.core.appender.rolling;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -62,7 +63,7 @@ public class RollingAppenderDeleteScriptTest {
             assertTrue(file.getName() + " ends with '.log'", file.getName().endsWith(".log"));
             final String strIndex = file.getName().substring(5, file.getName().indexOf('.'));
             final int index = Integer.parseInt(strIndex);
-            assertTrue(file + " should have odd index", index % 2 == 1);
+            assertEquals(file + " should have odd index", 1, index % 2);
         }
     }
 }
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteTempCompressedFilePatternTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteTempCompressedFilePatternTest.java
index e95b390..b99afa6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteTempCompressedFilePatternTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteTempCompressedFilePatternTest.java
@@ -20,6 +20,7 @@ import static org.apache.logging.log4j.core.test.hamcrest.Descriptors.that;
 import static org.apache.logging.log4j.core.test.hamcrest.FileMatchers.hasName;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.hasItemInArray;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -96,8 +97,7 @@ public class RollingAppenderDirectWriteTempCompressedFilePatternTest {
                 }
             }
             assertTrue("No temporary file created during compression", temporaryFilesCreated > 0);
-            assertTrue("Temporarys file created not equals to compressed files",
-                    compressedFiles == temporaryFilesCreated);
+            assertEquals("Temporarys file created not equals to compressed files", compressedFiles, temporaryFilesCreated);
         }
     }
 }
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTempCompressedFilePatternTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTempCompressedFilePatternTest.java
index 2767a12..c473797 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTempCompressedFilePatternTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTempCompressedFilePatternTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.core.appender.rolling;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -147,8 +148,8 @@ public class RollingAppenderTempCompressedFilePatternTest {
                 }
             }
             assertTrue("No temporary file created during compression", temporaryFilesCreated > 0);
-            assertTrue("Temporarys file created not equals to compressed files " + temporaryFilesCreated + "/"
-                    + gzippedFiles, gzippedFiles == temporaryFilesCreated);
+            assertEquals("Temporarys file created not equals to compressed files " + temporaryFilesCreated + "/"
+                    + gzippedFiles, gzippedFiles, temporaryFilesCreated);
         }
     }
 }
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
index 16900ca..e14e65a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
@@ -102,7 +102,7 @@ public class RollingFileAppenderUpdateDataTest {
         // rebuild config with date based rollover
         loggerContext2 = Configurator.initialize(buildConfigB().build());
         Assert.assertNotNull("No LoggerContext", loggerContext2);
-        Assert.assertTrue("Expected same logger context to be returned", loggerContext1 == loggerContext2);
+        Assert.assertSame("Expected same logger context to be returned", loggerContext1, loggerContext2);
 		validateAppender(loggerContext1, "target/rolling-update-date/foo.log.%i");
     }
 
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithDeletedOldFileTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithDeletedOldFileTest.java
index 64e6307..b3e9af2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithDeletedOldFileTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithDeletedOldFileTest.java
@@ -51,7 +51,7 @@ public class RolloverWithDeletedOldFileTest {
 
     final File dir = new File(DIR);
     assertTrue("Dir " + DIR + " should exist", dir.exists());
-    assertTrue("Dir " + DIR + " should contain files", dir.listFiles().length == 6);
+      assertEquals("Dir " + DIR + " should contain files", 6, dir.listFiles().length);
 
     File[] files = dir.listFiles();
     final List<String> expected = Arrays.asList("rollingtest.log", "test-001.log", "test-002.log", "test-003.log", "test-004.log", "test-005.log");
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithPaddingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithPaddingTest.java
index 6d3b299..f6000b4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithPaddingTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverWithPaddingTest.java
@@ -53,7 +53,7 @@ public class RolloverWithPaddingTest {
 
     final File dir = new File(DIR);
     assertTrue("Dir " + DIR + " should exist", dir.exists());
-    assertTrue("Dir " + DIR + " should contain files", dir.listFiles().length == 6);
+      assertEquals("Dir " + DIR + " should contain files", 6, dir.listFiles().length);
 
     final File[] files = dir.listFiles();
     final List<String> expected = Arrays.asList("rollingtest.log", "test-001.log", "test-002.log", "test-003.log", "test-004.log", "test-005.log");
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
index b9f575d..522bfa6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.core.appender.routing;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -48,7 +49,7 @@ public class JsonRoutingAppender2Test {
         EventLogger.logEvent(msg);
         final List<LogEvent> list = loggerContextRule.getListAppender("List").getEvents();
         assertNotNull("No events generated", list);
-        assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+        assertEquals("Incorrect number of events. Expected 1, got " + list.size(), 1, list.size());
         msg = new StructuredDataMessage("Test", "This is a test", "Unknown");
         EventLogger.logEvent(msg);
         final File file = new File(LOG_FILENAME);
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
index 405c8d1..73eefb8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.core.appender.routing;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -48,7 +49,7 @@ public class JsonRoutingAppenderTest {
         EventLogger.logEvent(msg);
         final List<LogEvent> list = loggerContextRule.getListAppender("List").getEvents();
         assertNotNull("No events generated", list);
-        assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+        assertEquals("Incorrect number of events. Expected 1, got " + list.size(), 1, list.size());
         msg = new StructuredDataMessage("Test", "This is a test", "Unknown");
         EventLogger.logEvent(msg);
         final File file = new File(LOG_FILENAME);
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java
index 6280cc4..c82fdda 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.core.appender.routing;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -66,7 +67,7 @@ public class PropertiesRoutingAppenderTest {
         EventLogger.logEvent(msg);
         final List<LogEvent> list = app.getEvents();
         assertNotNull("No events generated", list);
-        assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+        assertEquals("Incorrect number of events. Expected 1, got " + list.size(), 1, list.size());
         msg = new StructuredDataMessage("Test", "This is a test", "Alert");
         EventLogger.logEvent(msg);
         File file = new File(ALERT_LOG_FILE);
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
index 65b1099..a8c92e7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
@@ -65,7 +65,7 @@ public class RoutingAppenderTest {
         EventLogger.logEvent(msg);
         final List<LogEvent> list = app.getEvents();
         assertNotNull("No events generated", list);
-        assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+        assertEquals("Incorrect number of events. Expected 1, got " + list.size(), 1, list.size());
         msg = new StructuredDataMessage("Test", "This is a test", "Alert");
         EventLogger.logEvent(msg);
         File file = new File(ALERT_LOG_FILE);
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
index 692c839..29024b8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
@@ -82,7 +82,7 @@ public class RoutingAppenderWithPurgingTest {
         EventLogger.logEvent(msg);
         final List<LogEvent> list = app.getEvents();
         assertNotNull("No events generated", list);
-        assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+        assertEquals("Incorrect number of events. Expected 1, got " + list.size(), 1, list.size());
         msg = new StructuredDataMessage("2", "This is a test 2", "Service");
         EventLogger.logEvent(msg);
         msg = new StructuredDataMessage("3", "This is a test 3", "Service");
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
index f949bd8..887435b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.core.appender.routing;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -47,7 +48,7 @@ public class RoutingDefaultAppenderTest {
         EventLogger.logEvent(msg);
         final List<LogEvent> list = loggerContextRule.getListAppender("List").getEvents();
         assertNotNull("No events generated", list);
-        assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+        assertEquals("Incorrect number of events. Expected 1, got " + list.size(), 1, list.size());
         msg = new StructuredDataMessage("Test", "This is a test", "Alert");
         EventLogger.logEvent(msg);
         final File file = new File(LOG_FILE);
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
index 1955892..257975d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
@@ -71,7 +71,7 @@ public class AsyncLoggerTest {
         assertTrue("line1 correct", line1.contains(msg));
 
         final String location = "testAsyncLogWritesToLog";
-        assertTrue("no location", !line1.contains(location));
+        assertFalse("no location", line1.contains(location));
 
         assertTrue(LogManager.getFactory().isClassLoaderDependent());
     }
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java
index 2127a81..441b133 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java
@@ -82,7 +82,7 @@ public class AsyncLoggerTimestampMessageTest {
         reader.close();
         file.delete();
         assertNotNull(line1);
-        assertTrue("line1 correct", line1.equals("123456789000 Async logger msg with embedded timestamp"));
+        assertEquals("line1 correct", "123456789000 Async logger msg with embedded timestamp", line1);
     }
 
     public static class PoisonClock implements Clock {
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
index ec40723..7f62fed 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
@@ -43,12 +43,12 @@ public class AsyncLoggersWithAsyncLoggerConfigTest {
         Thread.sleep(100);
         final List<String> list = context.getListAppender("List").getMessages();
         assertNotNull("No events generated", list);
-        assertTrue("Incorrect number of events. Expected 2, got " + list.size(), list.size() == 2);
+        assertEquals("Incorrect number of events. Expected 2, got " + list.size(), 2, list.size());
         String msg = list.get(0);
         String expected = getClass().getName() + " This is a test";
-        assertTrue("Expected " + expected + ", Actual " + msg, expected.equals(msg));
+        assertEquals("Expected " + expected + ", Actual " + msg, expected, msg);
         msg = list.get(1);
         expected = getClass().getName() + " Hello world!";
-        assertTrue("Expected " + expected + ", Actual " + msg, expected.equals(msg));
+        assertEquals("Expected " + expected + ", Actual " + msg, expected, msg);
     }
 }
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
index 139bb1c..c76c187 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.time.internal.format;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.Serializable;
@@ -479,7 +480,7 @@ public class FastDateParserTest {
             }
         }
         // SDF and FDF should produce equivalent results
-        assertTrue("Should both or neither throw Exceptions", (f==null)==(s==null));
+        assertEquals("Should both or neither throw Exceptions", (f == null), (s == null));
         assertEquals("Parsed dates should be equal", dsdf, dfdp);
     }
 
@@ -571,7 +572,7 @@ public class FastDateParserTest {
         assertEquals(parser1, parser2);
         assertEquals(parser1.hashCode(), parser2.hashCode());
 
-        assertFalse(parser1.equals(new Object()));
+        assertNotEquals(parser1, new Object());
     }
 
     @Test