refactor(1.2-api): migrate to junit5

Author: hulkoba

log4j-1.2-api/src/test/java/org/apache/log4j/CallerInformationTest.java

@@ -20,12 +20,12 @@
 
 import java.util.List;
 import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 import org.apache.logging.log4j.core.test.junit.Named;
+import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 import org.junit.jupiter.api.Test;
 
 // config from log4j-core test-jar
-@LoggerContextSource(value = "log4j2-calling-class.xml", timeout = 10)
+@LoggerContextSource(value = "log4j2-calling-class.xml")
 public class CallerInformationTest {
 
     @Test

log4j-1.2-api/src/test/java/org/apache/log4j/NDCTest.java

@@ -20,6 +20,7 @@
 
 import java.util.Stack;
 import org.apache.logging.log4j.util.Strings;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
 public class NDCTest {

log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java

@@ -29,12 +29,11 @@
 import java.util.List;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.xml.sax.SAXException;
-// import org.junit.jupiter.params.ParameterizedTest;
-// import org.junit.jupiter.params.provider.MethodSource;
 
-// import org.junit.runner.RunWith;
-// import org.junit.runners.Parameterized;
 
 public abstract class AbstractLog4j1ConfigurationConverterTest {
 
@@ -50,20 +49,15 @@ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attr
         return paths;
     }
 
-    protected final Path pathIn;
+    public AbstractLog4j1ConfigurationConverterTest() {}
 
-    public AbstractLog4j1ConfigurationConverterTest(final Path path) {
-        this.pathIn = path;
-    }
-
-    // @ParameterizedTest
-    // @MethodSource("data")
-    public void test(final Path path) throws Exception {
+    @Test
+    public void test(Path path) throws Exception {
         final Path tempFile = Files.createTempFile("log4j2", ".xml");
         try {
             final Log4j1ConfigurationConverter.CommandLineArguments cla =
                     new Log4j1ConfigurationConverter.CommandLineArguments();
-            cla.setPathIn(pathIn);
+            cla.setPathIn(path);
             cla.setPathOut(tempFile);
             Log4j1ConfigurationConverter.run(cla);
             checkWellFormedXml(tempFile);

log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java

@@ -481,22 +481,18 @@ public void testMultipleFilters() throws Exception {
 
         try (final LoggerContext loggerContext = configure("log4j-multipleFilters")) {
             final Configuration configuration = loggerContext.getConfiguration();
-            System.out.println("#############" + configuration);
 
             assertNotNull(configuration);
 
             // Check only number of filters.
             final Filterable console = configuration.getAppender("CONSOLE");
-            System.out.println("############# console.getFilter" + console.getFilter());
             assertNotNull(console);
             assertEquals(4, checkFilters(console.getFilter()));
             final Filterable file = configuration.getAppender("FILE");
             assertNotNull(file);
-            System.out.println("############# file.getFilter" + file.getFilter());
             assertEquals(4, checkFilters(file.getFilter()));
             final Filterable rfa = configuration.getAppender("RFA");
             assertNotNull(rfa);
-            System.out.println("############# rfa.getFilter" + rfa.getFilter());
             assertEquals(4, checkFilters(rfa.getFilter()));
             final Filterable drfa = configuration.getAppender("DRFA");
             assertNotNull(drfa);
@@ -508,7 +504,6 @@ public void testMultipleFilters() throws Exception {
             final ListAppender legacyAppender = (ListAppender) ((Adapter) appender).getAppender();
             final org.apache.logging.log4j.core.test.appender.ListAppender nativeAppender =
                     configuration.getAppender("LIST2");
-            System.out.println("############# list2appender.getFilter " + nativeAppender.getFilter());
             assertEquals(3, checkFilters(((Filterable) nativeAppender).getFilter()));
 
             final Logger logger = LogManager.getLogger(PropertiesConfigurationTest.class);
@@ -529,11 +524,6 @@ public void testMultipleFilters() throws Exception {
             // message accepted by "StartsWith" filter
             logger.warn("ACCEPT message");
             expected++;
-            System.out.println("#############expected" + expected);
-            System.out.println("#############legacyAppender.getEvents().size()"
-                    + legacyAppender.getEvents().size());
-            System.out.println("#############nativeAppender.getEvents().size()"
-                    + nativeAppender.getEvents().size());
             assertEquals(expected, legacyAppender.getEvents().size());
             assertEquals(expected, nativeAppender.getEvents().size());
             // message blocked by "StartsWith" filter

log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java

@@ -24,19 +24,16 @@
 
 public class Log4j1ConfigurationConverterHadoopTest extends AbstractLog4j1ConfigurationConverterTest {
 
-    // @Parameterized.Parameters(name = "{0}")
     public static List<Path> data() throws IOException {
         return getPaths("src/test/resources/config-1.2/hadoop");
     }
 
-    public Log4j1ConfigurationConverterHadoopTest(final Path path) {
-        super(path);
+    public Log4j1ConfigurationConverterHadoopTest() {
+        super();
     }
 
-    // ParameterizedTest replacing the JUnit 4 @Test in abstract class
     @ParameterizedTest
     @MethodSource("data")
-    // @Override
     public void test(Path path) throws Exception {
         super.test(path);
     }

log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterSparkTest.java

@@ -19,27 +19,21 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.ParameterizedTest;
 
-// import org.junit.runner.RunWith;
-// import org.junit.runners.Parameterized;
-
-// @RunWith(Parameterized.class)
 public class Log4j1ConfigurationConverterSparkTest extends AbstractLog4j1ConfigurationConverterTest {
 
     public static List<Path> data() throws IOException {
         return getPaths("src/test/resources/config-1.2/spark");
     }
 
-    public Log4j1ConfigurationConverterSparkTest(final Path path) {
-        super(path);
+    public Log4j1ConfigurationConverterSparkTest() {
+        super();
     }
 
-    // ParameterizedTest replacing the JUnit 4 @Test in abstract class
     @ParameterizedTest
     @MethodSource("data")
-    // @Override
     public void test(Path path) throws Exception {
         super.test(path);
     }

log4j-1.2-api/src/test/java/org/apache/log4j/helpers/CyclicBufferTestCase.java

@@ -106,7 +106,7 @@ public void test0() {
         final int size = 2;
 
         CyclicBuffer cb = new CyclicBuffer(size);
-        assertEquals(cb.getMaxSize(), size);
+        assertEquals(size, cb.getMaxSize());
 
         cb.add(e[0]);
         assertEquals(cb.length(), 1);