diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-18 15:19:59 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-18 15:19:59 +0200 |
commit | 579754fa5b5f4768a75fc3aed08f70ffb29db0e3 (patch) | |
tree | 825e5366b8253535bb9366722006ef49c6e83c53 /jdisc_http_service | |
parent | 19ab63311c9354db919a9a9ac38d34342e1ca204 (diff) |
Use mockito-core 3.1.0
Diffstat (limited to 'jdisc_http_service')
7 files changed, 13 insertions, 12 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java index b91cd538f26..eeae1fa74bc 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java index 8c601fb5fd8..61499200f3c 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java index 74f271eaef2..f4418e74169 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit; import static com.yahoo.jdisc.http.HttpRequest.Method; import static com.yahoo.jdisc.http.HttpRequest.Version; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java index 113b1d87bf9..e6d7259ea41 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java @@ -14,7 +14,7 @@ import java.net.URI; import static com.yahoo.jdisc.http.HttpRequest.Method; import static com.yahoo.jdisc.http.HttpRequest.Version; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java index 7b2ca7be6ca..65eb7e1c145 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import java.util.concurrent.TimeUnit; import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java index 7b01d5ca061..0b94829f720 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java @@ -39,7 +39,8 @@ import java.util.concurrent.atomic.AtomicReference; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -284,8 +285,8 @@ public class FilterTestCase { final HttpRequest request = null; final ResponseHandler responseHandler = null; requestFilterChain.filter(request, responseHandler); - verify(requestFilter1).filter(any(HttpRequest.class), any(ResponseHandler.class)); - verify(requestFilter2).filter(any(HttpRequest.class), any(ResponseHandler.class)); + verify(requestFilter1).filter(isNull(), any(ResponseHandler.class)); + verify(requestFilter2).filter(isNull(), any(ResponseHandler.class)); } @Test @@ -299,7 +300,7 @@ public class FilterTestCase { // Check that the filter is called with the same request argument as the chain was, // in a manner that allows the request object to be wrapped. final ArgumentCaptor<HttpRequest> requestCaptor = ArgumentCaptor.forClass(HttpRequest.class); - verify(requestFilter).filter(requestCaptor.capture(), any(ResponseHandler.class)); + verify(requestFilter).filter(requestCaptor.capture(), isNull()); verify(request, never()).getUri(); requestCaptor.getValue().getUri(); verify(request, times(1)).getUri(); @@ -316,7 +317,7 @@ public class FilterTestCase { // Check that the filter is called with the same response handler argument as the chain was, // in a manner that allows the handler object to be wrapped. final ArgumentCaptor<ResponseHandler> responseHandlerCaptor = ArgumentCaptor.forClass(ResponseHandler.class); - verify(requestFilter).filter(any(HttpRequest.class), responseHandlerCaptor.capture()); + verify(requestFilter).filter(isNull(), responseHandlerCaptor.capture()); verify(responseHandler, never()).handleResponse(any(Response.class)); responseHandlerCaptor.getValue().handleResponse(mock(Response.class)); verify(responseHandler, times(1)).handleResponse(any(Response.class)); @@ -373,7 +374,7 @@ public class FilterTestCase { ResponseFilterChain.newInstance(responseFilter1, responseFilter2).filter(response, request); final ArgumentCaptor<Response> responseCaptor = ArgumentCaptor.forClass(Response.class); - verify(responseFilter2).filter(responseCaptor.capture(), any(Request.class)); + verify(responseFilter2).filter(responseCaptor.capture(), isNull()); assertThat(responseCaptor.getValue().getStatus(), is(statusCode)); assertThat(responseCaptor.getValue().headers().getFirst("foo"), is("bar")); diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java index f4c59cdcd75..6637ee24b5f 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java @@ -14,7 +14,7 @@ import org.mockito.verification.VerificationMode; import java.io.IOException; import java.util.concurrent.TimeUnit; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; |