Browse Source

Rename MultipartWebClientIntegrationTests classes to avoid duplicate names

pull/29659/head
Sam Brannen 2 years ago
parent
commit
348cc01284
  1. 2
      spring-web/src/test/java/org/springframework/http/server/reactive/MultipartHttpHandlerIntegrationTests.java
  2. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java
  3. 8
      spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java

2
spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java → spring-web/src/test/java/org/springframework/http/server/reactive/MultipartHttpHandlerIntegrationTests.java

@ -47,7 +47,7 @@ import static org.assertj.core.api.InstanceOfAssertFactories.type; @@ -47,7 +47,7 @@ import static org.assertj.core.api.InstanceOfAssertFactories.type;
/**
* @author Sebastien Deleuze
*/
class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests {
class MultipartHttpHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTests {
@Override
protected HttpHandler createHttpHandler() {

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

@ -59,7 +59,7 @@ import static org.springframework.web.reactive.function.server.RouterFunctions.r @@ -59,7 +59,7 @@ import static org.springframework.web.reactive.function.server.RouterFunctions.r
/**
* @author Sebastien Deleuze
*/
class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests {
class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionIntegrationTests {
private final WebClient webClient = WebClient.create();

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

@ -65,7 +65,7 @@ import org.springframework.web.testfixture.http.server.reactive.bootstrap.Undert @@ -65,7 +65,7 @@ import org.springframework.web.testfixture.http.server.reactive.bootstrap.Undert
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests {
class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationTests {
private WebClient webClient;
@ -270,7 +270,7 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests { @@ -270,7 +270,7 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests {
@PostMapping("/requestBodyMap")
Mono<String> requestBodyMap(@RequestBody Mono<MultiValueMap<String, Part>> partsMono) {
return partsMono.map(MultipartIntegrationTests::partMapDescription);
return partsMono.map(MultipartWebClientIntegrationTests::partMapDescription);
}
@PostMapping("/requestBodyFlux")
@ -345,11 +345,11 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests { @@ -345,11 +345,11 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests {
}
private static Mono<String> partFluxDescription(Flux<? extends Part> partsFlux) {
return partsFlux.collectList().map(MultipartIntegrationTests::partListDescription);
return partsFlux.collectList().map(MultipartWebClientIntegrationTests::partListDescription);
}
private static String partListDescription(List<? extends Part> parts) {
return parts.stream().map(MultipartIntegrationTests::partDescription)
return parts.stream().map(MultipartWebClientIntegrationTests::partDescription)
.collect(Collectors.joining(",", "[", "]"));
}
Loading…
Cancel
Save