From ba6539704eab501af04c8b056af5a8a970e2e6d4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 8 May 2025 11:59:36 -0700 Subject: [PATCH] Update test to check file name and support URL sources Closes gh-45398 --- .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 2 +- .../boot/logging/log4j2/TestLog4J2LoggingSystem.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index fc14599eb5e..4dea2958735 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -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 diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/TestLog4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/TestLog4J2LoggingSystem.java index 47f746592c0..33744618fe9 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/TestLog4J2LoggingSystem.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/TestLog4J2LoggingSystem.java @@ -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