diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml index 32d129b150c..68d0584a0d2 100644 --- a/log4j-slf4j-impl/pom.xml +++ b/log4j-slf4j-impl/pom.xml @@ -109,11 +109,6 @@ junit-jupiter-engine test - - org.junit.vintage - junit-vintage-engine - test - diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java index 5732c205a4e..a2b7c7f7595 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java @@ -16,7 +16,7 @@ */ package org.apache.logging.other.pkg; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -24,7 +24,7 @@ import org.apache.logging.log4j.status.StatusData; import org.apache.logging.log4j.status.StatusListener; import org.apache.logging.log4j.status.StatusLogger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; /** diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java index efcce8b2ad0..3543bf32235 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java @@ -16,41 +16,36 @@ */ package org.apache.logging.slf4j; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; -import org.junit.ClassRule; -import org.junit.Test; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.Named; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@LoggerContextSource("log4j2-calling-class.xml") public class CallerInformationTest { - // config from log4j-core test-jar - private static final String CONFIG = "log4j2-calling-class.xml"; - - @ClassRule - public static final LoggerContextRule ctx = new LoggerContextRule(CONFIG); - @Test - public void testClassLogger() throws Exception { - final ListAppender app = ctx.getListAppender("Class").clear(); + public void testClassLogger(@Named("Class") final ListAppender app) throws Exception { + app.clear(); final Logger logger = LoggerFactory.getLogger("ClassLogger"); logger.info("Ignored message contents."); logger.warn("Verifying the caller class is still correct."); logger.error("Hopefully nobody breaks me!"); final List messages = app.getMessages(); - assertEquals("Incorrect number of messages.", 3, messages.size()); + assertEquals(3, messages.size(), "Incorrect number of messages."); for (final String message : messages) { - assertEquals("Incorrect caller class name.", this.getClass().getName(), message); + assertEquals(this.getClass().getName(), message, "Incorrect caller class name."); } } @Test - public void testMethodLogger() throws Exception { - final ListAppender app = ctx.getListAppender("Method").clear(); + public void testMethodLogger(@Named("Method") final ListAppender app) throws Exception { + app.clear(); final Logger logger = LoggerFactory.getLogger("MethodLogger"); logger.info("More messages."); logger.warn("CATASTROPHE INCOMING!"); @@ -58,9 +53,9 @@ public void testMethodLogger() throws Exception { logger.warn("brains~~~"); logger.info("Itchy. Tasty."); final List messages = app.getMessages(); - assertEquals("Incorrect number of messages.", 5, messages.size()); + assertEquals(5, messages.size(), "Incorrect number of messages."); for (final String message : messages) { - assertEquals("Incorrect caller method name.", "testMethodLogger", message); + assertEquals("testMethodLogger", message, "Incorrect caller method name."); } } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java index 85d9d0dff4d..6b4e509f86c 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java @@ -16,9 +16,9 @@ */ package org.apache.logging.slf4j; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +47,10 @@ public void run() { private void trigger() { Holder.LOGGER.info("Attempt to trigger"); - assertTrue("Logger is of type " + Holder.LOGGER.getClass().getName(), Holder.LOGGER instanceof Log4jLogger); + assertInstanceOf( + Log4jLogger.class, + Holder.LOGGER, + "Logger is of type " + Holder.LOGGER.getClass().getName()); } } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java index 837b392a698..4926d3bcd9b 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java @@ -16,17 +16,19 @@ */ package org.apache.logging.slf4j; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class Log4jMarkerTest { private static Log4jMarkerFactory markerFactory; - @BeforeClass + @BeforeAll public static void startup() { markerFactory = ((Log4jLoggerFactory) org.slf4j.LoggerFactory.getILoggerFactory()).getMarkerFactory(); } @@ -38,9 +40,9 @@ public void testEquals() { final Log4jMarker marker1 = new Log4jMarker(markerFactory, markerA); final Log4jMarker marker2 = new Log4jMarker(markerFactory, markerA); final Log4jMarker marker3 = new Log4jMarker(markerFactory, markerB); - Assert.assertEquals(marker1, marker2); - Assert.assertNotEquals(marker1, null); - Assert.assertNotEquals(null, marker1); - Assert.assertNotEquals(marker1, marker3); + assertEquals(marker1, marker2); + assertNotEquals(marker1, null); + assertNotEquals(null, marker1); + assertNotEquals(marker1, marker3); } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java index d77e1d4d342..720bcfcb9a7 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java @@ -16,12 +16,13 @@ */ package org.apache.logging.slf4j; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.spi.LoggerContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; /** @@ -35,9 +36,9 @@ public void testCleanup() throws Exception { factory.getLogger("test"); Set set = factory.getLoggerContexts(); final LoggerContext ctx1 = set.toArray(LoggerContext.EMPTY_ARRAY)[0]; - assertTrue("LoggerContext is not enabled for shutdown", ctx1 instanceof LifeCycle); + assertInstanceOf(LifeCycle.class, ctx1, "LoggerContext is not enabled for shutdown"); ((LifeCycle) ctx1).stop(); set = factory.getLoggerContexts(); - assertTrue("Expected no LoggerContexts", set.isEmpty()); + assertTrue(set.isEmpty(), "Expected no LoggerContexts"); } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java index c1fc9a7841e..c622aba475e 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java @@ -16,18 +16,19 @@ */ package org.apache.logging.slf4j; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.Named; import org.apache.logging.log4j.util.Strings; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -37,14 +38,16 @@ /** * */ +@LoggerContextSource("log4j-test1.xml") public class LoggerTest { - private static final String CONFIG = "log4j-test1.xml"; + private final Logger logger; + private final LoggerContext ctx; - @ClassRule - public static LoggerContextRule ctx = new LoggerContextRule(CONFIG); - - Logger logger = LoggerFactory.getLogger("LoggerTest"); + public LoggerTest(final LoggerContext context) { + this.ctx = context; + this.logger = LoggerFactory.getLogger("LoggerTest"); + } @Test public void debug() { @@ -93,7 +96,7 @@ public void supportsCustomSLF4JMarkers() { @Test public void testRootLogger() { final Logger l = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - assertNotNull("No Root Logger", l); + assertNotNull(l, "No Root Logger"); assertEquals(Logger.ROOT_LOGGER_NAME, l.getName()); } @@ -138,34 +141,35 @@ public void testThrowable() { } private ListAppender getAppenderByName(final String name) { - final ListAppender listApp = ctx.getListAppender(name); - assertNotNull("Missing Appender", listApp); + final ListAppender listApp = ctx.getConfiguration().getAppender(name); + assertNotNull(listApp, "Missing Appender"); return listApp; } private void verify(final String expected) { final ListAppender listApp = getAppenderByName("List"); final List events = listApp.getMessages(); - assertEquals("Incorrect number of messages. Expected 1 Actual " + events.size(), 1, events.size()); + assertEquals(1, events.size(), "Incorrect number of messages. Expected 1 Actual " + events.size()); final String actual = events.get(0); - assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); + assertEquals(expected, actual, "Incorrect message. Expected " + expected + ". Actual " + actual); listApp.clear(); } private void verifyThrowable(final Throwable expected) { final ListAppender listApp = getAppenderByName("UnformattedList"); final List events = listApp.getEvents(); - assertEquals("Incorrect number of messages", 1, events.size()); + assertEquals(1, events.size(), "Incorrect number of messages"); final LogEvent actual = events.get(0); - assertEquals("Incorrect throwable.", expected, actual.getThrown()); + assertEquals(expected, actual.getThrown(), "Incorrect throwable."); listApp.clear(); } - @Before - @After - public void cleanup() { + @BeforeEach + @AfterEach + public void cleanup( + @Named("List") final ListAppender list, @Named("UnformattedList") final ListAppender unformattedList) { MDC.clear(); - ctx.getListAppender("List").clear(); - ctx.getListAppender("UnformattedList").clear(); + list.clear(); + unformattedList.clear(); } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java index 0db3e30393e..c81045aa5c8 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java @@ -16,18 +16,19 @@ */ package org.apache.logging.slf4j; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -38,13 +39,13 @@ public class MarkerTest { private static final String PARENT_MARKER_NAME = MarkerTest.class.getSimpleName() + "-PARENT"; private static Log4jMarkerFactory markerFactory; - @BeforeClass + @BeforeAll public static void startup() { markerFactory = ((Log4jLoggerFactory) org.slf4j.LoggerFactory.getILoggerFactory()).getMarkerFactory(); } - @Before - @After + @BeforeEach + @AfterEach public void clearMarkers() { MarkerManager.clear(); } @@ -59,17 +60,17 @@ public void testAddMarker() { final Marker log4jParent = MarkerManager.getMarker(parentMarkerName); final Marker log4jMarker = MarkerManager.getMarker(childMakerName); - assertTrue("Incorrect Marker class", slf4jMarker instanceof Log4jMarker); + assertInstanceOf(Log4jMarker.class, slf4jMarker, "Incorrect Marker class"); assertTrue( + log4jMarker.isInstanceOf(log4jParent), String.format( "%s (log4jMarker=%s) is not an instance of %s (log4jParent=%s) in Log4j", - childMakerName, parentMarkerName, log4jMarker, log4jParent), - log4jMarker.isInstanceOf(log4jParent)); + childMakerName, parentMarkerName, log4jMarker, log4jParent)); assertTrue( + slf4jMarker.contains(slf4jParent), String.format( "%s (slf4jMarker=%s) is not an instance of %s (log4jParent=%s) in SLF4J", - childMakerName, parentMarkerName, slf4jMarker, slf4jParent), - slf4jMarker.contains(slf4jParent)); + childMakerName, parentMarkerName, slf4jMarker, slf4jParent)); } @Test @@ -109,15 +110,15 @@ public void testAddSameMarker() { final Marker log4jParent = MarkerManager.getMarker(parentMakerName); final Marker log4jMarker = MarkerManager.getMarker(childMarkerName); assertTrue( + log4jMarker.isInstanceOf(log4jParent), String.format( "%s (log4jMarker=%s) is not an instance of %s (log4jParent=%s) in Log4j", - childMarkerName, parentMakerName, log4jMarker, log4jParent), - log4jMarker.isInstanceOf(log4jParent)); + childMarkerName, parentMakerName, log4jMarker, log4jParent)); assertTrue( + slf4jMarker.contains(slf4jParent), String.format( "%s (slf4jMarker=%s) is not an instance of %s (log4jParent=%s) in SLF4J", - childMarkerName, parentMakerName, slf4jMarker, slf4jParent), - slf4jMarker.contains(slf4jParent)); + childMarkerName, parentMakerName, slf4jMarker, slf4jParent)); } @Test @@ -150,13 +151,13 @@ public void testContainsNullMarker() { final Log4jMarker log4jSlf4jMarker = new Log4jMarker(markerFactory, log4jMarker); final org.slf4j.Marker nullMarker = null; try { - Assert.assertFalse(log4jSlf4jParent.contains(nullMarker)); + assertFalse(log4jSlf4jParent.contains(nullMarker)); fail("Expected " + IllegalArgumentException.class.getName()); } catch (final IllegalArgumentException e) { // expected } try { - Assert.assertFalse(log4jSlf4jMarker.contains(nullMarker)); + assertFalse(log4jSlf4jMarker.contains(nullMarker)); fail("Expected " + IllegalArgumentException.class.getName()); } catch (final IllegalArgumentException e) { // expected @@ -175,8 +176,8 @@ public void testContainsNullString() { final Log4jMarker log4jSlf4jParent = new Log4jMarker(markerFactory, log4jParent); final Log4jMarker log4jSlf4jMarker = new Log4jMarker(markerFactory, log4jMarker); final String nullStr = null; - Assert.assertFalse(log4jSlf4jParent.contains(nullStr)); - Assert.assertFalse(log4jSlf4jMarker.contains(nullStr)); + assertFalse(log4jSlf4jParent.contains(nullStr)); + assertFalse(log4jSlf4jMarker.contains(nullStr)); } @Test @@ -191,7 +192,7 @@ public void testRemoveNullMarker() { final Log4jMarker log4jSlf4jParent = new Log4jMarker(markerFactory, log4jParent); final Log4jMarker log4jSlf4jMarker = new Log4jMarker(markerFactory, log4jMarker); final org.slf4j.Marker nullMarker = null; - Assert.assertFalse(log4jSlf4jParent.remove(nullMarker)); - Assert.assertFalse(log4jSlf4jMarker.remove(nullMarker)); + assertFalse(log4jSlf4jParent.remove(nullMarker)); + assertFalse(log4jSlf4jMarker.remove(nullMarker)); } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java index f56cd9435dc..582c60027c1 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java @@ -16,16 +16,17 @@ */ package org.apache.logging.slf4j; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.Named; import org.apache.logging.log4j.util.Strings; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -35,15 +36,16 @@ /** * */ +@LoggerContextSource(value = "log4j-test1.xml") public class OptionalTest { - private static final String CONFIG = "log4j-test1.xml"; - - @ClassRule - public static final LoggerContextRule CTX = new LoggerContextRule(CONFIG); - Logger logger = LoggerFactory.getLogger("EventLogger"); Marker marker = MarkerFactory.getMarker("EVENT"); + private final LoggerContext CTX; + + public OptionalTest(final LoggerContext context) { + this.CTX = context; + } @Test public void testEventLogger() { @@ -53,17 +55,17 @@ public void testEventLogger() { } private void verify(final String name, final String expected) { - final ListAppender listApp = CTX.getListAppender(name); + final ListAppender listApp = CTX.getConfiguration().getAppender(name); final List events = listApp.getMessages(); - assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size() == 1); + assertTrue(events.size() == 1, "Incorrect number of messages. Expected 1 Actual " + events.size()); final String actual = events.get(0); - assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); + assertEquals(expected, actual, "Incorrect message. Expected " + expected + ". Actual " + actual); listApp.clear(); } - @Before - public void cleanup() { - CTX.getListAppender("List").clear(); - CTX.getListAppender("EventLogger").clear(); + @BeforeEach + public void cleanup(@Named("List") final ListAppender list, @Named("EventLogger") final ListAppender eventLogger) { + list.clear(); + eventLogger.clear(); } } diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java index a0e5b0001a2..d3c78712723 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java @@ -16,10 +16,10 @@ */ package org.apache.logging.slf4j; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import org.apache.logging.log4j.LoggingException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; /** diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java index 84883a9122a..b92bb7de9d8 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java @@ -20,22 +20,17 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.io.Serializable; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; -import org.junit.ClassRule; -import org.junit.Test; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * */ +@LoggerContextSource("log4j-test1.xml") public class SerializeTest { - private static final String CONFIG = "log4j-test1.xml"; - - @ClassRule - public static final LoggerContextRule CTX = new LoggerContextRule(CONFIG); - Logger logger = LoggerFactory.getLogger("LoggerTest"); @Test