root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix outdated tests 

Closes gh-16298
This commit is contained in:
Stephane Nicoll 2019-03-25 11:58:09 +01:00
parent b604ccce32
commit b055410ab4
1 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfigurationTests.java
View File

@ -49,36 +49,71 @@ public class LogFileWebEndpointAutoConfigurationTests {
public final TemporaryFolder temp = new TemporaryFolder();
@Test
public void logFileWebEndpointIsAutoConfiguredWhenLoggingFileIsSet() {
this.contextRunner.withPropertyValues("logging.file.name:test.log").run(
(context) -> assertThat(context).hasSingleBean(LogFileWebEndpoint.class));
public void runWithOnlyExposedShouldNotHaveEndpointBean() {
this.contextRunner
.withPropertyValues("management.endpoints.web.exposure.include=logfile")
.run((context) -> assertThat(context)
.doesNotHaveBean(LogFileWebEndpoint.class));
}
@Test
public void runWhenLoggingFileIsSetAndNotExposedShouldNotHaveEndpointBean() {
this.contextRunner.withPropertyValues("logging.file.name:test.log")
.run((context) -> assertThat(context)
.doesNotHaveBean(LogFileWebEndpoint.class));
}
@Test
public void runWhenLoggingFileIsSetAndExposedShouldHaveEndpointBean() {
this.contextRunner
.withPropertyValues("logging.file.name:test.log",
"management.endpoints.web.exposure.include=logfile")
.run((context) -> assertThat(context)
.hasSingleBean(LogFileWebEndpoint.class));
}
@Test
@Deprecated
public void logFileWebEndpointIsAutoConfiguredWhenLoggingFileIsSetWithDeprecatedProperty() {
this.contextRunner.withPropertyValues("logging.file:test.log").run(
(context) -> assertThat(context).hasSingleBean(LogFileWebEndpoint.class));
public void runWhenLoggingFileIsSetWithDeprecatedPropertyAndExposedShouldHaveEndpointBean() {
this.contextRunner
.withPropertyValues("logging.file:test.log",
"management.endpoints.web.exposure.include=logfile")
.run((context) -> assertThat(context)
.hasSingleBean(LogFileWebEndpoint.class));
}
@Test
public void logFileWebEndpointIsAutoConfiguredWhenLoggingPathIsSet() {
this.contextRunner.withPropertyValues("logging.file.path:test/logs").run(
(context) -> assertThat(context).hasSingleBean(LogFileWebEndpoint.class));
public void runWhenLoggingPathIsSetAndNotExposedShouldNotHaveEndpointBean() {
this.contextRunner.withPropertyValues("logging.file.path:test/logs")
.run((context) -> assertThat(context)
.doesNotHaveBean(LogFileWebEndpoint.class));
}
@Test
public void runWhenLoggingPathIsSetAndExposedShouldHaveEndpointBean() {
this.contextRunner
.withPropertyValues("logging.file.path:test/logs",
"management.endpoints.web.exposure.include=logfile")
.run((context) -> assertThat(context)
.hasSingleBean(LogFileWebEndpoint.class));
}
@Test
@Deprecated
public void logFileWebEndpointIsAutoConfiguredWhenLoggingPathIsSetWithDeprecatedProperty() {
this.contextRunner.withPropertyValues("logging.path:test/logs").run(
(context) -> assertThat(context).hasSingleBean(LogFileWebEndpoint.class));
public void runWhenLoggingPathIsSetWithDeprecatedPropertyAndExposedShouldHaveEndpointBean() {
this.contextRunner
.withPropertyValues("logging.path:test/logs",
"management.endpoints.web.exposure.include=logfile")
.run((context) -> assertThat(context)
.hasSingleBean(LogFileWebEndpoint.class));
}
@Test
public void logFileWebEndpointIsAutoConfiguredWhenExternalFileIsSet() {
this.contextRunner
.withPropertyValues(
"management.endpoint.logfile.external-file:external.log")
"management.endpoint.logfile.external-file:external.log",
"management.endpoints.web.exposure.include=logfile")
.run((context) -> assertThat(context)
.hasSingleBean(LogFileWebEndpoint.class));
}
@ -92,20 +127,12 @@ public class LogFileWebEndpointAutoConfigurationTests {
.doesNotHaveBean(LogFileWebEndpoint.class));
}
@Test
public void logFileWebEndpointCanBeExcluded() {
this.contextRunner
.withPropertyValues("logging.file.name:test.log",
"management.endpoints.web.exposure.exclude=logfile")
.run((context) -> assertThat(context)
.doesNotHaveBean(LogFileWebEndpoint.class));
}
@Test
public void logFileWebEndpointUsesConfiguredExternalFile() throws IOException {
File file = this.temp.newFile();
FileCopyUtils.copy("--TEST--".getBytes(), file);
this.contextRunner.withPropertyValues(
"management.endpoints.web.exposure.include=logfile",
"management.endpoint.logfile.external-file:" + file.getAbsolutePath())
.run((context) -> {
assertThat(context).hasSingleBean(LogFileWebEndpoint.class);