Skip to content

Commit 1dd9a95

Browse files
ninetteadhikarihulkoba
authored andcommitted
fix: spotless formatting
1 parent ba78ddd commit 1dd9a95

15 files changed

+41
-50
lines changed

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

Lines changed: 1 addition & 1 deletion
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/CategoryTest.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
import org.apache.logging.log4j.util.Constants;
4545
import org.apache.logging.log4j.util.Strings;
4646
import org.junit.jupiter.api.AfterAll;
47-
import org.junit.jupiter.api.BeforeEach;
4847
import org.junit.jupiter.api.BeforeAll;
48+
import org.junit.jupiter.api.BeforeEach;
4949
import org.junit.jupiter.api.Test;
5050

5151
/**
@@ -346,17 +346,11 @@ public void testAddAppender() {
346346
logger.addAppender(appender);
347347
// Root logger
348348
rootLogger.info("testAddLogger");
349-
assertEquals(
350-
++count,
351-
version1Appender.getEvents().size(),
352-
"adding at root works");
349+
assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
353350
assertEquals(0, appender.getEvents().size(), "adding at child works");
354351
// Another logger
355352
logger.info("testAddLogger2");
356-
assertEquals(
357-
++count,
358-
version1Appender.getEvents().size(),
359-
"adding at root works");
353+
assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
360354
assertEquals(1, appender.getEvents().size(), "adding at child works");
361355
// Call appenders
362356
final LoggingEvent event = new LoggingEvent();

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
*/
1717
package org.apache.log4j;
1818

19-
import static org.hamcrest.Matchers.nullValue;
19+
import static org.hamcrest.MatcherAssert.assertThat;
2020
import static org.hamcrest.Matchers.equalTo;
2121
import static org.hamcrest.Matchers.is;
22-
import static org.hamcrest.MatcherAssert.assertThat;
23-
22+
import static org.hamcrest.Matchers.nullValue;
2423
import static org.junit.jupiter.api.Assertions.assertEquals;
2524
import static org.junit.jupiter.api.Assertions.assertFalse;
2625
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,8 +39,8 @@
4039
import org.apache.logging.log4j.core.layout.PatternLayout;
4140
import org.apache.logging.log4j.core.test.appender.ListAppender;
4241
import org.junit.jupiter.api.AfterAll;
43-
import org.junit.jupiter.api.BeforeEach;
4442
import org.junit.jupiter.api.BeforeAll;
43+
import org.junit.jupiter.api.BeforeEach;
4544
import org.junit.jupiter.api.Test;
4645

4746
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertNotNull;
2121

22-
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;;
22+
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
2323
import org.junit.jupiter.api.Test;
2424

2525
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020

21-
import org.junit.jupiter.api.BeforeEach;
2221
import org.junit.jupiter.api.AfterEach;
22+
import org.junit.jupiter.api.BeforeEach;
2323
import org.junit.jupiter.api.Test;
2424

2525
public class MDCTestCase {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
*/
1717
package org.apache.log4j;
1818

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
1921
import java.util.Stack;
2022
import org.apache.logging.log4j.util.Strings;
21-
import static org.junit.jupiter.api.Assertions.assertEquals;
2223
import org.junit.jupiter.api.Test;
2324

2425
public class NDCTest {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
package org.apache.log4j;
1818

1919
import static org.hamcrest.MatcherAssert.assertThat;
20-
import static org.hamcrest.Matchers.nullValue;
21-
import static org.hamcrest.Matchers.notNullValue;
2220
import static org.hamcrest.Matchers.equalTo;
2321
import static org.hamcrest.Matchers.is;
2422
import static org.hamcrest.Matchers.not;
25-
23+
import static org.hamcrest.Matchers.notNullValue;
24+
import static org.hamcrest.Matchers.nullValue;
2625
import static org.junit.jupiter.api.Assertions.assertEquals;
2726
import static org.junit.jupiter.api.Assertions.assertFalse;
2827
import static org.junit.jupiter.api.Assertions.assertNull;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@
2929
import java.util.List;
3030
import javax.xml.parsers.DocumentBuilderFactory;
3131
import javax.xml.parsers.ParserConfigurationException;
32+
import org.xml.sax.SAXException;
3233
// import org.junit.jupiter.params.ParameterizedTest;
3334
// import org.junit.jupiter.params.provider.MethodSource;
34-
import org.junit.jupiter.api.Test;
3535

3636
// import org.junit.runner.RunWith;
3737
// import org.junit.runners.Parameterized;
38-
import org.xml.sax.SAXException;
3938

4039
public abstract class AbstractLog4j1ConfigurationConverterTest {
4140

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@
6666
import org.apache.logging.log4j.core.layout.HtmlLayout;
6767
import org.apache.logging.log4j.core.layout.PatternLayout;
6868
import org.apache.logging.log4j.core.util.CloseShieldOutputStream;
69-
import org.junit.jupiter.api.io.TempDir;
70-
7169
import org.junit.jupiter.api.Test;
72-
70+
import org.junit.jupiter.api.io.TempDir;
7371

7472
public abstract class AbstractLog4j1ConfigurationTest {
7573

@@ -103,10 +101,7 @@ public void testConsoleCapitalization() throws Exception {
103101
private void testConsoleAppender(final ConsoleAppender expected, final ConsoleAppender actual) {
104102
assertEquals(expected.getImmediateFlush(), actual.getImmediateFlush(), "immediateFlush");
105103
assertEquals(expected.getTarget(), actual.getTarget(), "target");
106-
assertEquals(
107-
expected.getLayout().getClass(),
108-
actual.getLayout().getClass(),
109-
"layoutClass");
104+
assertEquals(expected.getLayout().getClass(), actual.getLayout().getClass(), "layoutClass");
110105
if (expected.getLayout() instanceof PatternLayout) {
111106
patternLayoutEquals((PatternLayout) expected.getLayout(), (PatternLayout) actual.getLayout());
112107
}
@@ -213,7 +208,9 @@ private void testRollingFileAppender(final String configResource) throws Excepti
213208
assertEquals("target/hadoop.log.%i", rfa.getFilePattern());
214209
final TriggeringPolicy triggeringPolicy = rfa.getTriggeringPolicy();
215210
assertNotNull(triggeringPolicy);
216-
assertTrue(triggeringPolicy instanceof CompositeTriggeringPolicy, triggeringPolicy.getClass().getName());
211+
assertTrue(
212+
triggeringPolicy instanceof CompositeTriggeringPolicy,
213+
triggeringPolicy.getClass().getName());
217214
final CompositeTriggeringPolicy ctp = (CompositeTriggeringPolicy) triggeringPolicy;
218215
final TriggeringPolicy[] triggeringPolicies = ctp.getTriggeringPolicies();
219216
assertEquals(1, triggeringPolicies.length);
@@ -222,7 +219,9 @@ private void testRollingFileAppender(final String configResource) throws Excepti
222219
final SizeBasedTriggeringPolicy sbtp = (SizeBasedTriggeringPolicy) tp;
223220
assertEquals(256 * 1024 * 1024, sbtp.getMaxFileSize());
224221
final RolloverStrategy rolloverStrategy = rfa.getManager().getRolloverStrategy();
225-
assertTrue(rolloverStrategy instanceof DefaultRolloverStrategy, rolloverStrategy.getClass().getName());
222+
assertTrue(
223+
rolloverStrategy instanceof DefaultRolloverStrategy,
224+
rolloverStrategy.getClass().getName());
226225
final DefaultRolloverStrategy drs = (DefaultRolloverStrategy) rolloverStrategy;
227226
assertEquals(20, drs.getMaxIndex());
228227
configuration.start();
@@ -244,7 +243,9 @@ private void testDailyRollingFileAppender(final String configResource) throws Ex
244243
assertEquals("target/hadoop.log%d{.dd-MM-yyyy}", rfa.getFilePattern());
245244
final TriggeringPolicy triggeringPolicy = rfa.getTriggeringPolicy();
246245
assertNotNull(triggeringPolicy);
247-
assertTrue(triggeringPolicy instanceof CompositeTriggeringPolicy, triggeringPolicy.getClass().getName());
246+
assertTrue(
247+
triggeringPolicy instanceof CompositeTriggeringPolicy,
248+
triggeringPolicy.getClass().getName());
248249
final CompositeTriggeringPolicy ctp = (CompositeTriggeringPolicy) triggeringPolicy;
249250
final TriggeringPolicy[] triggeringPolicies = ctp.getTriggeringPolicies();
250251
assertEquals(1, triggeringPolicies.length);
@@ -253,7 +254,9 @@ private void testDailyRollingFileAppender(final String configResource) throws Ex
253254
final TimeBasedTriggeringPolicy tbtp = (TimeBasedTriggeringPolicy) tp;
254255
assertEquals(1, tbtp.getInterval());
255256
final RolloverStrategy rolloverStrategy = rfa.getManager().getRolloverStrategy();
256-
assertTrue(rolloverStrategy instanceof DefaultRolloverStrategy, rolloverStrategy.getClass().getName());
257+
assertTrue(
258+
rolloverStrategy instanceof DefaultRolloverStrategy,
259+
rolloverStrategy.getClass().getName());
257260
final DefaultRolloverStrategy drs = (DefaultRolloverStrategy) rolloverStrategy;
258261
assertEquals(Integer.MAX_VALUE, drs.getMaxIndex());
259262
} finally {
@@ -377,8 +380,7 @@ public void testDefaultValues() throws Exception {
377380
assertNotNull(ttccLayout);
378381
assertEquals(
379382
"%r [%t] %p %c %notEmpty{%ndc }- %m%n",
380-
ttccLayout.getConversionPattern(),
381-
"equivalent conversion pattern");
383+
ttccLayout.getConversionPattern(), "equivalent conversion pattern");
382384
// TODO: XMLLayout
383385
// final XmlLayout xmlLayout = (XmlLayout) testLayout(config, "XMLLayout");
384386
// assertNotNull(xmlLayout);
@@ -393,9 +395,8 @@ public void testDefaultValues() throws Exception {
393395
assertNotNull(dailyRollingFileAppender);
394396
assertEquals(
395397
"target/dailyRollingFileAppender%d{.yyyy-MM-dd}",
396-
dailyRollingFileAppender.getFilePattern(),
397-
"equivalent file pattern");
398-
assertTrue(getAppendProperty(dailyRollingFileAppender), "append");
398+
dailyRollingFileAppender.getFilePattern(), "equivalent file pattern");
399+
assertEquals(true, getAppendProperty(dailyRollingFileAppender), "append");
399400
assertEquals(8192, dailyRollingFileAppender.getManager().getBufferSize(), "bufferSize");
400401
assertTrue(dailyRollingFileAppender.getImmediateFlush(), "immediateFlush");
401402
// FileAppender
@@ -529,8 +530,10 @@ public void testMultipleFilters() throws Exception {
529530
logger.warn("ACCEPT message");
530531
expected++;
531532
System.out.println("#############expected" + expected);
532-
System.out.println("#############legacyAppender.getEvents().size()" +legacyAppender.getEvents().size());
533-
System.out.println("#############nativeAppender.getEvents().size()" +nativeAppender.getEvents().size());
533+
System.out.println("#############legacyAppender.getEvents().size()"
534+
+ legacyAppender.getEvents().size());
535+
System.out.println("#############nativeAppender.getEvents().size()"
536+
+ nativeAppender.getEvents().size());
534537
assertEquals(expected, legacyAppender.getEvents().size());
535538
assertEquals(expected, nativeAppender.getEvents().size());
536539
// message blocked by "StartsWith" filter
@@ -584,8 +587,7 @@ protected void testEnhancedRollingFileAppender(final Configuration configuration
584587
assertEquals("target/EnhancedRollingFileAppender/defaultTime.log", defaultTime.getFileName(), "fileName");
585588
assertEquals(
586589
"target/EnhancedRollingFileAppender/defaultTime.%d{yyyy-MM-dd}.log",
587-
defaultTime.getFilePattern(),
588-
"filePattern");
590+
defaultTime.getFilePattern(), "filePattern");
589591
policy = defaultTime.getTriggeringPolicy();
590592
assertTrue(policy instanceof TimeBasedTriggeringPolicy, "is TimeBasedTriggeringPolicy");
591593
// Size policy with default attributes

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public Log4j1ConfigurationConverterSparkTest(final Path path) {
3636
super(path);
3737
}
3838

39-
// ParameterizedTest replacing the JUnit 4 @Test in abstract class
39+
// ParameterizedTest replacing the JUnit 4 @Test in abstract class
4040
@ParameterizedTest
4141
@MethodSource("data")
4242
// @Override

0 commit comments

Comments
 (0)