From 12d8f942be527a656e6e09eb5c0d28d13e60ac52 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 29 Oct 2021 15:51:32 +0100 Subject: [PATCH] Stop logging to the file used in the generated documentation Closes gh-28488 --- .../LogFileWebEndpointDocumentationTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java index 5e68cde6ca..668c702e84 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,8 @@ import org.springframework.boot.logging.LogFile; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.core.env.Environment; +import org.springframework.mock.env.MockEnvironment; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; -import org.springframework.test.context.TestPropertySource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -35,8 +34,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * * @author Andy Wilkinson */ -@TestPropertySource( - properties = "logging.file.name=src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log") class LogFileWebEndpointDocumentationTests extends MockMvcEndpointDocumentationTests { @Test @@ -56,7 +53,10 @@ class LogFileWebEndpointDocumentationTests extends MockMvcEndpointDocumentationT static class TestConfiguration { @Bean - LogFileWebEndpoint endpoint(Environment environment) { + LogFileWebEndpoint endpoint() { + MockEnvironment environment = new MockEnvironment(); + environment.setProperty("logging.file.name", + "src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log"); return new LogFileWebEndpoint(LogFile.get(environment), null); }