This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 397771c0fe Clean-up `ParameterizedMessageTest`
397771c0fe is described below
commit 397771c0feb56e00482fd6230e1e124b7c483333
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Fri Feb 9 10:22:10 2024 +0100
Clean-up `ParameterizedMessageTest`
---
.../log4j/message/ParameterizedMessageTest.java | 36 ++++++++++------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
index 1aad0d64d9..40e6b7b3d4 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
+++
b/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,9 +26,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-/**
- *
- */
public class ParameterizedMessageTest {
@Test
@@ -37,11 +33,11 @@ public class ParameterizedMessageTest {
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
@@ -49,11 +45,11 @@ public class ParameterizedMessageTest {
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
@@ -61,11 +57,11 @@ public class ParameterizedMessageTest {
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
@@ -73,7 +69,7 @@ public class ParameterizedMessageTest {
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
@@ -81,7 +77,7 @@ public class ParameterizedMessageTest {
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
@@ -89,7 +85,7 @@ public class ParameterizedMessageTest {
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
@@ -97,7 +93,7 @@ public class ParameterizedMessageTest {
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
@@ -105,7 +101,7 @@ public class ParameterizedMessageTest {
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
@@ -113,7 +109,7 @@ public class ParameterizedMessageTest {
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
@@ -121,7 +117,7 @@ public class ParameterizedMessageTest {
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
@@ -129,7 +125,7 @@ public class ParameterizedMessageTest {
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 class ParameterizedMessageTest {
// 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() {
