Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source 
Setting the log file name to a random value in smoke tests
doesn't work because the logger context has already been initialized.
This commit is contained in:
Madhura Bhave 2019-07-10 18:14:58 -07:00
parent 773dda3d55
commit aebb60d8b8
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerIntegrationTests.java
View File

@ -18,12 +18,15 @@ package org.springframework.boot.context.logging;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.event.ApplicationStartingEvent;
import org.springframework.boot.logging.LogFile;
import org.springframework.boot.logging.LoggingSystem;
import org.springframework.boot.testsupport.rule.OutputCapture;
import org.springframework.context.ApplicationListener;
@ -42,6 +45,9 @@ public class LoggingApplicationListenerIntegrationTests {
@Rule
public OutputCapture outputCapture = new OutputCapture();
@Rule
public final TemporaryFolder temp = new TemporaryFolder();
@Test
public void loggingSystemRegisteredInTheContext() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(SampleService.class)
@ -51,6 +57,17 @@ public class LoggingApplicationListenerIntegrationTests {
}
}
@Test
public void logFileRegisteredInTheContextWhenApplicable() throws Exception {
String logFile = this.temp.newFile().getAbsolutePath();
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(SampleService.class)
.web(WebApplicationType.NONE).properties("logging.file=" + logFile).run()) {
SampleService service = context.getBean(SampleService.class);
assertThat(service.logFile).isNotNull();
assertThat(service.logFile.toString()).isEqualTo(logFile);
}
}
@Test
public void loggingPerformedDuringChildApplicationStartIsNotLost() {
new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE).child(Config.class)
@ -72,8 +89,11 @@ public class LoggingApplicationListenerIntegrationTests {
private final LoggingSystem loggingSystem;
SampleService(LoggingSystem loggingSystem) {
private final LogFile logFile;
SampleService(LoggingSystem loggingSystem, ObjectProvider<LogFile> logFile) {
this.loggingSystem = loggingSystem;
this.logFile = logFile.getIfAvailable();
}
}

7
spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java
View File

@ -66,13 +66,6 @@ public class EndpointsPropertiesSampleActuatorApplicationTests {
assertThat(entity.getBody()).contains("\"hello\":\"world\"");
}
@Test
public void logfileWithRandomName() {
ResponseEntity<String> entity = this.restTemplate.withBasicAuth("user", getPassword())
.getForEntity("/admin/logfile", String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
}
private String getPassword() {
return "password";
}

8
spring-boot-samples/spring-boot-sample-actuator/src/test/resources/application-endpoints.properties
View File

@ -1,5 +1,3 @@
server.error.path: /oops
management.endpoint.health.show-details: always
management.endpoints.web.base-path: /admin
logging.file=./target/${spring.application.instance_id}.log
spring.application.instance_id=${random.value}
server.error.path:/oops
management.endpoint.health.show-details:always
management.endpoints.web.base-path:/admin