This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3c6c04d25897082583e499f7240e65d468ab4b0c Author: Matt Sicker <[email protected]> AuthorDate: Sat Aug 8 11:48:28 2020 -0500 Upgrade org.apache.logging.log4j.message tests This updates the tests in this package to JUnit 5. --- .../log4j/message/FormattedMessageTest.java | 18 +++++++++--------- .../log4j/message/LocalizedMessageFactoryTest.java | 7 ++++--- .../log4j/message/LocalizedMessageTest.java | 8 ++++---- .../logging/log4j/message/MapMessageTest.java | 14 +++++++------- .../log4j/message/MessageFormatMessageTest.java | 12 ++++++------ .../log4j/message/MessageFormatsPerfTest.java | 8 +++++--- .../log4j/message/ObjectArrayMessageTest.java | 10 ++++++---- .../logging/log4j/message/ObjectMessageTest.java | 8 ++++---- .../log4j/message/ParameterFormatterTest.java | 5 +++-- .../log4j/message/ParameterizedMessageTest.java | 8 ++++---- .../log4j/message/ReusableMessageFactoryTest.java | 8 ++++---- .../log4j/message/ReusableObjectMessageTest.java | 4 ++-- .../message/ReusableParameterizedMessageTest.java | 8 ++++---- .../log4j/message/ReusableSimpleMessageTest.java | 4 ++-- .../logging/log4j/message/SimpleMessageTest.java | 4 ++-- .../log4j/message/StringFormattedMessageTest.java | 22 ++++++++++------------ .../log4j/message/StructuredDataMessageTest.java | 9 +++++---- .../log4j/message/ThreadDumpMessageTest.java | 22 +++++++++++----------- pom.xml | 17 +++++++++++++---- 19 files changed, 105 insertions(+), 91 deletions(-) diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java index 937d659..588a81d 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java @@ -25,10 +25,10 @@ import java.util.Locale; import org.apache.logging.log4j.junit.Mutable; import org.apache.logging.log4j.util.Constants; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -141,7 +141,7 @@ public class FormattedMessageTest { // modify parameter before calling msg.getFormattedMessage param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Expected most recent param value", "Test message XYZ", actual); + assertEquals("Test message XYZ", actual, "Expected most recent param value"); } @Test @@ -154,7 +154,7 @@ public class FormattedMessageTest { msg.getFormattedMessage(); // freeze the formatted message param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use initial param value", "Test message abc", actual); + assertEquals("Test message abc", actual, "Should use initial param value"); } @Test @@ -167,9 +167,9 @@ public class FormattedMessageTest { final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); final ObjectInputStream in = new ObjectInputStream(bais); final FormattedMessage actual = (FormattedMessage) in.readObject(); - Assert.assertEquals(expected, actual); - Assert.assertEquals(expected.getFormat(), actual.getFormat()); - Assert.assertEquals(expected.getFormattedMessage(), actual.getFormattedMessage()); - Assert.assertArrayEquals(expected.getParameters(), actual.getParameters()); + assertEquals(expected, actual); + assertEquals(expected.getFormat(), actual.getFormat()); + assertEquals(expected.getFormattedMessage(), actual.getFormattedMessage()); + assertArrayEquals(expected.getParameters(), actual.getParameters()); } } diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java index 71bdf29..1e49a6f 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java @@ -16,11 +16,12 @@ */ package org.apache.logging.log4j.message; +import org.junit.jupiter.api.Test; + import java.util.Locale; import java.util.ResourceBundle; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests {@link LocalizedMessageFactory}. @@ -32,6 +33,6 @@ public class LocalizedMessageFactoryTest { final LocalizedMessageFactory localizedMessageFactory = new LocalizedMessageFactory( ResourceBundle.getBundle("MF", Locale.US)); final Message message = localizedMessageFactory.newMessage("hello_world"); - Assert.assertEquals("Hello world.", message.getFormattedMessage()); + assertEquals("Hello world.", message.getFormattedMessage()); } } diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java index aebe6ed..4689a17 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java @@ -21,9 +21,9 @@ import java.util.Locale; import org.apache.commons.lang3.SerializationUtils; import org.apache.logging.log4j.junit.Mutable; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests LocalizedMessage. @@ -71,7 +71,7 @@ public class LocalizedMessageTest { // modify parameter before calling msg.getFormattedMessage param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Expected most recent param value", "Test message XYZ", actual); + assertEquals("Test message XYZ", actual, "Expected most recent param value"); } @Test @@ -84,6 +84,6 @@ public class LocalizedMessageTest { msg.getFormattedMessage(); param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use initial param value", "Test message abc", actual); + assertEquals("Test message abc", actual, "Should use initial param value"); } } diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java index 850024e..0df4685 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java @@ -18,7 +18,7 @@ package org.apache.logging.log4j.message; import com.google.common.base.Strings; import org.apache.logging.log4j.util.StringBuilderFormattable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.Arrays; @@ -27,7 +27,7 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -155,19 +155,19 @@ public class MapMessageTest { assertEquals(expectedJson, actualJson); } - @Test(expected = IllegalArgumentException.class) + @Test public void testJsonFormatterInfiniteRecursionPrevention() { final List<Object> recursiveValue = Arrays.asList(1, null); // noinspection CollectionAddedToSelf recursiveValue.set(1, recursiveValue); - new ObjectMapMessage() + assertThrows(IllegalArgumentException.class, () -> new ObjectMapMessage() .with("key", recursiveValue) - .getFormattedMessage(new String[]{"JSON"}); + .getFormattedMessage(new String[]{"JSON"})); } - @Test(expected = IllegalArgumentException.class) + @Test public void testJsonFormatterMaxDepthViolation() { - testJsonFormatterMaxDepth(MapMessageJsonFormatter.MAX_DEPTH - 1); + assertThrows(IllegalArgumentException.class, () -> testJsonFormatterMaxDepth(MapMessageJsonFormatter.MAX_DEPTH - 1)); } @Test diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageTest.java index d123b74..42c54a2 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageTest.java @@ -19,12 +19,12 @@ package org.apache.logging.log4j.message; import org.apache.logging.log4j.junit.Mutable; import org.apache.logging.log4j.util.Constants; -import org.junit.Test; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; import java.util.Locale; +import static org.junit.jupiter.api.Assertions.*; + /** * */ @@ -84,7 +84,7 @@ public class MessageFormatMessageTest { final String expected = "Test message Apache"; assertEquals(expected, result); final Throwable t = msg.getThrowable(); - assertNotNull("No Throwable", t); + assertNotNull(t, "No Throwable"); } @Test @@ -96,7 +96,7 @@ public class MessageFormatMessageTest { // modify parameter before calling msg.getFormattedMessage param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Expected most recent param value", "Test message XYZ", actual); + assertEquals("Test message XYZ", actual, "Expected most recent param value"); } @Test @@ -109,6 +109,6 @@ public class MessageFormatMessageTest { msg.getFormattedMessage(); param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use initial param value", "Test message abc", actual); + assertEquals("Test message abc", actual, "Should use initial param value"); } } diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatsPerfTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatsPerfTest.java index 7ebd325..6254b62 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatsPerfTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/MessageFormatsPerfTest.java @@ -17,12 +17,14 @@ package org.apache.logging.log4j.message; import org.apache.logging.log4j.util.Timer; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; /** * */ +@Tag("performance") public class MessageFormatsPerfTest { private static final int LOOP_CNT = 500; @@ -32,7 +34,7 @@ public class MessageFormatsPerfTest { private static long msgFormatTime = 0; private static long formattedTime = 0; - @AfterClass + @AfterAll public static void after() { if (stringTime > paramTime) { System.out.println(String.format("Parameterized is %1$.2f times faster than StringFormat.", diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java index 5f11cf8..cfc8cf5 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java @@ -16,8 +16,10 @@ */ package org.apache.logging.log4j.message; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @since 2.4 @@ -29,12 +31,12 @@ public class ObjectArrayMessageTest { @Test public void testGetParameters() { - Assert.assertArrayEquals(ARRAY, OBJECT_ARRAY_MESSAGE.getParameters()); + assertArrayEquals(ARRAY, OBJECT_ARRAY_MESSAGE.getParameters()); } @Test public void testGetThrowable() { - Assert.assertEquals(null, OBJECT_ARRAY_MESSAGE.getThrowable()); + assertNull(OBJECT_ARRAY_MESSAGE.getThrowable()); } } diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java index 8f547ae..7579884 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java @@ -21,9 +21,9 @@ import java.math.BigDecimal; import org.apache.logging.log4j.junit.Mutable; import org.apache.logging.log4j.junit.SerialUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests {@link ObjectMessage}. @@ -53,7 +53,7 @@ public class ObjectMessageTest { // modify parameter before calling msg.getFormattedMessage param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Expected most recent param value", "XYZ", actual); + assertEquals("XYZ", actual, "Expected most recent param value"); } @Test @@ -65,7 +65,7 @@ public class ObjectMessageTest { msg.getFormattedMessage(); param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use initial param value", "abc", actual); + assertEquals("abc", actual, "Should use initial param value"); } @Test diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java index 6e728f6..f1b1917 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java @@ -16,11 +16,12 @@ */ package org.apache.logging.log4j.message; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests ParameterFormatter. diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java index 2a5bac6..42978a9 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java @@ -17,9 +17,9 @@ package org.apache.logging.log4j.message; import org.apache.logging.log4j.junit.Mutable; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -135,11 +135,11 @@ public class ParameterizedMessageTest { // modify parameter before calling msg.getFormattedMessage param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use current param value", "Test message XYZ", actual); + assertEquals("Test message XYZ", actual, "Should use current param value"); // modify parameter after calling msg.getFormattedMessage param.set("000"); final String after = msg.getFormattedMessage(); - assertEquals("Should not change after rendered once", "Test message XYZ", after); + assertEquals("Test message XYZ", after, "Should not change after rendered once"); } } diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java index 7942e5f..0eb962d 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.message; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests the ReusableMessageFactory class. @@ -53,10 +53,10 @@ public class ReusableMessageFactoryTest { private void assertReusableParameterizeMessage(final Message message, final String txt, final Object[] params) { assertTrue(message instanceof ReusableParameterizedMessage); final ReusableParameterizedMessage msg = (ReusableParameterizedMessage) message; - assertTrue("reserved", msg.reserved); + assertTrue(msg.reserved, "reserved"); assertEquals(txt, msg.getFormat()); - assertEquals("count", msg.getParameterCount(), params.length); + assertEquals(msg.getParameterCount(), params.length, "count"); final Object[] messageParams = msg.getParameters(); for (int i = 0; i < params.length; i++) { assertEquals(messageParams[i], params[i]); diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java index 614d54c..3fd7a73 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.message; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests ReusableObjectMessage. diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java index 93fe061..087c623 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java @@ -17,12 +17,12 @@ package org.apache.logging.log4j.message; import org.apache.logging.log4j.junit.Mutable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests ReusableParameterizedMessage. @@ -127,12 +127,12 @@ public class ReusableParameterizedMessageTest { // modify parameter before calling msg.getFormattedMessage param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use current param value", "Test message XYZ", actual); + assertEquals("Test message XYZ", actual, "Should use current param value"); // modify parameter after calling msg.getFormattedMessage param.set("000"); final String after = msg.getFormattedMessage(); - assertEquals("Renders again", "Test message 000", after); + assertEquals("Test message 000", after, "Renders again"); } @Test diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java index 1070a53..622f355 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.message; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests ReusableSimpleMessage. diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/SimpleMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/SimpleMessageTest.java index 383ecb4..a43d986 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/SimpleMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/SimpleMessageTest.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.message; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests the SimpleMessage class. diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java index 1cda558..5d85d96 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java @@ -16,9 +16,6 @@ */ package org.apache.logging.log4j.message; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,8 +24,9 @@ import java.io.ObjectOutputStream; import java.util.Locale; import org.apache.logging.log4j.junit.Mutable; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; /** * @@ -86,7 +84,7 @@ public class StringFormattedMessageTest { final String expected = "Test message Apache"; assertEquals(expected, result); final Throwable t = msg.getThrowable(); - assertNotNull("No Throwable", t); + assertNotNull(t, "No Throwable"); } @Test @@ -98,7 +96,7 @@ public class StringFormattedMessageTest { // modify parameter before calling msg.getFormattedMessage param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use initial param value", "Test message XYZ", actual); + assertEquals("Test message XYZ", actual, "Should use initial param value"); } @Test @@ -111,7 +109,7 @@ public class StringFormattedMessageTest { msg.getFormattedMessage(); param.set("XYZ"); final String actual = msg.getFormattedMessage(); - assertEquals("Should use initial param value", "Test message abc", actual); + assertEquals("Test message abc", actual, "Should use initial param value"); } @Test @@ -124,9 +122,9 @@ public class StringFormattedMessageTest { final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); final ObjectInputStream in = new ObjectInputStream(bais); final StringFormattedMessage actual = (StringFormattedMessage) in.readObject(); - Assert.assertEquals(expected, actual); - Assert.assertEquals(expected.getFormat(), actual.getFormat()); - Assert.assertEquals(expected.getFormattedMessage(), actual.getFormattedMessage()); - Assert.assertArrayEquals(expected.getParameters(), actual.getParameters()); + assertEquals(expected, actual); + assertEquals(expected.getFormat(), actual.getFormat()); + assertEquals(expected.getFormattedMessage(), actual.getFormattedMessage()); + assertArrayEquals(expected.getParameters(), actual.getParameters()); } } diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/StructuredDataMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/StructuredDataMessageTest.java index 51a4cee..39e0d02 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/StructuredDataMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/StructuredDataMessageTest.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.message; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -82,11 +82,12 @@ public class StructuredDataMessageTest { assertEquals(expected, result); } - @Test(expected = IllegalArgumentException.class) + @Test public void testMsgWithKeyTooLong() { final String testMsg = "Test message {}"; final StructuredDataMessage msg = new StructuredDataMessage("MsgId@12345", testMsg, "Alert"); - msg.put("This is a very long key that will violate the key length validation", "Testing"); + assertThrows(IllegalArgumentException.class, () -> + msg.put("This is a very long key that will violate the key length validation", "Testing")); } @Test diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java index 8668d0a..61817c0 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @@ -34,9 +34,9 @@ public class ThreadDumpMessageTest { final String message = msg.getFormattedMessage(); //System.out.print(message); - assertTrue("No header", message.contains("Testing")); - assertTrue("No RUNNABLE", message.contains("RUNNABLE")); - assertTrue("No ThreadDumpMessage", message.contains("ThreadDumpMessage")); + assertTrue(message.contains("Testing"), "No header"); + assertTrue(message.contains("RUNNABLE"), "No RUNNABLE"); + assertTrue(message.contains("ThreadDumpMessage"), "No ThreadDumpMessage"); } @@ -60,9 +60,9 @@ public class ThreadDumpMessageTest { final String message = msg.getFormattedMessage(); //System.out.print(message); - assertTrue("No header", message.contains("Testing")); - assertTrue("No RUNNABLE", message.contains("RUNNABLE")); - assertTrue("No ThreadDumpMessage", message.contains("ThreadDumpMessage")); + assertTrue(message.contains("Testing"), "No header"); + assertTrue(message.contains("RUNNABLE"), "No RUNNABLE"); + assertTrue(message.contains("ThreadDumpMessage"), "No ThreadDumpMessage"); //assertTrue("No Locks", message.contains("waiting on")); //assertTrue("No syncronizers", message.contains("locked syncrhonizers")); } @@ -90,7 +90,7 @@ public class ThreadDumpMessageTest { other.start(); other.join(); - assertTrue("No mention of other thread in msg", !actual[0].contains("OtherThread")); + assertTrue(!actual[0].contains("OtherThread"), "No mention of other thread in msg"); } @Test @@ -98,7 +98,7 @@ public class ThreadDumpMessageTest { final ThreadDumpMessage message = new ThreadDumpMessage(""); final String initial = message.getFormattedMessage(); - assertFalse("no ThreadWithCountDownLatch thread yet", initial.contains("ThreadWithCountDownLatch")); + assertFalse(initial.contains("ThreadWithCountDownLatch"), "no ThreadWithCountDownLatch thread yet"); final CountDownLatch started = new CountDownLatch(1); final CountDownLatch keepAlive = new CountDownLatch(1); @@ -108,8 +108,8 @@ public class ThreadDumpMessageTest { final StringBuilder result = new StringBuilder(); message.formatTo(result); - assertFalse("no ThreadWithCountDownLatch captured", - result.toString().contains("ThreadWithCountDownLatch")); + assertFalse( + result.toString().contains("ThreadWithCountDownLatch"), "no ThreadWithCountDownLatch captured"); assertEquals(initial, result.toString()); keepAlive.countDown(); // allow thread to die } diff --git a/pom.xml b/pom.xml index 603b2a2..222d3d1 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,8 @@ <!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level --> <minSeverity>info</minSeverity> <jctoolsVersion>1.2.1</jctoolsVersion> + <junitVersion>4.13</junitVersion> + <junitJupiterVersion>5.6.2</junitJupiterVersion> <mockitoVersion>2.25.1</mockitoVersion> <argLine>-Xms256m -Xmx1024m</argLine> <javaTargetVersion>1.8</javaTargetVersion> @@ -671,28 +673,35 @@ <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>5.6.2</version> + <version>${junitJupiterVersion}</version> <scope>test</scope> </dependency> <!-- JUnit 4 to 5 migration support --> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-migrationsupport</artifactId> - <version>5.6.2</version> + <version>${junitJupiterVersion}</version> + <scope>test</scope> + </dependency> + <!-- JUnit 5 parameterized test support --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <version>${junitJupiterVersion}</version> <scope>test</scope> </dependency> <!-- JUnit 4 API dependency --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.13</version> + <version>${junitVersion}</version> <scope>test</scope> </dependency> <!-- JUnit 4 engine --> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> - <version>5.6.2</version> + <version>${junitJupiterVersion}</version> <scope>test</scope> </dependency> <dependency>
