Add tests proving we match on request bodies (wiremock#2367)

For methods that do not traditionally accept bodies like GET and DELETE

Author: Mahoney

src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java

@@ -642,6 +642,44 @@ public void matchesFormParamWithKeyInArrayStyle() {
  assertThat(response.statusCode(), is(200));
  }
 
+ @Test
+ public void matchesFormParamForGet() {
+ stubFor(
+ get(urlPathEqualTo("/form"))
+ .withFormParam("key", equalTo("value"))
+ .willReturn(aResponse().withStatus(200)));
+
+ WireMockResponse response =
+ testClient.getWithBody(
+ "/form",
+ "key=value",
+ "application/x-www-form-urlencoded",
+ TestHttpHeader.withHeader("Content-Type", "application/x-www-form-urlencoded"));
+ assertThat(response.statusCode(), is(200));
+
+ response = testClient.get("/form");
+ assertThat(response.statusCode(), is(404));
+ }
+
+ @Test
+ public void matchesFormParamForDelete() {
+ stubFor(
+ delete(urlPathEqualTo("/form"))
+ .withFormParam("key", equalTo("value"))
+ .willReturn(aResponse().withStatus(200)));
+
+ WireMockResponse response =
+ testClient.deleteWithBody(
+ "/form",
+ "key=value",
+ "application/x-www-form-urlencoded",
+ TestHttpHeader.withHeader("Content-Type", "application/x-www-form-urlencoded"));
+ assertThat(response.statusCode(), is(200));
+
+ response = testClient.delete("/form");
+ assertThat(response.statusCode(), is(404));
+ }
+
  @Test
  public void copesWithEmptyRequestHeaderValueWhenMatchingOnEqualTo() {
  stubFor(

src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMockTestClient.java

@@ -47,13 +47,15 @@
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.CharCodingConfig;
 import org.apache.hc.core5.http.io.entity.InputStreamEntity;
 import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
 import org.apache.hc.core5.ssl.SSLContexts;
 
 public class WireMockTestClient {
@@ -107,6 +109,11 @@ public WireMockResponse get(String url, TestHttpHeader... headers) {
  return executeMethodAndConvertExceptions(httpRequest, headers);
  }
 
+ public WireMockResponse getWithBody(
+ String url, String body, String contentType, TestHttpHeader... headers) {
+ return requestWithBody("GET", url, body, contentType, headers);
+ }
+
  public WireMockResponse getViaProxy(String url) {
  return getViaProxy(url, port);
  }
@@ -171,7 +178,7 @@ public WireMockResponse patchWithBody(
  }
 
  private WireMockResponse requestWithBody(
- HttpUriRequestBase request, String body, String contentType, TestHttpHeader... headers) {
+ ClassicHttpRequest request, String body, String contentType, TestHttpHeader... headers) {
  request.setEntity(new StringEntity(body, ContentType.create(contentType, "utf-8")));
  return executeMethodAndConvertExceptions(request, headers);
  }
@@ -236,11 +243,23 @@ public WireMockResponse delete(String url) {
  return executeMethodAndConvertExceptions(httpDelete);
  }
 
+ public WireMockResponse deleteWithBody(
+ String url, String body, String contentType, TestHttpHeader... headers) {
+ return requestWithBody("DELETE", url, body, contentType, headers);
+ }
+
  public WireMockResponse options(String url, TestHttpHeader... headers) {
  HttpOptions httpOptions = new HttpOptions(mockServiceUrlFor(url));
  return executeMethodAndConvertExceptions(httpOptions, headers);
  }
 
+ private WireMockResponse requestWithBody(
+ String method, String url, String body, String contentType, TestHttpHeader[] headers) {
+ String actualUrl = URI.create(url).isAbsolute() ? url : mockServiceUrlFor(url);
+ ClassicHttpRequest httpRequest = ClassicRequestBuilder.create(method).setUri(actualUrl).build();
+ return requestWithBody(httpRequest, body, contentType, headers);
+ }
+
  public void addResponse(String responseSpecJson) {
  addResponse(responseSpecJson, "utf-8");
  }
@@ -318,7 +337,7 @@ private int postEmptyBodyAndReturnStatus(String url) {
  }
 
  private WireMockResponse executeMethodAndConvertExceptions(
- HttpUriRequest httpRequest, TestHttpHeader... headers) {
+ ClassicHttpRequest httpRequest, TestHttpHeader... headers) {
  try {
  for (TestHttpHeader header : headers) {
  httpRequest.addHeader(header.getName(), header.getValue());