This is an automated email from the ASF dual-hosted git repository.
pkarwasz 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 e749fa135f Migrate `log4j-slf4j2-impl` to JUnit 5 (#3080)
e749fa135f is described below
commit e749fa135f78dcdf5952fe51c8191a57250c1614
Author: Alba Herrerías <[email protected]>
AuthorDate: Wed Oct 23 10:03:32 2024 +0100
Migrate `log4j-slf4j2-impl` to JUnit 5 (#3080)
Migrate `log4j-slf4j2-impl` to JUnit 5.
---
log4j-slf4j2-impl/pom.xml | 31 +++++-------
.../logging/other/pkg/LoggerContextAnchorTest.java | 4 +-
.../logging/slf4j/CallerInformationTest.java | 39 +++++++--------
.../org/apache/logging/slf4j/Log4j1222Test.java | 9 ++--
.../org/apache/logging/slf4j/Log4jMarkerTest.java | 18 +++----
.../apache/logging/slf4j/LoggerContextTest.java | 9 ++--
.../java/org/apache/logging/slf4j/LoggerTest.java | 56 ++++++++++++----------
.../java/org/apache/logging/slf4j/MarkerTest.java | 55 ++++++++++-----------
.../org/apache/logging/slf4j/OverflowTest.java | 4 +-
.../org/apache/logging/slf4j/SerializeTest.java | 11 ++---
10 files changed, 115 insertions(+), 121 deletions(-)
diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml
index 20fcad9700..453a8f7ae3 100644
--- a/log4j-slf4j2-impl/pom.xml
+++ b/log4j-slf4j2-impl/pom.xml
@@ -78,11 +78,6 @@
<artifactId>log4j-core-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -108,11 +103,6 @@
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -121,25 +111,31 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
+ <!-- Separate test execution to verify that the presence of both:
+ ~ * `log4j-slf4j2-impl` (bridge from SLF4J to Log4j API)
+ ~ * `log4j-to-slf4j` (bridge from Log4j API to SLF4J)
+ ~ does not cause a stack overflow.
+ -->
<execution>
<id>loop-test</id>
<goals>
<goal>test</goal>
</goals>
- <phase>test</phase>
<configuration>
+ <additionalClasspathDependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </additionalClasspathDependencies>
<includes>
<include>**/OverflowTest.java</include>
</includes>
- <includeJUnit5Engines>junit-vintage</includeJUnit5Engines>
</configuration>
</execution>
<execution>
<id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <phase>test</phase>
<configuration>
<includes>
<include>**/*Test.java</include>
@@ -147,9 +143,6 @@
<excludes>
<exclude>**/OverflowTest.java</exclude>
</excludes>
- <classpathDependencyExcludes>
-
<classpathDependencyExcludes>org.apache.logging.log4j:log4j-to-slf4j</classpathDependencyExcludes>
- </classpathDependencyExcludes>
</configuration>
</execution>
</executions>
diff --git
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java
index 5732c205a4..a2b7c7f759 100644
---
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java
+++
b/log4j-slf4j2-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.Level;
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-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
index ca22e19fe4..b0bc3e2f13 100644
---
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
+++
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
@@ -16,29 +16,24 @@
*/
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;
import org.slf4j.spi.CallerBoundaryAware;
import org.slf4j.spi.LoggingEventBuilder;
+@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.");
@@ -47,15 +42,15 @@ public class CallerInformationTest {
logger.atWarn().log("Verifying the caller class is still correct.");
logger.atError().log("Hopefully nobody breaks me!");
final List<String> messages = app.getMessages();
- assertEquals("Incorrect number of messages.", 6, messages.size());
+ assertEquals(6, 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!");
@@ -68,23 +63,23 @@ public class CallerInformationTest {
logger.atWarn().log("brains~~~");
logger.atInfo().log("Itchy. Tasty.");
final List<String> messages = app.getMessages();
- assertEquals("Incorrect number of messages.", 10, messages.size());
+ assertEquals(10, 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.");
}
}
@Test
- public void testFqcnLogger() throws Exception {
- final ListAppender app = ctx.getListAppender("Fqcn").clear();
+ public void testFqcnLogger(@Named("Fqcn") final ListAppender app) throws
Exception {
+ app.clear();
final Logger logger = LoggerFactory.getLogger("FqcnLogger");
LoggingEventBuilder loggingEventBuilder = logger.atInfo();
((CallerBoundaryAware)
loggingEventBuilder).setCallerBoundary("MyFqcn");
loggingEventBuilder.log("A message");
final List<String> messages = app.getMessages();
- assertEquals("Incorrect number of messages.", 1, messages.size());
+ assertEquals(1, messages.size(), "Incorrect number of messages.");
for (final String message : messages) {
- assertEquals("Incorrect fqcn.", "MyFqcn", message);
+ assertEquals("MyFqcn", message, "Incorrect fqcn.");
}
}
}
diff --git
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java
index 85d9d0dff4..6b4e509f86 100644
---
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java
+++
b/log4j-slf4j2-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 class Log4j1222Test {
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-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java
index 837b392a69..4926d3bcd9 100644
---
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java
+++
b/log4j-slf4j2-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 class Log4jMarkerTest {
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-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java
index d77e1d4d34..720bcfcb9a 100644
---
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java
+++
b/log4j-slf4j2-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 class LoggerContextTest {
factory.getLogger("test");
Set<LoggerContext> 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-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
index c5780437a2..86e6cb267a 100644
--- a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
+++ b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
@@ -17,20 +17,21 @@
package org.apache.logging.slf4j;
import static org.assertj.core.api.Assertions.assertThat;
-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.Level;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configurator;
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;
@@ -41,14 +42,11 @@ import org.slf4j.spi.LoggingEventBuilder;
/**
*
*/
+@LoggerContextSource("log4j-test1.xml")
public class LoggerTest {
- private static final String CONFIG = "log4j-test1.xml";
-
- @ClassRule
- public static LoggerContextRule ctx = new LoggerContextRule(CONFIG);
-
- Logger logger = LoggerFactory.getLogger("LoggerTest");
+ private final Logger logger;
+ private final LoggerContext ctx;
@Test
public void debug() {
@@ -56,6 +54,11 @@ public class LoggerTest {
verify("o.a.l.s.LoggerTest Debug message MDC{}" +
Strings.LINE_SEPARATOR);
}
+ public LoggerTest(final LoggerContext context) {
+ this.ctx = context;
+ this.logger = LoggerFactory.getLogger("LoggerTest");
+ }
+
@Test
public void debugNoParms() {
logger.debug("Debug message {}");
@@ -113,7 +116,7 @@ public class LoggerTest {
@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());
}
@@ -159,7 +162,7 @@ public class LoggerTest {
@Test
public void testLazyLoggingEventBuilder() {
- final ListAppender appender = ctx.getListAppender("UnformattedList");
+ final ListAppender appender =
ctx.getConfiguration().getAppender("UnformattedList");
final Level oldLevel = ctx.getRootLogger().getLevel();
try {
Configurator.setRootLevel(Level.ERROR);
@@ -173,34 +176,35 @@ public class LoggerTest {
}
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<String> 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<LogEvent> 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-slf4j2-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java
index 0db3e30393..c81045aa5c 100644
--- a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java
+++ b/log4j-slf4j2-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 class MarkerTest {
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 class MarkerTest {
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 class MarkerTest {
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 class MarkerTest {
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 class MarkerTest {
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-slf4j2-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java
index a0e5b0001a..d3c7871272 100644
--- a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java
+++ b/log4j-slf4j2-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-slf4j2-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java
index 84883a9122..320e424ab8 100644
---
a/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java
+++
b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java
@@ -20,22 +20,17 @@ import static
org.apache.logging.log4j.test.SerializableMatchers.serializesRound
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(value = "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
