tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Enable disabled multi-part Netty 2 tests 

See gh-31110
pull/31244/head
Arjen Poutsma 1 year ago
parent
81ebc3a6f3
commit
056de7e898
2 changed files with 0 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java
  2. 10
      spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java

16
spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java
Unescape View File

@ -49,7 +49,6 @@ import org.springframework.web.reactive.function.server.RouterFunction; @@ -49,7 +49,6 @@ import org.springframework.web.reactive.function.server.RouterFunction;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
import static org.assertj.core.api.Assertions.assertThat;
@ -69,9 +68,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @@ -69,9 +68,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
@ParameterizedHttpServerTest
void multipartData(HttpServer httpServer) throws Exception {
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
startServer(httpServer);
Mono<ResponseEntity<Void>> result = webClient
@ -90,9 +86,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @@ -90,9 +86,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
@ParameterizedHttpServerTest
void parts(HttpServer httpServer) throws Exception {
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
startServer(httpServer);
Mono<ResponseEntity<Void>> result = webClient
@ -113,9 +106,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @@ -113,9 +106,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
void transferTo(HttpServer httpServer) throws Exception {
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
verifyTransferTo(httpServer);
}
@ -154,9 +144,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @@ -154,9 +144,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
@ParameterizedHttpServerTest
void partData(HttpServer httpServer) throws Exception {
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
startServer(httpServer);
Mono<ResponseEntity<Void>> result = webClient
@ -176,9 +163,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @@ -176,9 +163,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
@ParameterizedHttpServerTest
void proxy(HttpServer httpServer) throws Exception {
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests");
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
startServer(httpServer);
Mono<ResponseEntity<Void>> result = webClient

10
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java
Unescape View File

@ -60,7 +60,6 @@ import org.springframework.web.reactive.function.client.WebClient; @@ -60,7 +60,6 @@ import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
import static org.assertj.core.api.Assertions.assertThat;
@ -88,9 +87,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @@ -88,9 +87,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT
@ParameterizedHttpServerTest
void requestPart(HttpServer httpServer) throws Exception {
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
startServer(httpServer);
Mono<ResponseEntity<Void>> result = webClient
@ -174,9 +170,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @@ -174,9 +170,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT
void transferTo(HttpServer httpServer) throws Exception {
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
startServer(httpServer);
Flux<String> result = webClient
@ -195,9 +188,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @@ -195,9 +188,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT
@ParameterizedHttpServerTest
void modelAttribute(HttpServer httpServer) throws Exception {
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
startServer(httpServer);
Mono<String> result = webClient

Write Preview
Loading…
Cancel
Save