BAEL-1970 fixed formatting (use spaces instead of tabs)
This commit is contained in:
parent
2674f7abff
commit
7186d96b12
|
@ -22,49 +22,49 @@ import org.springframework.test.context.junit4.SpringRunner;
|
||||||
@ActiveProfiles("logback-test2")
|
@ActiveProfiles("logback-test2")
|
||||||
public class LogbackMultiProfileTestLogLevelIntegrationTest {
|
public class LogbackMultiProfileTestLogLevelIntegrationTest {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private TestRestTemplate restTemplate;
|
private TestRestTemplate restTemplate;
|
||||||
|
|
||||||
@Rule
|
@Rule
|
||||||
public OutputCapture outputCapture = new OutputCapture();
|
public OutputCapture outputCapture = new OutputCapture();
|
||||||
|
|
||||||
private String baseUrl = "/testLogLevel";
|
private String baseUrl = "/testLogLevel";
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void givenErrorRootLevelAndTraceLevelForOurPackage_whenCall_thenPrintTraceLogsForOurPackage() {
|
public void givenErrorRootLevelAndTraceLevelForOurPackage_whenCall_thenPrintTraceLogsForOurPackage() {
|
||||||
ResponseEntity<String> response = restTemplate.getForEntity(baseUrl, String.class);
|
ResponseEntity<String> response = restTemplate.getForEntity(baseUrl, String.class);
|
||||||
|
|
||||||
assertThat(response.getStatusCode().value()).isEqualTo(200);
|
assertThat(response.getStatusCode().value()).isEqualTo(200);
|
||||||
assertThatOutputContainsLogForOurPackage("TRACE");
|
assertThatOutputContainsLogForOurPackage("TRACE");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void givenErrorRootLevelAndTraceLevelForOurPackage_whenCall_thenNoTraceLogsForOtherPackages() {
|
public void givenErrorRootLevelAndTraceLevelForOurPackage_whenCall_thenNoTraceLogsForOtherPackages() {
|
||||||
ResponseEntity<String> response = restTemplate.getForEntity(baseUrl, String.class);
|
ResponseEntity<String> response = restTemplate.getForEntity(baseUrl, String.class);
|
||||||
|
|
||||||
assertThat(response.getStatusCode().value()).isEqualTo(200);
|
assertThat(response.getStatusCode().value()).isEqualTo(200);
|
||||||
assertThatOutputDoesntContainLogForOtherPackages("TRACE");
|
assertThatOutputDoesntContainLogForOtherPackages("TRACE");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void givenErrorRootLevelAndTraceLevelForOurPackage_whenCall_thenPrintErrorLogs() {
|
public void givenErrorRootLevelAndTraceLevelForOurPackage_whenCall_thenPrintErrorLogs() {
|
||||||
ResponseEntity<String> response = restTemplate.getForEntity(baseUrl, String.class);
|
ResponseEntity<String> response = restTemplate.getForEntity(baseUrl, String.class);
|
||||||
|
|
||||||
assertThat(response.getStatusCode().value()).isEqualTo(200);
|
assertThat(response.getStatusCode().value()).isEqualTo(200);
|
||||||
assertThatOutputContainsLogForOurPackage("ERROR");
|
assertThatOutputContainsLogForOurPackage("ERROR");
|
||||||
assertThatOutputContainsLogForOtherPackages("ERROR");
|
assertThatOutputContainsLogForOtherPackages("ERROR");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void assertThatOutputContainsLogForOurPackage(String level) {
|
private void assertThatOutputContainsLogForOurPackage(String level) {
|
||||||
assertThat(outputCapture.toString()).containsPattern("TestLogLevelController.*" + level + ".*");
|
assertThat(outputCapture.toString()).containsPattern("TestLogLevelController.*" + level + ".*");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void assertThatOutputDoesntContainLogForOtherPackages(String level) {
|
private void assertThatOutputDoesntContainLogForOtherPackages(String level) {
|
||||||
assertThat(outputCapture.toString().replaceAll("(?m)^.*TestLogLevelController.*$", "")).doesNotContain(level);
|
assertThat(outputCapture.toString().replaceAll("(?m)^.*TestLogLevelController.*$", "")).doesNotContain(level);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void assertThatOutputContainsLogForOtherPackages(String level) {
|
private void assertThatOutputContainsLogForOtherPackages(String level) {
|
||||||
assertThat(outputCapture.toString().replaceAll("(?m)^.*TestLogLevelController.*$", "")).contains(level);
|
assertThat(outputCapture.toString().replaceAll("(?m)^.*TestLogLevelController.*$", "")).contains(level);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue