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/CategoryTest.java

@@ -44,8 +44,13 @@
 import org.apache.logging.log4j.util.Constants;
 import org.apache.logging.log4j.util.Strings;
 import org.junit.jupiter.api.AfterAll;
+<<<<<<< HEAD
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+=======
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+>>>>>>> b0238ae0ee (refactor(1.2-api): migrate to junit5)
 import org.junit.jupiter.api.Test;
 
 /**
@@ -346,11 +351,25 @@ public void testAddAppender() {
             logger.addAppender(appender);
             // Root logger
             rootLogger.info("testAddLogger");
+<<<<<<< HEAD
             assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
             assertEquals(0, appender.getEvents().size(), "adding at child works");
             // Another logger
             logger.info("testAddLogger2");
             assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
+=======
+            assertEquals(
+                    ++count,
+                    version1Appender.getEvents().size(),
+                    "adding at root works");
+            assertEquals(0, appender.getEvents().size(), "adding at child works");
+            // Another logger
+            logger.info("testAddLogger2");
+            assertEquals(
+                    ++count,
+                    version1Appender.getEvents().size(),
+                    "adding at root works");
+>>>>>>> b0238ae0ee (refactor(1.2-api): migrate to junit5)
             assertEquals(1, appender.getEvents().size(), "adding at child works");
             // Call appenders
             final LoggingEvent event = new LoggingEvent();

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

@@ -16,10 +16,18 @@
  */
 package org.apache.log4j;
 
+<<<<<<< HEAD
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
+=======
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+>>>>>>> b0238ae0ee (refactor(1.2-api): migrate to junit5)
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -39,8 +47,13 @@
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.apache.logging.log4j.core.test.appender.ListAppender;
 import org.junit.jupiter.api.AfterAll;
+<<<<<<< HEAD
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+=======
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+>>>>>>> b0238ae0ee (refactor(1.2-api): migrate to junit5)
 import org.junit.jupiter.api.Test;
 
 /**

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

@@ -19,7 +19,11 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+<<<<<<< HEAD
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+=======
+import org.apache.logging.log4j.core.test.junit.LoggerContextSource;;
+>>>>>>> b0238ae0ee (refactor(1.2-api): migrate to junit5)
 import org.junit.jupiter.api.Test;
 
 /**

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

@@ -18,8 +18,13 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+<<<<<<< HEAD
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+=======
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.AfterEach;
+>>>>>>> b0238ae0ee (refactor(1.2-api): migrate to junit5)
 import org.junit.jupiter.api.Test;
 
 public class MDCTestCase {

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,6 +29,12 @@
 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.xml.sax.SAXException;
 // import org.junit.jupiter.params.ParameterizedTest;
 // import org.junit.jupiter.params.provider.MethodSource;