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

Move actuator test support out spring-boot-actuator-integration-tests 

See gh-46071
This commit is contained in:
Stéphane Nicoll 2025-05-22 16:12:09 +02:00 committed by Andy Wilkinson
parent 2a9de80686
commit d2a3e5baf3
11 changed files with 84 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
settings.gradle
View File

@ -62,6 +62,7 @@ include "spring-boot-project:spring-boot-actuator-autoconfigure"
include "spring-boot-project:spring-boot-actuator-autoconfigure-all"
include "spring-boot-project:spring-boot-actuator-docs"
include "spring-boot-project:spring-boot-actuator-integration-tests"
include "spring-boot-project:spring-boot-actuator-test-support"
include "spring-boot-project:spring-boot-amqp"
include "spring-boot-project:spring-boot-artemis"
include "spring-boot-project:spring-boot-autoconfigure"

14
spring-boot-project/spring-boot-actuator-integration-tests/build.gradle
View File

@ -17,26 +17,14 @@
plugins {
id "java-library"
id "java-test-fixtures"
}
description = "Spring Boot Actuator Integration Tests"
dependencies {
testFixturesImplementation(project(":spring-boot-project:spring-boot-actuator"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-http-converter"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-jackson"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-jersey"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-test"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-tomcat"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-webflux"))
testFixturesImplementation(project(":spring-boot-project:spring-boot-webmvc"))
testFixturesImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
testImplementation(project(":spring-boot-project:spring-boot-actuator"))
testImplementation(project(":spring-boot-project:spring-boot-actuator-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
testImplementation(project(":spring-boot-project:spring-boot-http-converter"))
testImplementation(project(":spring-boot-project:spring-boot-jackson"))

54
spring-boot-project/spring-boot-actuator-test-support/build.gradle Normal file
View File

@ -0,0 +1,54 @@
/*
* Copyright 2012-present 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
plugins {
id "java-library"
id "org.springframework.boot.optional-dependencies"
}
description = "Spring Boot Actuator Testing Support"
dependencies {
api(project(":spring-boot-project:spring-boot-actuator"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))
api(project(":spring-boot-project:spring-boot-http-converter"))
api(project(":spring-boot-project:spring-boot-jackson"))
api(project(":spring-boot-project:spring-boot-jersey"))
api(project(":spring-boot-project:spring-boot-reactor-netty"))
api(project(":spring-boot-project:spring-boot-test"))
api(project(":spring-boot-project:spring-boot-tomcat"))
api(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
api(project(":spring-boot-project:spring-boot-webflux"))
api(project(":spring-boot-project:spring-boot-webmvc"))
api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
api("com.jayway.jsonpath:json-path")
api("org.assertj:assertj-core")
api("org.awaitility:awaitility")
api("org.hamcrest:hamcrest-core")
api("org.hamcrest:hamcrest-library")
api("org.junit.jupiter:junit-jupiter")
api("org.mockito:mockito-core")
api("org.mockito:mockito-junit-jupiter")
api("org.skyscreamer:jsonassert")
api("org.springframework:spring-core")
api("org.springframework:spring-test")
api("org.springframework:spring-core-test")
compileOnly("org.junit.platform:junit-platform-engine")
compileOnly("org.junit.platform:junit-platform-launcher")
compileOnly("org.springframework:spring-context")
}

3
spring-boot-project/spring-boot-actuator-integration-tests/src/testFixtures/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTest.java → spring-boot-project/spring-boot-actuator-test-support/src/main/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTest.java
View File

@ -31,9 +31,10 @@ import org.springframework.context.ConfigurableApplicationContext;
/**
* Signals that a test should be run against one or more of the web endpoint
* infrastructure implementations (Jersey, Web MVC, and WebFlux)
* infrastructure implementations (Jersey, Web MVC, and WebFlux).
*
* @author Andy Wilkinson
* @since 4.0.0
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)

0
spring-boot-project/spring-boot-actuator-integration-tests/src/testFixtures/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java → spring-boot-project/spring-boot-actuator-test-support/src/main/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java
View File

21
spring-boot-project/spring-boot-actuator-test-support/src/main/java/org/springframework/boot/actuate/endpoint/web/test/package-info.java Normal file
View File

@ -0,0 +1,21 @@
/*
* Copyright 2012-present 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Support for testing endpoints against one or more of the web endpoint infrastructure
* implementations.
*/
package org.springframework.boot.actuate.endpoint.web.test;

2
spring-boot-project/spring-boot-cache/build.gradle
View File

@ -61,9 +61,9 @@ dependencies {
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
testImplementation(project(":spring-boot-project:spring-boot-actuator-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-actuator-integration-tests")))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
testRuntimeOnly("ch.qos.logback:logback-classic")

2
spring-boot-project/spring-boot-integration/build.gradle
View File

@ -40,11 +40,11 @@ dependencies {
optional("org.springframework.integration:spring-integration-jmx")
optional("org.springframework.integration:spring-integration-rsocket")
testImplementation(project(":spring-boot-project:spring-boot-actuator-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-flyway"))
testImplementation(project(":spring-boot-project:spring-boot-rsocket"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-actuator-integration-tests")))
testImplementation("org.springframework:spring-web")
testRuntimeOnly(project(":spring-boot-project:spring-boot-reactor-netty"))

2
spring-boot-project/spring-boot-metrics/build.gradle
View File

@ -37,9 +37,9 @@ dependencies {
optional("org.apache.logging.log4j:log4j-core")
optional("org.aspectj:aspectjweaver")
testImplementation(project(":spring-boot-project:spring-boot-actuator-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-actuator-integration-tests")))
testImplementation("com.fasterxml.jackson.core:jackson-databind")
testImplementation("io.micrometer:micrometer-registry-atlas")
testImplementation("io.micrometer:micrometer-registry-new-relic")

2
spring-boot-project/spring-boot-quartz/build.gradle
View File

@ -37,11 +37,11 @@ dependencies {
optional(project(":spring-boot-project:spring-boot-jdbc"))
optional(project(":spring-boot-project:spring-boot-jpa"))
testImplementation(project(":spring-boot-project:spring-boot-actuator-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-flyway"))
testImplementation(project(":spring-boot-project:spring-boot-liquibase"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-actuator-integration-tests")))
testImplementation("net.minidev:json-smart")
testImplementation("org.springframework:spring-web")

2
spring-boot-project/spring-boot-session/build.gradle
View File

@ -45,11 +45,11 @@ dependencies {
testFixturesImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server")))
testFixturesImplementation("io.projectreactor:reactor-core")
testImplementation(project(":spring-boot-project:spring-boot-actuator-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-webflux"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-actuator-integration-tests")))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server")))
testImplementation("net.minidev:json-smart")
testImplementation("io.projectreactor:reactor-test")