refactor: Migrate log4j-jpl to junit5

Signed-off-by: Ninette Adhikari <[email protected]>
neighbourhoodie · Sep 27, 2024 · f0fb1a6 · f0fb1a6
1 parent 2e36e28
commit f0fb1a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml
@@ -58,11 +58,6 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/log4j-jpl/src/test/java/org/apache/logging/log4j/jpl/Log4jSystemLoggerTest.java b/log4j-jpl/src/test/java/org/apache/logging/log4j/jpl/Log4jSystemLoggerTest.java
@@ -16,23 +16,23 @@
  */
 package org.apache.logging.log4j.jpl;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.lang.System.Logger;
 import java.util.List;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class Log4jSystemLoggerTest {
 
@@ -41,7 +41,7 @@ public class Log4jSystemLoggerTest {
     protected ListAppender eventAppender;
     protected ListAppender stringAppender;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         logger = System.getLogger(LOGGER_NAME);
         assertThat(logger, instanceOf(Log4jSystemLogger.class));
@@ -51,7 +51,7 @@ public void setUp() throws Exception {
         assertNotNull(stringAppender);
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         if (eventAppender != null) {
             eventAppender.clear();