applied more formatting

Author: hulkoba

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

@@ -44,13 +44,8 @@
 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;
 
 /**
@@ -351,25 +346,11 @@ 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,18 +16,10 @@
  */
 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;
@@ -47,13 +39,8 @@ >>>>>>> b0238ae0ee (refactor(1.2-api): migrate to junit5)
 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,11 +19,7 @@
 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,13 +18,8 @@
 
 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/config/AbstractLog4j1ConfigurationTest.java

@@ -233,7 +233,7 @@ private void testDailyRollingFileAppender(final String configResource) throws Ex
         try {
             final Appender appender = configuration.getAppender("DRFA");
             assertNotNull(appender);
-            assertEquals(DRFA, appender.getName());
+            assertEquals("DRFA", appender.getName());
             assertTrue(appender instanceof RollingFileAppender, appender.getClass().getName());
             final RollingFileAppender rfa = (RollingFileAppender) appender;
             assertFalse(getAppendProperty(rfa), "append");
@@ -525,8 +525,6 @@ public void testMultipleFilters() throws Exception {
             // message accepted by "StartsWith" filter
             logger.warn("ACCEPT message");
             expected++;
-                    + legacyAppender.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/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);