revert parameterized changes

Author: hulkoba

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

@@ -29,19 +29,18 @@
 import java.util.List;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-// import org.junit.jupiter.params.ParameterizedTest;
-// import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.api.Test;
-
-// import org.junit.runner.RunWith;
-// import org.junit.runners.Parameterized;
+// import org.junit.jupiter.api.Test;
+import org.junit.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;
 
+@RunWith(Parameterized.class)
 public abstract class AbstractLog4j1ConfigurationConverterTest {
 
     protected static List<Path> getPaths(final String root) throws IOException {
@@ -56,15 +55,14 @@ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attr
         return paths;
     }
 
-    protected final Path pathIn;
+    private final Path pathIn;
 
     public AbstractLog4j1ConfigurationConverterTest(final Path path) {
         this.pathIn = path;
     }
 
-    // @ParameterizedTest
-    // @MethodSource("data")
-    public void test(final Path path) throws Exception {
+    @Test
+    public void test() throws Exception {
         final Path tempFile = Files.createTempFile("log4j2", ".xml");
         try {
             final Log4j1ConfigurationConverter.CommandLineArguments cla =

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

@@ -19,25 +19,20 @@
 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.runner.RunWith;
+import org.junit.runners.Parameterized;
+// import org.junit.jupiter.params.ParameterizedTest;
+// import org.junit.jupiter.params.provider.MethodSource;
 
+@RunWith(Parameterized.class)
 public class Log4j1ConfigurationConverterHadoopTest extends AbstractLog4j1ConfigurationConverterTest {
 
-    // @Parameterized.Parameters(name = "{0}")
+    @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);
     }
-
-    // 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,28 +19,20 @@
 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.runner.RunWith;
+import org.junit.runners.Parameterized;
+// 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)
+@RunWith(Parameterized.class)
 public class Log4j1ConfigurationConverterSparkTest extends AbstractLog4j1ConfigurationConverterTest {
 
+    @Parameterized.Parameters(name = "{0}")
     public static List<Path> data() throws IOException {
         return getPaths("src/test/resources/config-1.2/spark");
     }
 
     public Log4j1ConfigurationConverterSparkTest(final Path path) {
         super(path);
     }
-
-    // ParameterizedTest replacing the JUnit 4 @Test in abstract class
-    @ParameterizedTest
-    @MethodSource("data")
-    // @Override
-    public void test(Path path) throws Exception {
-        super.test(path);
-    }
 }