Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2018-04-04 14:15:52 +01:00
commit e44bfbea4a
1 changed files with 6 additions and 2 deletions

View File

@ -215,8 +215,10 @@ public class LoggingApplicationListenerTests {
this.initializer.initialize(this.context.getEnvironment(),
this.context.getClassLoader());
Log logger = LogFactory.getLog(LoggingApplicationListenerTests.class);
String existingOutput = this.outputCapture.toString();
logger.info("Hello world");
String output = this.outputCapture.toString().trim();
String output = this.outputCapture.toString().substring(existingOutput.length())
.trim();
assertThat(output).startsWith("target/foo.log");
}
@ -240,8 +242,10 @@ public class LoggingApplicationListenerTests {
this.initializer.initialize(this.context.getEnvironment(),
this.context.getClassLoader());
Log logger = LogFactory.getLog(LoggingApplicationListenerTests.class);
String existingOutput = this.outputCapture.toString();
logger.info("Hello world");
String output = this.outputCapture.toString().trim();
String output = this.outputCapture.toString().substring(existingOutput.length())
.trim();
assertThat(output).startsWith("target/foo/spring.log");
}