Create spring-boot-graphql-test module

settings.gradle

@@ -71,6 +71,7 @@ include "spring-boot-project:spring-boot-elasticsearch"
 include "spring-boot-project:spring-boot-flyway"
 include "spring-boot-project:spring-boot-freemarker"
 include "spring-boot-project:spring-boot-graphql"
+include "spring-boot-project:spring-boot-graphql-test"
 include "spring-boot-project:spring-boot-groovy-templates"
 include "spring-boot-project:spring-boot-gson"
 include "spring-boot-project:spring-boot-h2console"
@@ -118,7 +119,6 @@ include "spring-boot-project:spring-boot-session-jdbc"
 include "spring-boot-project:spring-boot-sql"
 include "spring-boot-project:spring-boot-test"
 include "spring-boot-project:spring-boot-test-autoconfigure"
-include "spring-boot-project:spring-boot-test-integration-tests"
 include "spring-boot-project:spring-boot-testcontainers"
 include "spring-boot-project:spring-boot-thymeleaf"
 include "spring-boot-project:spring-boot-tomcat"

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -2005,6 +2005,8 @@ bom {
 				"spring-boot-elasticsearch",
 				"spring-boot-flyway",
 				"spring-boot-freemarker",
+				"spring-boot-graphql",
+				"spring-boot-graphql-test",
 				"spring-boot-groovy-templates",
 				"spring-boot-gson",
 				"spring-boot-h2console",

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

@@ -0,0 +1,30 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot GraphQL Test"
+
+dependencies {
+	api("org.springframework.graphql:spring-graphql-test")
+
+	implementation(project(":spring-boot-project:spring-boot-test"))
+
+	optional(project(":spring-boot-project:spring-boot-web-server"))
+	optional(project(":spring-boot-project:spring-boot-web-server-test"))
+	optional("jakarta.servlet:jakarta.servlet-api")
+	optional("org.springframework:spring-web")
+
+	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation("org.springframework:spring-webflux")
+	testImplementation("org.springframework:spring-webmvc")
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+	testRuntimeOnly("com.fasterxml.jackson.core:jackson-databind")
+}
+
+tasks.named("javadoc") {
+	enabled = false
+}

spring-boot-project/spring-boot-graphql-test/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+# Spring Test Context Customizer Factories
+org.springframework.test.context.ContextCustomizerFactory=\
+org.springframework.boot.test.graphql.tester.HttpGraphQlTesterContextCustomizerFactory

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

@@ -1,18 +0,0 @@
-plugins {
-	id "java"
-}
-
-description = "Spring Boot Test Integration Tests"
-
-dependencies {
-	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-web-server-test"))
-	testImplementation("org.springframework:spring-webflux")
-	testImplementation("org.springframework:spring-webmvc")
-	testImplementation("org.springframework.graphql:spring-graphql-test")
-
-	testRuntimeOnly("ch.qos.logback:logback-classic")
-	testRuntimeOnly("com.fasterxml.jackson.core:jackson-databind")
-}

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

@@ -11,7 +11,6 @@ dependencies {
 	api(project(":spring-boot-project:spring-boot"))
 	api("org.springframework:spring-test")
 
-	optional(project(":spring-boot-project:spring-boot-web-server"))
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	optional("com.google.code.gson:gson")
 	optional("com.jayway.jsonpath:json-path")

spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring.factories

@@ -2,7 +2,6 @@
 org.springframework.test.context.ContextCustomizerFactory=\
 org.springframework.boot.test.context.ImportsContextCustomizerFactory,\
 org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory,\
-org.springframework.boot.test.graphql.tester.HttpGraphQlTesterContextCustomizerFactory,\
 org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory,\
 org.springframework.boot.test.mock.mockito.MockitoContextCustomizerFactory
 

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java

@@ -163,8 +163,7 @@ class SpringBootContextLoaderTests {
 			.collect(Collectors.toCollection(ArrayList::new));
 		String configResource = names.remove(names.size() - 2);
 		assertThat(names).containsExactly("configurationProperties", "Inlined Test Properties", "commandLineArgs",
-				"servletConfigInitParams", "servletContextInitParams", "systemProperties", "systemEnvironment",
-				"random", "applicationInfo");
+				"systemProperties", "systemEnvironment", "random", "applicationInfo");
 		assertThat(configResource).startsWith("Config resource");
 	}