Add query to RestTestClient

Author: desiderantes

spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClient.java

@@ -103,6 +103,11 @@ public RequestHeadersUriSpec<?> delete() {
 		return methodInternal(HttpMethod.DELETE);
 	}
 
+	@Override
+	public RequestBodyUriSpec query() {
+		return methodInternal(HttpMethod.QUERY);
+	}
+
 	@Override
 	public RequestHeadersUriSpec<?> options() {
 		return methodInternal(HttpMethod.OPTIONS);

spring-test/src/main/java/org/springframework/test/web/servlet/client/RestTestClient.java

@@ -120,6 +120,12 @@ public interface RestTestClient {
 	 */
 	RequestHeadersUriSpec<?> delete();
 
+	/**
+	 * Prepare an HTTP QUERY request.
+	 * @return a spec for specifying the target URL
+	 */
+	RequestBodyUriSpec query();
+
 	/**
 	 * Prepare an HTTP OPTIONS request.
 	 * @return a spec for specifying the target URL

spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientTests.java

@@ -61,7 +61,7 @@ void setUp() {
 	class HttpMethods {
 
 		@ParameterizedTest
-		@ValueSource(strings = {"GET", "POST", "PUT", "DELETE", "PATCH", "HEAD"})
+		@ValueSource(strings = {"GET", "POST", "PUT", "DELETE", "PATCH", "QUERY", "HEAD"})
 		void testMethod(String method) {
 			RestTestClientTests.this.client.method(HttpMethod.valueOf(method)).uri("/test")
 					.exchange()
@@ -122,10 +122,18 @@ void testOptions() {
 			RestTestClientTests.this.client.options().uri("/test")
 					.exchange()
 					.expectStatus().isOk()
-					.expectHeader().valueEquals("Allow", "GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS")
+					.expectHeader().valueEquals("Allow", "GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS,QUERY")
 					.expectBody().isEmpty();
 		}
 
+		@Test
+		void testQuery() {
+			RestTestClientTests.this.client.query().uri("/test")
+					.exchange()
+					.expectStatus().isOk()
+					.expectBody().jsonPath("$.method").isEqualTo("QUERY");
+		}
+
 	}
 
 

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

@@ -244,7 +244,7 @@ private MockResponse queryRequest(RecordedRequest request, String expectedReques
 									  String contentType, byte[] responseBody) {
 
 		assertThat(request.getHeaders().values(CONTENT_LENGTH)).hasSize(1);
-		assertThat(Integer.parseInt(request.getHeaders().get(CONTENT_LENGTH))).as("Invalid request content-length").isGreaterThan(0);
+ 		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;