Merge branch '2.0.x' into 2.1.x

wilkinsona · wilkinsona · commit 9963ed124900 · 2019-03-07T09:25:31.000Z
diff --git 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 void withFile() throws Exception {
 	}
 
 	@Test
-	public void testBasicConfigLocation() {
+	public void defaultConfigConfiguresAConsoleAppender() {
 		this.loggingSystem.beforeInitialize();
+		this.loggingSystem.initialize(this.initializationContext, null, null);
 		assertThat(getConsoleAppender()).isNotNull();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,9 @@ public void withFile() throws Exception {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`@Test`
`144`		`- public void testBasicConfigLocation() {`
	`144`	`+ public void defaultConfigConfiguresAConsoleAppender() {`
`145`	`145`	`this.loggingSystem.beforeInitialize();`
	`146`	`+ this.loggingSystem.initialize(this.initializationContext, null, null);`
`146`	`147`	`assertThat(getConsoleAppender()).isNotNull();`
`147`	`148`	`}`
`148`	`149`