Skip to content

Commit 2410265

Browse files
committed
Fix Log4j2 XML configuration tests on Windows
See gh-22983
1 parent 2999f09 commit 2410265

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4j2FileXmlTests.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818

1919
import java.io.File;
2020

21-
import org.apache.logging.log4j.core.config.Configuration;
2221
import org.apache.logging.log4j.core.layout.PatternLayout;
2322
import org.junit.jupiter.api.AfterEach;
24-
import org.junit.jupiter.api.BeforeEach;
2523
import org.junit.jupiter.api.Test;
2624
import org.junit.jupiter.api.io.TempDir;
2725

@@ -39,13 +37,6 @@ class Log4j2FileXmlTests extends Log4j2XmlTests {
3937
@TempDir
4038
File temp;
4139

42-
@Override
43-
@BeforeEach
44-
void prepareConfiguration() {
45-
System.setProperty(LoggingSystemProperties.LOG_FILE, new File(this.temp, "test.log").getAbsolutePath());
46-
super.prepareConfiguration();
47-
}
48-
4940
@Override
5041
@AfterEach
5142
void stopConfiguration() {
@@ -91,9 +82,15 @@ protected String getConfigFileName() {
9182
return "log4j2-file.xml";
9283
}
9384

85+
@Override
86+
protected void prepareConfiguration() {
87+
System.setProperty(LoggingSystemProperties.LOG_FILE, new File(this.temp, "test.log").getAbsolutePath());
88+
super.prepareConfiguration();
89+
}
90+
9491
private String fileAppenderPattern() {
95-
Configuration configuration = initializeConfiguration();
96-
return ((PatternLayout) configuration.getAppender("File").getLayout()).getConversionPattern();
92+
prepareConfiguration();
93+
return ((PatternLayout) this.configuration.getAppender("File").getLayout()).getConversionPattern();
9794
}
9895

9996
}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4j2XmlTests.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.logging.log4j.core.config.ConfigurationSource;
2626
import org.apache.logging.log4j.core.layout.PatternLayout;
2727
import org.junit.jupiter.api.AfterEach;
28-
import org.junit.jupiter.api.BeforeEach;
2928
import org.junit.jupiter.api.Test;
3029

3130
import org.springframework.boot.logging.LoggingSystemProperties;
@@ -39,12 +38,7 @@
3938
*/
4039
class Log4j2XmlTests {
4140

42-
private Configuration configuration;
43-
44-
@BeforeEach
45-
void prepareConfiguration() {
46-
this.configuration = initializeConfiguration();
47-
}
41+
protected Configuration configuration;
4842

4943
@AfterEach
5044
void stopConfiguration() {
@@ -96,8 +90,13 @@ protected void withSystemProperty(String name, String value, Runnable action) {
9690
}
9791

9892
private String consolePattern() {
99-
Configuration configuration = initializeConfiguration();
100-
return ((PatternLayout) configuration.getAppender("Console").getLayout()).getConversionPattern();
93+
prepareConfiguration();
94+
return ((PatternLayout) this.configuration.getAppender("Console").getLayout()).getConversionPattern();
95+
}
96+
97+
protected void prepareConfiguration() {
98+
this.configuration = initializeConfiguration();
99+
this.configuration.start();
101100
}
102101

103102
protected Configuration initializeConfiguration() {

0 commit comments

Comments
 (0)