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.2.x' into 2.3.x

This commit is contained in:
Phillip Webb 2020-08-28 15:30:57 -07:00
parent 84f281fbfd 611447c4d5
commit 98f432681f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java
View File

@ -163,9 +163,8 @@ class LoggingApplicationListenerTests {
@Test @Test
void overrideConfigDoesNotExist() { void overrideConfigDoesNotExist() {
addPropertiesToEnvironment(this.context, "logging.config=doesnotexist.xml"); addPropertiesToEnvironment(this.context, "logging.config=doesnotexist.xml");
assertThatIllegalStateException().isThrownBy(() -> { assertThatIllegalStateException().isThrownBy(
this.initializer.initialize(this.context.getEnvironment(), this.context.getClassLoader()); () -> this.initializer.initialize(this.context.getEnvironment(), this.context.getClassLoader()));
});
assertThat(this.output) assertThat(this.output)
.contains("Logging system failed to initialize using configuration from 'doesnotexist.xml'") .contains("Logging system failed to initialize using configuration from 'doesnotexist.xml'")
.doesNotContain("JoranException"); .doesNotContain("JoranException");