Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
parent 5b2de5c81d 24925c3dae
commit aef92b9295
2799 changed files with 28402 additions and 47836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-samples/spring-boot-sample-logback/src/main/java/sample/logback/SampleLogbackApplication.java
View File

@@ -27,8 +27,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class SampleLogbackApplication {
private static final Logger logger = LoggerFactory
.getLogger(SampleLogbackApplication.class);
private static final Logger logger = LoggerFactory.getLogger(SampleLogbackApplication.class);
@PostConstruct
public void logSomething() {

9
spring-boot-samples/spring-boot-sample-logback/src/test/java/sample/logback/SampleLogbackApplicationTests.java
View File

@@ -30,16 +30,13 @@ class SampleLogbackApplicationTests {
@Test
void testLoadedCustomLogbackConfig(CapturedOutput capturedOutput) throws Exception {
SampleLogbackApplication.main(new String[0]);
assertThat(capturedOutput).contains("Sample Debug Message")
.doesNotContain("Sample Trace Message");
assertThat(capturedOutput).contains("Sample Debug Message").doesNotContain("Sample Trace Message");
}
@Test
void testProfile(CapturedOutput capturedOutput) throws Exception {
SampleLogbackApplication
.main(new String[] { "--spring.profiles.active=staging" });
assertThat(capturedOutput).contains("Sample Debug Message")
.contains("Sample Trace Message");
SampleLogbackApplication.main(new String[] { "--spring.profiles.active=staging" });
assertThat(capturedOutput).contains("Sample Debug Message").contains("Sample Trace Message");
}
}