Migrate NestedLoggingFromThrowableMessageTest to JUnit 5

Author: AlbaHerrerias

log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java

@@ -16,8 +16,8 @@
  */
 package org.apache.logging.log4j.core.impl;
 
-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.io.BufferedReader;
 import java.io.File;
@@ -26,36 +26,33 @@
 import java.nio.file.Files;
 import java.util.HashSet;
 import java.util.Set;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.test.CoreLoggerContexts;
-import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for LOG4J2-2368.
  */
+@LoggerContextSource("log4j-nested-logging-throwable-message.xml")
 public class NestedLoggingFromThrowableMessageTest {
 
     private static final File file1 = new File("target/NestedLoggerTest1.log");
     private static final File file2 = new File("target/NestedLoggerTest2.log");
 
-    @BeforeClass
-    public static void beforeClass() {
-        file1.delete();
-        file2.delete();
+    @BeforeAll
+    public static void beforeAll() {
+        System.setProperty("log4j2.enableThreadlocals", "true");
     }
 
-    @Rule
-    public LoggerContextRule context = new LoggerContextRule("log4j-nested-logging-throwable-message.xml");
-
     private Logger logger;
 
-    @Before
+    @BeforeEach
     public void before() {
-        logger = context.getLogger(NestedLoggingFromThrowableMessageTest.class);
+        logger = LogManager.getLogger(NestedLoggingFromThrowableMessageTest.class);
     }
 
     class ThrowableLogsInGetMessage extends RuntimeException {
@@ -77,7 +74,7 @@ public void testNestedLoggingInLastArgument() throws Exception {
         final Set<String> lines1 = readUniqueLines(file1);
         final Set<String> lines2 = readUniqueLines(file2);
 
-        assertEquals("Expected the same data from both appenders", lines1, lines2);
+        assertEquals(lines1, lines2, "Expected the same data from both appenders");
         assertEquals(2, lines1.size());
         assertTrue(lines1.contains("INFO NestedLoggingFromThrowableMessageTest Logging in getMessage "));
         assertTrue(lines1.contains("ERROR NestedLoggingFromThrowableMessageTest Test message"));
@@ -89,7 +86,7 @@ private static Set<String> readUniqueLines(final File input) throws IOException
                 new BufferedReader(new InputStreamReader(Files.newInputStream(input.toPath())))) {
             String line;
             while ((line = reader.readLine()) != null) {
-                assertTrue("Read duplicate line: " + line, lines.add(line));
+                assertTrue(lines.add(line), "Read duplicate line: " + line);
             }
         }
         return lines;