root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

This commit is contained in:
Andy Wilkinson 2020-09-22 16:26:58 +01:00
parent 7d984d7f89 232c310df2
commit 17d5e17069
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,10 +18,8 @@ package org.springframework.boot.logging.log4j2;
import java.io.File; import java.io.File;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.core.layout.PatternLayout;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.io.TempDir;
@ -39,13 +37,6 @@ class Log4j2FileXmlTests extends Log4j2XmlTests {
@TempDir @TempDir
File temp; File temp;
@Override
@BeforeEach
void prepareConfiguration() {
System.setProperty(LoggingSystemProperties.LOG_FILE, new File(this.temp, "test.log").getAbsolutePath());
super.prepareConfiguration();
}
@Override @Override
@AfterEach @AfterEach
void stopConfiguration() { void stopConfiguration() {
@ -91,9 +82,15 @@ class Log4j2FileXmlTests extends Log4j2XmlTests {
return "log4j2-file.xml"; return "log4j2-file.xml";
} }
@Override
protected void prepareConfiguration() {
System.setProperty(LoggingSystemProperties.LOG_FILE, new File(this.temp, "test.log").getAbsolutePath());
super.prepareConfiguration();
}
private String fileAppenderPattern() { private String fileAppenderPattern() {
Configuration configuration = initializeConfiguration(); prepareConfiguration();
return ((PatternLayout) configuration.getAppender("File").getLayout()).getConversionPattern(); return ((PatternLayout) this.configuration.getAppender("File").getLayout()).getConversionPattern();
} }
} }

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

@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.ConfigurationSource; import org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.core.layout.PatternLayout;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.logging.LoggingSystemProperties; import org.springframework.boot.logging.LoggingSystemProperties;
@ -39,12 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
class Log4j2XmlTests { class Log4j2XmlTests {
private Configuration configuration; protected Configuration configuration;
@BeforeEach
void prepareConfiguration() {
this.configuration = initializeConfiguration();
}
@AfterEach @AfterEach
void stopConfiguration() { void stopConfiguration() {
@ -96,8 +90,13 @@ class Log4j2XmlTests {
} }
private String consolePattern() { private String consolePattern() {
Configuration configuration = initializeConfiguration(); prepareConfiguration();
return ((PatternLayout) configuration.getAppender("Console").getLayout()).getConversionPattern(); return ((PatternLayout) this.configuration.getAppender("Console").getLayout()).getConversionPattern();
}
protected void prepareConfiguration() {
this.configuration = initializeConfiguration();
this.configuration.start();
} }
protected Configuration initializeConfiguration() { protected Configuration initializeConfiguration() {