Clean-up ParameterizedMessageTest

Author: vy

log4j-api-test/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java

@@ -17,7 +17,6 @@
 package org.apache.logging.log4j.message;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigDecimal;
 import java.util.stream.Stream;
@@ -27,109 +26,106 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- *
- */
 public class ParameterizedMessageTest {
 
     @Test
     public void testNoArgs() {
         final String testMsg = "Test message {}";
         ParameterizedMessage msg = new ParameterizedMessage(testMsg, (Object[]) null);
         String result = msg.getFormattedMessage();
-        assertEquals(testMsg, result);
+        assertThat(result).isEqualTo(testMsg);
         final Object[] array = null;
         msg = new ParameterizedMessage(testMsg, array, null);
         result = msg.getFormattedMessage();
-        assertEquals(testMsg, result);
+        assertThat(result).isEqualTo(testMsg);
     }
 
     @Test
     public void testZeroLength() {
         final String testMsg = "";
         ParameterizedMessage msg = new ParameterizedMessage(testMsg, new Object[] {"arg"});
         String result = msg.getFormattedMessage();
-        assertEquals(testMsg, result);
+        assertThat(result).isEqualTo(testMsg);
         final Object[] array = null;
         msg = new ParameterizedMessage(testMsg, array, null);
         result = msg.getFormattedMessage();
-        assertEquals(testMsg, result);
+        assertThat(result).isEqualTo(testMsg);
     }
 
     @Test
     public void testOneCharLength() {
         final String testMsg = "d";
         ParameterizedMessage msg = new ParameterizedMessage(testMsg, new Object[] {"arg"});
         String result = msg.getFormattedMessage();
-        assertEquals(testMsg, result);
+        assertThat(result).isEqualTo(testMsg);
         final Object[] array = null;
         msg = new ParameterizedMessage(testMsg, array, null);
         result = msg.getFormattedMessage();
-        assertEquals(testMsg, result);
+        assertThat(result).isEqualTo(testMsg);
     }
 
     @Test
     public void testFormat3StringArgs() {
         final String testMsg = "Test message {}{} {}";
         final String[] args = {"a", "b", "c"};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message ab c", result);
+        assertThat(result).isEqualTo("Test message ab c");
     }
 
     @Test
     public void testFormatNullArgs() {
         final String testMsg = "Test message {} {} {} {} {} {}";
         final String[] args = {"a", null, "c", null, null, null};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message a null c null null null", result);
+        assertThat(result).isEqualTo("Test message a null c null null null");
     }
 
     @Test
     public void testFormatStringArgsIgnoresSuperfluousArgs() {
         final String testMsg = "Test message {}{} {}";
         final String[] args = {"a", "b", "c", "unnecessary", "superfluous"};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message ab c", result);
+        assertThat(result).isEqualTo("Test message ab c");
     }
 
     @Test
     public void testFormatStringArgsWithEscape() {
         final String testMsg = "Test message \\{}{} {}";
         final String[] args = {"a", "b", "c"};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message {}a b", result);
+        assertThat(result).isEqualTo("Test message {}a b");
     }
 
     @Test
     public void testFormatStringArgsWithTrailingEscape() {
         final String testMsg = "Test message {}{} {}\\";
         final String[] args = {"a", "b", "c"};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message ab c\\", result);
+        assertThat(result).isEqualTo("Test message ab c\\");
     }
 
     @Test
     public void testFormatStringArgsWithTrailingText() {
         final String testMsg = "Test message {}{} {}Text";
         final String[] args = {"a", "b", "c"};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message ab cText", result);
+        assertThat(result).isEqualTo("Test message ab cText");
     }
 
     @Test
     public void testFormatStringArgsWithTrailingEscapedEscape() {
         final String testMsg = "Test message {}{} {}\\\\";
         final String[] args = {"a", "b", "c"};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message ab c\\", result);
+        assertThat(result).isEqualTo("Test message ab c\\");
     }
 
     @Test
     public void testFormatStringArgsWithEscapedEscape() {
         final String testMsg = "Test message \\\\{}{} {}";
         final String[] args = {"a", "b", "c"};
         final String result = ParameterizedMessage.format(testMsg, args);
-        assertEquals("Test message \\ab c", result);
+        assertThat(result).isEqualTo("Test message \\ab c");
     }
 
     @Test
@@ -141,12 +137,12 @@ public void testSafeWithMutableParams() { // LOG4J2-763
         // modify parameter before calling msg.getFormattedMessage
         param.set("XYZ");
         final String actual = msg.getFormattedMessage();
-        assertEquals("Test message XYZ", actual, "Should use current param value");
+        assertThat("Should use current param value").isEqualTo("Test message XYZ", actual);
 
         // modify parameter after calling msg.getFormattedMessage
         param.set("000");
         final String after = msg.getFormattedMessage();
-        assertEquals("Test message XYZ", after, "Should not change after rendered once");
+        assertThat("Should not change after rendered once").isEqualTo("Test message XYZ", after);
     }
 
     static Stream<Object> testSerializable() {