Merge branch '2.0.x' into 2.1.x

9963ed12 · Andy Wilkinson · 80f2e226 · 83216c34 · 9963ed12
Commit 9963ed12 authored Mar 07, 2019 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

LogbackLoggingSystemTests.java ...ework/boot/logging/logback/LogbackLoggingSystemTests.java +2 -1

No files found.
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
@@ -141,8 +141,9 @@ public class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
 	}

 	@Test
-	public void testBasicConfigLocation() {
+	public void defaultConfigConfiguresAConsoleAppender() {
 		this.loggingSystem.beforeInitialize();
+		this.loggingSystem.initialize(this.initializationContext, null, null);
 		assertThat(getConsoleAppender()).isNotNull();
 	}