Browse Source

Move tests that use Tomcat out of spring-boot-all

See gh-46073
pull/46230/head
Andy Wilkinson 1 year ago
parent
commit
bc840b741d
  1. 1
      settings.gradle
  2. 44
      spring-boot-project/spring-boot-all-integration-tests/build.gradle
  3. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java
  4. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
  5. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java
  6. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java
  7. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java
  8. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java
  9. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java
  10. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/TestCustomizer.java
  11. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java
  12. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java
  13. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java
  14. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java
  15. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java
  16. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java
  17. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java
  18. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java
  19. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java
  20. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java
  21. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java
  22. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
  23. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java
  24. 0
      spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/reactive/test.jks
  25. BIN
      spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/test.jks
  26. BIN
      spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/web/client/test.jks
  27. 1
      spring-boot-project/spring-boot-all/build.gradle

1
settings.gradle

@ -57,6 +57,7 @@ include "spring-boot-project:spring-boot" @@ -57,6 +57,7 @@ include "spring-boot-project:spring-boot"
include "spring-boot-project:spring-boot-actuator"
include "spring-boot-project:spring-boot-actuator-autoconfigure"
include "spring-boot-project:spring-boot-all"
include "spring-boot-project:spring-boot-all-integration-tests"
include "spring-boot-project:spring-boot-autoconfigure"
include "spring-boot-project:spring-boot-autoconfigure-all"
include "spring-boot-project:spring-boot-dependencies"

44
spring-boot-project/spring-boot-all-integration-tests/build.gradle

@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
/*
* 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"
}
description = "Spring Boot Integration Tests"
dependencies {
testImplementation(project(":spring-boot-project:spring-boot-all"))
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation("io.projectreactor.netty:reactor-netty-http")
testImplementation("org.apache.httpcomponents.client5:httpclient5")
testImplementation("org.apache.httpcomponents.core5:httpcore5-reactive")
testImplementation("org.eclipse.jetty:jetty-client")
testImplementation("org.eclipse.jetty:jetty-reactive-httpclient")
testImplementation("org.springframework:spring-webflux")
testImplementation("org.springframework:spring-webmvc")
testRuntimeOnly("ch.qos.logback:logback-classic")
testRuntimeOnly("io.undertow:undertow-servlet")
testRuntimeOnly("org.eclipse.jetty.ee10:jetty-ee10-servlets")
testRuntimeOnly("org.eclipse.jetty.ee10:jetty-ee10-webapp")
}
test {
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
}

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/TestCustomizer.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/TestCustomizer.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java

0
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java → spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java

0
spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/http/client/reactive/test.jks → spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/reactive/test.jks

BIN
spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/test.jks

Binary file not shown.

BIN
spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/web/client/test.jks

Binary file not shown.

1
spring-boot-project/spring-boot-all/build.gradle

@ -110,7 +110,6 @@ dependencies { @@ -110,7 +110,6 @@ dependencies {
exclude(group: "commons-logging", module: "commons-logging")
}
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
testImplementation("com.ibm.db2:jcc")

Loading…
Cancel
Save