test: Static-import Mockito.mock and assert chain invocation

Reduces visual noise at mock call sites and addresses three Sonar
'add at least one assertion' findings in the new coercion happy-path
tests by verifying the downstream chain was invoked.

Author: thced

src/test/java/com/retailsvc/http/HandlersDefaultExceptionTest.java

@@ -1,6 +1,7 @@
 package com.retailsvc.http;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 import com.retailsvc.http.spec.HttpMethod;
 import com.retailsvc.http.validate.ValidationError;
@@ -13,7 +14,7 @@
 
 class HandlersDefaultExceptionTest {
   private HttpExchange newExchange(ByteArrayOutputStream sink) {
-    HttpExchange ex = Mockito.mock(HttpExchange.class);
+    HttpExchange ex = mock(HttpExchange.class);
     Mockito.when(ex.getResponseHeaders()).thenReturn(new Headers());
     Mockito.when(ex.getResponseBody()).thenReturn(sink);
     return ex;

src/test/java/com/retailsvc/http/internal/DispatchHandlerTest.java

@@ -1,6 +1,7 @@
 package com.retailsvc.http.internal;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
 
 import com.retailsvc.http.MissingOperationHandlerException;
 import com.retailsvc.http.Request;
@@ -20,8 +21,8 @@ private static void withOperationId(
 
   @Test
   void invokesRegisteredHandler() throws Exception {
-    HttpHandler handler = Mockito.mock(HttpHandler.class);
-    HttpExchange ex = Mockito.mock(HttpExchange.class);
+    HttpHandler handler = mock(HttpHandler.class);
+    HttpExchange ex = mock(HttpExchange.class);
 
     withOperationId(
         "get-x",
@@ -37,7 +38,7 @@ void invokesRegisteredHandler() throws Exception {
   @Test
   void throwsWhenHandlerMissing() {
     DispatchHandler d = new DispatchHandler(Map.of());
-    HttpExchange ex = Mockito.mock(HttpExchange.class);
+    HttpExchange ex = mock(HttpExchange.class);
 
     assertThatThrownBy(
             () ->

src/test/java/com/retailsvc/http/internal/ExceptionFilterTest.java

@@ -1,5 +1,7 @@
 package com.retailsvc.http.internal;
 
+import static org.mockito.Mockito.mock;
+
 import com.retailsvc.http.ExceptionHandler;
 import com.retailsvc.http.NotFoundException;
 import com.sun.net.httpserver.Filter;
@@ -10,21 +12,21 @@
 class ExceptionFilterTest {
   @Test
   void delegatesToExceptionHandler() throws Exception {
-    HttpExchange ex = Mockito.mock(HttpExchange.class);
-    ExceptionHandler handler = Mockito.mock(ExceptionHandler.class);
+    HttpExchange ex = mock(HttpExchange.class);
+    ExceptionHandler handler = mock(ExceptionHandler.class);
     Filter f = new ExceptionFilter(handler);
-    Filter.Chain chain = Mockito.mock(Filter.Chain.class);
+    Filter.Chain chain = mock(Filter.Chain.class);
     Mockito.doThrow(new NotFoundException("x")).when(chain).doFilter(ex);
     f.doFilter(ex, chain);
     Mockito.verify(handler).handle(Mockito.eq(ex), Mockito.any(NotFoundException.class));
   }
 
   @Test
   void passThroughOnSuccess() throws Exception {
-    HttpExchange ex = Mockito.mock(HttpExchange.class);
-    ExceptionHandler handler = Mockito.mock(ExceptionHandler.class);
+    HttpExchange ex = mock(HttpExchange.class);
+    ExceptionHandler handler = mock(ExceptionHandler.class);
     Filter f = new ExceptionFilter(handler);
-    Filter.Chain chain = Mockito.mock(Filter.Chain.class);
+    Filter.Chain chain = mock(Filter.Chain.class);
     f.doFilter(ex, chain);
     Mockito.verify(chain).doFilter(ex);
     Mockito.verifyNoInteractions(handler);

src/test/java/com/retailsvc/http/internal/RequestPreparationFilterTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
 
 import com.retailsvc.http.JsonMapper;
 import com.retailsvc.http.MethodNotAllowedException;
@@ -37,7 +38,7 @@
 class RequestPreparationFilterTest {
 
   private HttpExchange exchange(String method, String path, byte[] body) {
-    HttpExchange ex = Mockito.mock(HttpExchange.class);
+    HttpExchange ex = mock(HttpExchange.class);
     Mockito.when(ex.getRequestMethod()).thenReturn(method);
     Mockito.when(ex.getRequestURI()).thenReturn(URI.create(path));
     Mockito.when(ex.getRequestHeaders()).thenReturn(new Headers());
@@ -81,7 +82,7 @@ void successPathBindsRequestContextDuringChain() throws Exception {
     AtomicReference<String> seenOpId = new AtomicReference<>();
     AtomicReference<Map<String, String>> seenPathParams = new AtomicReference<>();
 
-    Filter.Chain chain = Mockito.mock(Filter.Chain.class);
+    Filter.Chain chain = mock(Filter.Chain.class);
     Mockito.doAnswer(
             inv -> {
               seenOpId.set(Request.operationId());
@@ -112,7 +113,7 @@ void unknownPathThrowsNotFound() {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("GET", "/missing", new byte[0]);
-    assertThatThrownBy(() -> f.doFilter(ex, Mockito.mock(Filter.Chain.class)))
+    assertThatThrownBy(() -> f.doFilter(ex, mock(Filter.Chain.class)))
         .isInstanceOf(NotFoundException.class);
   }
 
@@ -130,7 +131,7 @@ void wrongMethodThrowsMethodNotAllowed() {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("POST", "/x", new byte[0]);
-    assertThatThrownBy(() -> f.doFilter(ex, Mockito.mock(Filter.Chain.class)))
+    assertThatThrownBy(() -> f.doFilter(ex, mock(Filter.Chain.class)))
         .isInstanceOf(MethodNotAllowedException.class);
   }
 
@@ -149,7 +150,7 @@ void invalidQueryParamThrowsValidation() {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("GET", "/x?q=ab", new byte[0]);
-    assertThatThrownBy(() -> f.doFilter(ex, Mockito.mock(Filter.Chain.class)))
+    assertThatThrownBy(() -> f.doFilter(ex, mock(Filter.Chain.class)))
         .isInstanceOf(ValidationException.class)
         .extracting(t -> ((ValidationException) t).error().pointer())
         .isEqualTo("/query/q");
@@ -170,7 +171,9 @@ void integerQueryParamIsCoercedFromStringBeforeValidation() throws Exception {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("GET", "/x?n=42", new byte[0]);
-    f.doFilter(ex, Mockito.mock(Filter.Chain.class));
+    Filter.Chain chain = mock(Filter.Chain.class);
+    f.doFilter(ex, chain);
+    Mockito.verify(chain).doFilter(ex);
   }
 
   @Test
@@ -188,7 +191,7 @@ void integerQueryParamRejectsNonNumericString() {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("GET", "/x?n=abc", new byte[0]);
-    assertThatThrownBy(() -> f.doFilter(ex, Mockito.mock(Filter.Chain.class)))
+    assertThatThrownBy(() -> f.doFilter(ex, mock(Filter.Chain.class)))
         .isInstanceOf(ValidationException.class)
         .extracting(t -> ((ValidationException) t).error().keyword())
         .isEqualTo("type");
@@ -209,7 +212,9 @@ void numberQueryParamIsCoercedFromStringBeforeValidation() throws Exception {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("GET", "/x?n=1.5", new byte[0]);
-    f.doFilter(ex, Mockito.mock(Filter.Chain.class));
+    Filter.Chain chain = mock(Filter.Chain.class);
+    f.doFilter(ex, chain);
+    Mockito.verify(chain).doFilter(ex);
   }
 
   @Test
@@ -227,7 +232,7 @@ void numberQueryParamRejectsNonNumericString() {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("GET", "/x?n=abc", new byte[0]);
-    assertThatThrownBy(() -> f.doFilter(ex, Mockito.mock(Filter.Chain.class)))
+    assertThatThrownBy(() -> f.doFilter(ex, mock(Filter.Chain.class)))
         .isInstanceOf(ValidationException.class)
         .extracting(t -> ((ValidationException) t).error().keyword())
         .isEqualTo("type");
@@ -247,8 +252,14 @@ void booleanQueryParamCoercesTrueAndFalse() throws Exception {
     Spec spec = specWith(op);
     Filter f = newFilter(spec);
 
-    f.doFilter(exchange("GET", "/x?b=true", new byte[0]), Mockito.mock(Filter.Chain.class));
-    f.doFilter(exchange("GET", "/x?b=false", new byte[0]), Mockito.mock(Filter.Chain.class));
+    Filter.Chain trueChain = mock(Filter.Chain.class);
+    Filter.Chain falseChain = mock(Filter.Chain.class);
+    HttpExchange trueEx = exchange("GET", "/x?b=true", new byte[0]);
+    HttpExchange falseEx = exchange("GET", "/x?b=false", new byte[0]);
+    f.doFilter(trueEx, trueChain);
+    f.doFilter(falseEx, falseChain);
+    Mockito.verify(trueChain).doFilter(trueEx);
+    Mockito.verify(falseChain).doFilter(falseEx);
   }
 
   @Test
@@ -266,7 +277,7 @@ void booleanQueryParamRejectsNonBooleanString() {
     Filter f = newFilter(spec);
 
     HttpExchange ex = exchange("GET", "/x?b=yes", new byte[0]);
-    assertThatThrownBy(() -> f.doFilter(ex, Mockito.mock(Filter.Chain.class)))
+    assertThatThrownBy(() -> f.doFilter(ex, mock(Filter.Chain.class)))
         .isInstanceOf(ValidationException.class)
         .extracting(t -> ((ValidationException) t).error().keyword())
         .isEqualTo("type");