fixup! STF-322: Add tests for transport-failure retry

Author: oschwald

src/test/java/com/maxmind/minfraud/WebServiceClientTest.java

@@ -43,9 +43,11 @@
 import com.maxmind.minfraud.response.InsightsResponse;
 import com.maxmind.minfraud.response.IpRiskReason;
 import com.maxmind.minfraud.response.ScoreResponse;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ProxySelector;
 import java.net.http.HttpClient;
+import java.net.http.HttpTimeoutException;
 import java.time.Duration;
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -500,9 +502,7 @@ public void testNoRetryOnHttpTimeoutException() {
             .requestTimeout(Duration.ofMillis(100))
             .build();
 
-        // The request-phase timeout surfaces as a checked exception; we just
-        // need to confirm it propagates (any throwable is acceptable here).
-        assertThrows(Exception.class, () -> client.insights(fullTransaction()));
+        assertThrows(HttpTimeoutException.class, () -> client.insights(fullTransaction()));
 
         wireMock.verify(1, postRequestedFor(urlEqualTo(url)));
     }
@@ -561,16 +561,44 @@ public void testMaxRetriesZeroDisablesRetry() {
             .maxRetries(0)
             .build();
 
-        assertThrows(Exception.class, () -> client.insights(fullTransaction()));
+        assertThrows(IOException.class, () -> client.insights(fullTransaction()));
 
         wireMock.verify(1, postRequestedFor(urlEqualTo(url)));
     }
 
+    @Test
+    public void testRetriesExhausted() {
+        var url = "/minfraud/v2.0/insights";
+        wireMock.stubFor(post(urlEqualTo(url))
+            .willReturn(aResponse().withFault(Fault.CONNECTION_RESET_BY_PEER)));
+
+        var client = new WebServiceClient.Builder(6, "0123456789")
+            .host("localhost")
+            .port(wireMock.getPort())
+            .disableHttps()
+            .maxRetries(2)
+            .build();
+
+        assertThrows(IOException.class, () -> client.insights(fullTransaction()));
+
+        // 1 initial attempt + 2 retries.
+        wireMock.verify(3, postRequestedFor(urlEqualTo(url)));
+    }
+
+    @Test
+    public void testNegativeMaxRetriesThrows() {
+        var builder = new WebServiceClient.Builder(6, "0123456789");
+        assertThrows(IllegalArgumentException.class, () -> builder.maxRetries(-1));
+    }
+
     @Test
     public void testInterruptDuringRetry() {
-        // Pre-interrupt the calling thread; the predicate short-circuits when
-        // the thread is interrupted, so no retry should occur and the
-        // InterruptedException path in the client should restore the flag.
+        // Pre-interrupting the calling thread aborts the call before any wire
+        // request is dispatched: HttpClient.send checks the interrupt status
+        // and throws InterruptedException, which is caught and rewrapped as
+        // MinFraudException with the interrupt flag restored. The wire-count
+        // assertion (zero) guards against a regression where pre-interrupt
+        // would silently let the request proceed.
         var url = "/minfraud/v2.0/insights";
         wireMock.stubFor(post(urlEqualTo(url))
             .willReturn(aResponse().withFault(Fault.CONNECTION_RESET_BY_PEER)));
@@ -583,12 +611,14 @@ public void testInterruptDuringRetry() {
 
         Thread.currentThread().interrupt();
         try {
-            assertThrows(Exception.class, () -> client.insights(fullTransaction()));
+            assertThrows(MinFraudException.class, () -> client.insights(fullTransaction()));
             assertTrue(Thread.currentThread().isInterrupted(),
                 "interrupt flag should remain set after the call");
         } finally {
-            // Clear the interrupt flag so it does not leak to other tests.
+            // Clear the interrupt flag so it does not leak to other tests
+            // (and so wireMock.verify below isn't affected by it).
             Thread.interrupted();
         }
+        wireMock.verify(0, postRequestedFor(urlEqualTo(url)));
     }
 }