Skip to content

Commit fbf7cba

Browse files
committed
Replace non-ASCII tests with one that exercises decode()
Signed-off-by: config25 <yhkim052556@naver.com>
1 parent aed94c2 commit fbf7cba

1 file changed

Lines changed: 13 additions & 17 deletions

File tree

spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverterTests.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,6 @@ void postRequestWithParametersCreatesFormUrlEncodedContent() {
150150
assertThat(request.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_FORM_URLENCODED);
151151
}
152152

153-
@Test
154-
void getRequestWithNonAsciiParametersProducesCorrectQueryString() {
155-
OperationRequest request = createOperationRequest(
156-
MockMvcRequestBuilders.get("/foo").param("name", "\uD64D\uAE38\uB3D9"));
157-
assertThat(request.getUri())
158-
.isEqualTo(URI.create("http://localhost/foo?name=%ED%99%8D%EA%B8%B8%EB%8F%99"));
159-
assertThat(request.getMethod()).isEqualTo(HttpMethod.GET);
160-
}
161-
162-
@Test
163-
void postRequestWithNonAsciiParametersCreatesCorrectFormUrlEncodedContent() {
164-
OperationRequest request = createOperationRequest(
165-
MockMvcRequestBuilders.post("/foo").param("name", "\uD64D\uAE38\uB3D9"));
166-
assertThat(request.getContentAsString()).isEqualTo("name=%ED%99%8D%EA%B8%B8%EB%8F%99");
167-
assertThat(request.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_FORM_URLENCODED);
168-
}
169-
170153
@Test
171154
void postRequestWithParametersAndQueryStringCreatesFormUrlEncodedContentWithoutDuplication() {
172155
OperationRequest request = createOperationRequest(
@@ -177,6 +160,19 @@ void postRequestWithParametersAndQueryStringCreatesFormUrlEncodedContentWithoutD
177160
assertThat(request.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_FORM_URLENCODED);
178161
}
179162

163+
@Test
164+
void postRequestWithNonAsciiParametersAndQueryStringCreatesFormUrlEncodedContentWithoutDuplication() {
165+
OperationRequest request = createOperationRequest(MockMvcRequestBuilders
166+
.post("/foo?name=%ED%99%8D%EA%B8%B8%EB%8F%99")
167+
.param("name", "\uD64D\uAE38\uB3D9")
168+
.param("other", "\uD64D\uAE38\uB3D9"));
169+
assertThat(request.getUri())
170+
.isEqualTo(URI.create("http://localhost/foo?name=%ED%99%8D%EA%B8%B8%EB%8F%99"));
171+
assertThat(request.getMethod()).isEqualTo(HttpMethod.POST);
172+
assertThat(request.getContentAsString()).isEqualTo("other=%ED%99%8D%EA%B8%B8%EB%8F%99");
173+
assertThat(request.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_FORM_URLENCODED);
174+
}
175+
180176
@Test
181177
void mockMultipartFileUpload() {
182178
OperationRequest request = createOperationRequest(MockMvcRequestBuilders.multipart("/foo")

0 commit comments

Comments
 (0)