Fixed JRE11 only test cases with broken Mockito verifications due to …

…HTTP client call signature changing
wiremock · Jul 25, 2023 · 5ec352e · 5ec352e
1 parent e21394e
commit 5ec352e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/test/java/com/github/tomakehurst/wiremock/http/ProxyResponseRendererTest.java b/src/test/java/com/github/tomakehurst/wiremock/http/ProxyResponseRendererTest.java
@@ -52,11 +52,13 @@
 import java.util.List;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
 @DisabledForJreRange(
@@ -167,7 +169,7 @@ void doesNotAddEntityIfEmptyBodyReverseProxy() throws IOException {
     ServeEvent serveEvent = reverseProxyServeEvent("/proxied");
 
     proxyResponseRenderer.render(serveEvent);
-    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() == null));
+    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() == null), ArgumentMatchers.any(HttpClientResponseHandler.class));
   }
 
   @Test
@@ -178,7 +180,7 @@ void doesNotAddEntityIfEmptyBodyForwardProxy() throws IOException {
     ServeEvent serveEvent = forwardProxyServeEvent("/proxied");
 
     proxyResponseRenderer.render(serveEvent);
-    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() == null));
+    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() == null), ArgumentMatchers.any(HttpClientResponseHandler.class));
   }
 
   @Test
@@ -190,7 +192,7 @@ void addsEntityIfNotEmptyBodyReverseProxy() throws IOException {
         serveEvent("/proxied", false, "Text body".getBytes(StandardCharsets.UTF_8));
 
     proxyResponseRenderer.render(serveEvent);
-    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null));
+    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null), ArgumentMatchers.any(HttpClientResponseHandler.class));
   }
 
   @Test
@@ -202,7 +204,7 @@ void addsEntityIfNotEmptyBodyForwardProxy() throws IOException {
         serveEvent("/proxied", true, "Text body".getBytes(StandardCharsets.UTF_8));
 
     proxyResponseRenderer.render(serveEvent);
-    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null));
+    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null), ArgumentMatchers.any(HttpClientResponseHandler.class));
   }
 
   @Test
@@ -223,7 +225,7 @@ void addsEmptyEntityIfEmptyBodyForwardProxyPOST() throws IOException {
             new HttpHeaders(new HttpHeader("Content-Length", "0")));
 
     trustAllProxyResponseRenderer.render(serveEvent);
-    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null));
+    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null), ArgumentMatchers.any(HttpClientResponseHandler.class));
     List<LoggedRequest> requests =
         origin.findAll(postRequestedFor(urlPathMatching("/proxied/empty-post")));
     Assertions.assertThat(requests)
@@ -250,7 +252,7 @@ void addsEmptyEntityIfEmptyBodyForwardProxyGET() throws IOException {
             new HttpHeaders(new HttpHeader("Content-Length", "0")));
 
     trustAllProxyResponseRenderer.render(serveEvent);
-    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null));
+    Mockito.verify(clientSpy).execute(argThat(request -> request.getEntity() != null), ArgumentMatchers.any(HttpClientResponseHandler.class));
     List<LoggedRequest> requests =
         origin.findAll(getRequestedFor(urlPathMatching("/proxied/empty-get")));
     Assertions.assertThat(requests)