Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify form data handling in HttpRequestValues

Browse Source 
Closes gh-29615
This commit is contained in:
rstoyanchev
2022-12-05 11:15:51 +00:00
parent 913163884a
commit db53b618c1
4 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/test/java/org/springframework/web/service/invoker/HttpRequestValuesTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.web.service.invoker;
import java.net.URI;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -29,7 +30,6 @@ import org.springframework.http.MediaType;
import org.springframework.util.MultiValueMap;
import org.springframework.web.util.UriComponentsBuilder;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -58,8 +58,9 @@ public class HttpRequestValuesTests {
.build();
Object body = requestValues.getBodyValue();
assertThat(body).isNotNull().isInstanceOf(byte[].class);
assertThat(new String((byte[]) body, UTF_8)).isEqualTo("param1=1st+value&param2=2nd+value+A&param2=2nd+value+B");
assertThat((MultiValueMap<String, String>) body).hasSize(2)
.containsEntry("param1", List.of("1st value"))
.containsEntry("param2", List.of("2nd value A", "2nd value B"));
}
@Test

10
spring-web/src/test/java/org/springframework/web/service/invoker/RequestParamArgumentResolverTests.java
View File

@@ -16,13 +16,15 @@
package org.springframework.web.service.invoker;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.service.annotation.PostExchange;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -58,8 +60,10 @@ public class RequestParamArgumentResolverTests {
this.service.postForm("value 1", "value 2");
Object body = this.client.getRequestValues().getBodyValue();
assertThat(body).isNotNull().isInstanceOf(byte[].class);
assertThat(new String((byte[]) body, UTF_8)).isEqualTo("param1=value+1&param2=value+2");
assertThat(body).isNotNull().isInstanceOf(MultiValueMap.class);
assertThat((MultiValueMap<String, String>) body).hasSize(2)
.containsEntry("param1", List.of("value 1"))
.containsEntry("param2", List.of("value 2"));
}