Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update test to check file name and support URL sources

Browse Source 
Closes gh-45398
This commit is contained in:
Phillip Webb
2025-05-08 11:59:36 -07:00
parent 9582ac7991
commit ba6539704e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
View File

@@ -159,7 +159,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
Configuration configuration = this.loggingSystem.getConfiguration();
assertThat(output).contains("Hello world").doesNotContain("Hidden");
assertThat(new File(tmpDir() + "/spring.log")).exists();
assertThat(configuration.getConfigurationSource().getFile()).isNotNull();
assertThat(configuration.getConfigurationSource().getLocation()).contains("/log4j2-file.xml");
}
@Test

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/TestLog4J2LoggingSystem.java
View File

@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
class TestLog4J2LoggingSystem extends Log4J2LoggingSystem {
@@ -34,7 +35,11 @@ class TestLog4J2LoggingSystem extends Log4J2LoggingSystem {
}
Configuration getConfiguration() {
return ((org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false)).getConfiguration();
return getLoggerContext().getConfiguration();
}
private LoggerContext getLoggerContext() {
return (LoggerContext) LogManager.getContext(false);
}
@Override