Skip to content

Commit e30ae37

Browse files
committed
Move resources into same packages as documentation tests
See gh-44639
1 parent edf3cb1 commit e30ae37

File tree

11 files changed

+5
-6
lines changed

11 files changed

+5
-6
lines changed

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointDocumentationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
* @author Andy Wilkinson
5959
*/
6060
@TestPropertySource(
61-
properties = "spring.config.location=classpath:/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/")
61+
properties = "spring.config.location=classpath:/org/springframework/boot/actuate/autoconfigure/env/")
6262
class EnvironmentEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
6363

6464
private static final FieldDescriptor activeProfiles = fieldWithPath("activeProfiles")

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointDocumentationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* @author Andy Wilkinson
4848
*/
4949
@TestPropertySource(
50-
properties = "spring.flyway.locations=classpath:org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation")
50+
properties = "spring.flyway.locations=classpath:org/springframework/boot/actuate/autoconfigure/flyway")
5151
class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
5252

5353
@Test

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointDocumentationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* @author Andy Wilkinson
4646
*/
4747
@TestPropertySource(
48-
properties = "spring.liquibase.change-log=classpath:org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/db.changelog-master.yaml")
48+
properties = "spring.liquibase.change-log=classpath:org/springframework/boot/actuate/autoconfigure/liquibase/db.changelog-master.yaml")
4949
class LiquibaseEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
5050

5151
@Test

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointDocumentationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static class TestConfiguration {
5757
LogFileWebEndpoint endpoint() {
5858
MockEnvironment environment = new MockEnvironment();
5959
environment.setProperty("logging.file.name",
60-
"src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log");
60+
"src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log");
6161
return new LogFileWebEndpoint(LogFile.get(environment), null);
6262
}
6363

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointDocumentationTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ static class TestConfiguration {
6161
SbomProperties sbomProperties() {
6262
SbomProperties properties = new SbomProperties();
6363
properties.getApplication()
64-
.setLocation(
65-
"classpath:org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/cyclonedx.json");
64+
.setLocation("classpath:org/springframework/boot/actuate/autoconfigure/sbom/cyclonedx.json");
6665
return properties;
6766
}
6867

0 commit comments

Comments
 (0)