Skip to content

Commit 056de7e

Browse files
committed
Enable disabled multi-part Netty 2 tests
See gh-31110
1 parent 81ebc3a commit 056de7e

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.springframework.web.reactive.function.server.ServerRequest;
5050
import org.springframework.web.reactive.function.server.ServerResponse;
5151
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
52-
import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
5352
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
5453

5554
import static org.assertj.core.api.Assertions.assertThat;
@@ -69,9 +68,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
6968

7069
@ParameterizedHttpServerTest
7170
void multipartData(HttpServer httpServer) throws Exception {
72-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
73-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
74-
7571
startServer(httpServer);
7672

7773
Mono<ResponseEntity<Void>> result = webClient
@@ -90,9 +86,6 @@ void multipartData(HttpServer httpServer) throws Exception {
9086

9187
@ParameterizedHttpServerTest
9288
void parts(HttpServer httpServer) throws Exception {
93-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
94-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
95-
9689
startServer(httpServer);
9790

9891
Mono<ResponseEntity<Void>> result = webClient
@@ -113,9 +106,6 @@ void parts(HttpServer httpServer) throws Exception {
113106
void transferTo(HttpServer httpServer) throws Exception {
114107
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
115108
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
116-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
117-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
118-
119109
verifyTransferTo(httpServer);
120110
}
121111

@@ -154,9 +144,6 @@ private void verifyTransferTo(HttpServer httpServer) throws Exception {
154144

155145
@ParameterizedHttpServerTest
156146
void partData(HttpServer httpServer) throws Exception {
157-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
158-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
159-
160147
startServer(httpServer);
161148

162149
Mono<ResponseEntity<Void>> result = webClient
@@ -176,9 +163,6 @@ void partData(HttpServer httpServer) throws Exception {
176163
@ParameterizedHttpServerTest
177164
void proxy(HttpServer httpServer) throws Exception {
178165
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests");
179-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
180-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
181-
182166
startServer(httpServer);
183167

184168
Mono<ResponseEntity<Void>> result = webClient

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
6161
import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
6262
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
63-
import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
6463
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
6564

6665
import static org.assertj.core.api.Assertions.assertThat;
@@ -88,9 +87,6 @@ protected void startServer(HttpServer httpServer) throws Exception {
8887

8988
@ParameterizedHttpServerTest
9089
void requestPart(HttpServer httpServer) throws Exception {
91-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
92-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
93-
9490
startServer(httpServer);
9591

9692
Mono<ResponseEntity<Void>> result = webClient
@@ -174,9 +170,6 @@ void filePartsMono(HttpServer httpServer) throws Exception {
174170
void transferTo(HttpServer httpServer) throws Exception {
175171
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
176172
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
177-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
178-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
179-
180173
startServer(httpServer);
181174

182175
Flux<String> result = webClient
@@ -195,9 +188,6 @@ void transferTo(HttpServer httpServer) throws Exception {
195188

196189
@ParameterizedHttpServerTest
197190
void modelAttribute(HttpServer httpServer) throws Exception {
198-
// TODO Determine why Reactor Netty 2 fails: https://github.com/spring-projects/spring-framework/issues/31110
199-
assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
200-
201191
startServer(httpServer);
202192

203193
Mono<String> result = webClient

0 commit comments

Comments
 (0)