Fix tests

Author: desiderantes

spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java

@@ -33,6 +33,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
@@ -54,7 +55,6 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
-import static org.springframework.http.HttpMethod.QUERY;
 
 /**
  * Tests for building a {@link MockHttpServletRequest} with
@@ -420,21 +420,21 @@ void requestParameterFromMultiValueMap() {
 		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 	}
 
-	@Test
+	@ValueSource(strings = {"POST", "QUERY"})
 	@ParameterizedTest()
-	void requestParameterFromRequestBodyFormData() {
+	void requestParameterFromRequestBodyFormData(String methodName) {
 		String contentType = "application/x-www-form-urlencoded;charset=UTF-8";
 		String body = "name+1=value+1&name+2=value+A&name+2=value+B&name+3";
 
-		for (HttpMethod method : List.of(POST, QUERY)) {
-			MockHttpServletRequest request = new MockHttpServletRequestBuilder(method).uri("/foo")
-					.contentType(contentType).content(body.getBytes(UTF_8))
-					.buildRequest(this.servletContext);
+		HttpMethod method = HttpMethod.valueOf(methodName);
+		MockHttpServletRequest request = new MockHttpServletRequestBuilder(method).uri("/foo")
+				.contentType(contentType).content(body.getBytes(UTF_8))
+				.buildRequest(this.servletContext);
+
+		assertThat(request.getParameterMap().get("name 1")).containsExactly("value 1");
+		assertThat(request.getParameterMap().get("name 2")).containsExactly("value A", "value B");
+		assertThat(request.getParameterMap().get("name 3")).containsExactly((String) null);
 
-			assertThat(request.getParameterMap().get("name 1")).containsExactly("value 1");
-			assertThat(request.getParameterMap().get("name 2")).containsExactly("value A", "value B");
-			assertThat(request.getParameterMap().get("name 3")).containsExactly((String) null);
-		}
 	}
 
 	@Test

spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTests.java

@@ -244,18 +244,18 @@ private MockResponse queryRequest(RecordedRequest request, String expectedReques
 									  String contentType, byte[] responseBody) {
 
 		assertThat(request.getHeaders().values(CONTENT_LENGTH)).hasSize(1);
-		assertThat(Integer.parseInt(request.getHeader(CONTENT_LENGTH))).as("Invalid request content-length").isGreaterThan(0);
-		String requestContentType = request.getHeader(CONTENT_TYPE);
+		assertThat(Integer.parseInt(request.getHeaders().get(CONTENT_LENGTH))).as("Invalid request content-length").isGreaterThan(0);
+		String requestContentType = request.getHeaders().get(CONTENT_TYPE);
 		assertThat(requestContentType).as("No content-type").isNotNull();
 		Charset charset = StandardCharsets.ISO_8859_1;
 		if (requestContentType.contains("charset=")) {
 			String charsetName = requestContentType.split("charset=")[1];
 			charset = Charset.forName(charsetName);
 		}
-		assertThat(request.getBody().readString(charset)).as("Invalid request body").isEqualTo(expectedRequestContent);
+		assertThat(request.getBody().string(charset)).as("Invalid request body").isEqualTo(expectedRequestContent);
 		Buffer buf = new Buffer();
 		buf.write(responseBody);
-		return new MockResponse.builder()
+		return new MockResponse.Builder()
 				.code(200)
 				.setHeader(CONTENT_TYPE, contentType)
 				.setHeader(CONTENT_LENGTH, responseBody.length)
@@ -325,7 +325,7 @@ else if (request.getTarget().equals("/patch")) {
 				else if (request.getTarget().equals("/put")) {
 					return putRequest(request, helloWorld);
 				}
-				else if (request.getPath().equals("/query")) {
+				else if (request.getTarget().equals("/query")) {
 					return queryRequest(request, helloWorld, textContentType.toString(), helloWorldBytes);
 				}
 				return new MockResponse.Builder().code(404).build();