Skip to content

Commit 310de95

Browse files
wilkinsonawilkinsona
committed
Move tests that use Tomcat out of spring-boot-test
1 parent 043b968 commit 310de95

File tree

26 files changed

+23
-3
lines changed

26 files changed

+23
-3
lines changed

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ include "spring-boot-project:spring-boot-docs"
6868
include "spring-boot-project:spring-boot-test"
6969
include "spring-boot-project:spring-boot-testcontainers"
7070
include "spring-boot-project:spring-boot-test-autoconfigure"
71+
include "spring-boot-project:spring-boot-test-integration-tests"
7172
include "spring-boot-project:spring-boot-tomcat"
7273
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
7374
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests"

‎spring-boot-project/spring-boot-test-integration-tests/build.gradle

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
plugins {
2+
id "java"
3+
}
4+
5+
description = "Spring Boot Test Integration Tests"
6+
7+
dependencies {
8+
testImplementation(project(":spring-boot-project:spring-boot-test"))
9+
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
10+
testImplementation("org.assertj:assertj-core")
11+
testImplementation("org.junit.jupiter:junit-jupiter")
12+
testImplementation("org.mockito:mockito-core")
13+
testImplementation("org.springframework:spring-test")
14+
testImplementation("org.springframework:spring-webflux")
15+
testImplementation("org.springframework:spring-webmvc")
16+
testImplementation("org.springframework.graphql:spring-graphql-test")
17+
18+
testRuntimeOnly("ch.qos.logback:logback-classic")
19+
testRuntimeOnly("com.fasterxml.jackson.core:jackson-databind")
20+
}

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestWebServerWebEnvironmentTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestWebServerWebEnvironmentTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentContextHierarchyTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentContextHierarchyTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortCustomPortTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortCustomPortTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizerIntegrationTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizerIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizerWithCustomBasePathTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizerWithCustomBasePathTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizerWithCustomContextPathTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizerWithCustomContextPathTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/NoTestRestTemplateBeanChecker.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/client/NoTestRestTemplateBeanChecker.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithFactoryBeanTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithFactoryBeanTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/NoWebTestClientBeanChecker.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/reactive/server/NoWebTestClientBeanChecker.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerIntegrationTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithCustomBasePathTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithCustomBasePathTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithCustomContextPathTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithCustomContextPathTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithOverrideIntegrationTests.java renamed to ‎spring-boot-project/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithOverrideIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-test/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,10 @@ dependencies {
4040
optional("org.springframework:spring-webflux")
4141
optional("org.springframework.graphql:spring-graphql-test")
4242

43-
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
4443
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
44+
testImplementation("ch.qos.logback:logback-classic")
4545
testImplementation("io.mockk:mockk")
4646
testImplementation("jakarta.json:jakarta.json-api")
47-
testImplementation("ch.qos.logback:logback-classic")
48-
testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
4947
testImplementation("org.apache.groovy:groovy")
5048
testImplementation("org.apache.groovy:groovy-xml")
5149
testImplementation("org.eclipse:yasson")

‎spring-boot-project/spring-boot-tomcat/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dependencies {
1818
exclude group: "org.apache.tomcat", module: "tomcat-annotations-api"
1919
}
2020

21+
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
2122
optional("org.apache.tomcat.embed:tomcat-embed-jasper")
2223
optional("org.springframework:spring-webflux")
2324

0 commit comments

Comments
 (0)