From e906a78e0fafda26c24520189a1802bc5bc0877d Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 12 Jul 2016 17:36:30 +0200 Subject: [PATCH] Move server testing infrastructure to test sources --- spring-web-reactive/.gitignore | 2 +- .../AbstractHttpHandlerIntegrationTests.java | 12 ++++++------ .../reactive/ErrorHandlerIntegrationTests.java | 2 +- .../server/reactive/ZeroCopyIntegrationTests.java | 4 ++-- .../http/server/reactive/bootstrap}/HttpServer.java | 2 +- .../reactive/bootstrap}/HttpServerSupport.java | 2 +- .../server/reactive/bootstrap}/JettyHttpServer.java | 2 +- .../reactive/bootstrap}/ReactorHttpServer.java | 2 +- .../reactive/bootstrap}/RxNettyHttpServer.java | 2 +- .../server/reactive/bootstrap}/TomcatHttpServer.java | 2 +- .../reactive/bootstrap}/UndertowHttpServer.java | 2 +- .../server/reactive/bootstrap}/package-info.java | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/HttpServer.java (94%) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/HttpServerSupport.java (95%) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/JettyHttpServer.java (97%) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/ReactorHttpServer.java (97%) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/RxNettyHttpServer.java (96%) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/TomcatHttpServer.java (97%) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/UndertowHttpServer.java (96%) rename spring-web-reactive/src/{main/java/org/springframework/http/server/reactive/boot => test/java/org/springframework/http/server/reactive/bootstrap}/package-info.java (73%) diff --git a/spring-web-reactive/.gitignore b/spring-web-reactive/.gitignore index 207211d54c..0b81cf52be 100644 --- a/spring-web-reactive/.gitignore +++ b/spring-web-reactive/.gitignore @@ -6,5 +6,5 @@ target /.idea/ bin .gradle -tomcat* +/tomcat.*/ build diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java index 4a2b94e2db..1b705ed5f5 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java @@ -23,12 +23,12 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.springframework.http.server.reactive.boot.HttpServer; -import org.springframework.http.server.reactive.boot.JettyHttpServer; -import org.springframework.http.server.reactive.boot.ReactorHttpServer; -import org.springframework.http.server.reactive.boot.RxNettyHttpServer; -import org.springframework.http.server.reactive.boot.TomcatHttpServer; -import org.springframework.http.server.reactive.boot.UndertowHttpServer; +import org.springframework.http.server.reactive.bootstrap.HttpServer; +import org.springframework.http.server.reactive.bootstrap.JettyHttpServer; +import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; +import org.springframework.http.server.reactive.bootstrap.RxNettyHttpServer; +import org.springframework.http.server.reactive.bootstrap.TomcatHttpServer; +import org.springframework.http.server.reactive.bootstrap.UndertowHttpServer; import org.springframework.util.SocketUtils; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java index c7dfa83f73..8f8b1d6320 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java @@ -25,7 +25,7 @@ import reactor.core.publisher.Mono; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.http.server.reactive.boot.ReactorHttpServer; +import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java index 1b1e8c7aa0..09d5a22160 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java @@ -28,8 +28,8 @@ import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.http.ZeroCopyHttpOutputMessage; -import org.springframework.http.server.reactive.boot.ReactorHttpServer; -import org.springframework.http.server.reactive.boot.UndertowHttpServer; +import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; +import org.springframework.http.server.reactive.bootstrap.UndertowHttpServer; import org.springframework.web.client.RestTemplate; import static org.junit.Assert.assertEquals; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServer.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServer.java index e706861852..8bc8ae12d4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServerSupport.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServerSupport.java index c238f60e55..4c22291b91 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/HttpServerSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.util.SocketUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/JettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/JettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java index 51837739ce..485af7594b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/JettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java index 8bb845a534..1bba2c3c85 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import reactor.core.flow.Loopback; import reactor.core.state.Completable; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/RxNettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/RxNettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java index 1117199684..051ba64e66 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/RxNettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import java.net.InetSocketAddress; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/TomcatHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/TomcatHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java index acbb4568d3..1a47951590 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/TomcatHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import java.io.File; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/UndertowHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/UndertowHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java index 5c6048353c..ca9555a816 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/UndertowHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; import io.undertow.Undertow; import io.undertow.server.HttpHandler; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/package-info.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/package-info.java similarity index 73% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/package-info.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/package-info.java index 56e9fbd187..93e5dac549 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/package-info.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/bootstrap/package-info.java @@ -2,4 +2,4 @@ * This package contains temporary interfaces and classes for running embedded servers. * They are expected to be replaced by an upcoming Spring Boot support. */ -package org.springframework.http.server.reactive.boot; +package org.springframework.http.server.reactive.bootstrap; -- GitLab