Skip to content

Commit e478abd

Browse files
committed
spotless
1 parent 9a10f02 commit e478abd

5 files changed

+7
-12
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import java.util.List;
2222
import org.apache.logging.log4j.core.test.appender.ListAppender;
23-
import org.apache.logging.log4j.core.test.junit.Named;
2423
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
24+
import org.apache.logging.log4j.core.test.junit.Named;
2525
import org.junit.jupiter.api.Test;
2626

2727
// config from log4j-core test-jar

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

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import java.util.Stack;
2222
import org.apache.logging.log4j.util.Strings;
23-
import static org.junit.jupiter.api.Assertions.assertEquals;
2423
import org.junit.jupiter.api.Test;
2524

2625
public class NDCTest {

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

-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@
3030
import javax.xml.parsers.DocumentBuilderFactory;
3131
import javax.xml.parsers.ParserConfigurationException;
3232
import org.junit.jupiter.api.Test;
33-
import org.junit.runner.RunWith;
34-
import org.junit.runners.Parameterized;
3533
import org.xml.sax.SAXException;
3634

37-
3835
public abstract class AbstractLog4j1ConfigurationConverterTest {
3936

4037
protected static List<Path> getPaths(final String root) throws IOException {

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import org.apache.logging.log4j.core.filter.ThresholdFilter;
6666
import org.apache.logging.log4j.core.layout.HtmlLayout;
6767
import org.apache.logging.log4j.core.layout.PatternLayout;
68-
import org.apache.logging.log4j.core.util.CloseShieldOutputStream;
6968
import org.junit.jupiter.api.Test;
7069
import org.junit.jupiter.api.io.TempDir;
7170

@@ -199,8 +198,7 @@ private void testRollingFileAppender(final String configResource) throws Excepti
199198

200199
assertTrue(
201200
rfa.getManager().getRolloverStrategy() instanceof DefaultRolloverStrategy, "defaultRolloverStrategy");
202-
assertFalse(
203-
((DefaultRolloverStrategy) rfa.getManager().getRolloverStrategy()).isUseMax(), "rolloverStrategy");
201+
assertFalse(((DefaultRolloverStrategy) rfa.getManager().getRolloverStrategy()).isUseMax(), "rolloverStrategy");
204202
assertFalse(getAppendProperty(rfa), "append");
205203
assertEquals(1000, rfa.getManager().getBufferSize(), "bufferSize");
206204
assertFalse(rfa.getImmediateFlush(), "immediateFlush");
@@ -234,7 +232,8 @@ private void testDailyRollingFileAppender(final String configResource) throws Ex
234232
final Appender appender = configuration.getAppender("DRFA");
235233
assertNotNull(appender);
236234
assertEquals("DRFA", appender.getName());
237-
assertTrue(appender instanceof RollingFileAppender, appender.getClass().getName());
235+
assertTrue(
236+
appender instanceof RollingFileAppender, appender.getClass().getName());
238237
final RollingFileAppender rfa = (RollingFileAppender) appender;
239238
assertFalse(getAppendProperty(rfa), "append");
240239
assertEquals(1000, rfa.getManager().getBufferSize(), "bufferSize");
@@ -473,8 +472,8 @@ private int checkFilters(final org.apache.log4j.spi.Filter filter) {
473472
assertNull(filter.getNext(), "found chain of Log4j 1.x filters");
474473
return count;
475474
}
476-
// #### tempDir ######### /tmp/junit-8800472835944933796
477-
// ######### folder /tmp/junit12627114905753561837/junit16127502666327035264
475+
// #### tempDir ######### /tmp/junit-8800472835944933796
476+
// ######### folder /tmp/junit12627114905753561837/junit16127502666327035264
478477

479478
@Test
480479
public void testMultipleFilters() throws Exception {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.io.IOException;
2020
import java.nio.file.Path;
2121
import java.util.List;
22-
import org.junit.jupiter.params.provider.MethodSource;
2322
import org.junit.jupiter.params.ParameterizedTest;
23+
import org.junit.jupiter.params.provider.MethodSource;
2424

2525
public class Log4j1ConfigurationConverterSparkTest extends AbstractLog4j1ConfigurationConverterTest {
2626

0 commit comments

Comments
 (0)