From a31473ef209bfe67ab1256e2ca428d49840f9c58 Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Mon, 4 Feb 2019 17:01:00 +0000 Subject: [PATCH] all: fix usages of any(.class) matchers In Mockito 2, if a method expects a primitive type, but an any(.class) matcher is used in its place, it will throw an error. To prepare for this upcoming breakage, change all existing any(.class) matchers to use the correct any() matcher. --- .../internal/AbstractClientStreamTest.java | 7 ++-- .../internal/AbstractServerStreamTest.java | 5 ++- .../grpc/internal/ProxyDetectorImplTest.java | 14 ++++--- .../io/grpc/netty/NettyClientStreamTest.java | 4 +- .../io/grpc/netty/NettyServerHandlerTest.java | 42 +++++++++++++------ .../io/grpc/services/BinlogHelperTest.java | 39 +++++++++-------- 6 files changed, 68 insertions(+), 43 deletions(-) diff --git a/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java b/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java index e400757030..a7edc1eb6d 100644 --- a/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java +++ b/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java @@ -26,6 +26,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.AdditionalAnswers.delegatesTo; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.same; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -390,7 +392,7 @@ public class AbstractClientStreamTest { assertSame(Status.Code.DATA_LOSS, statusCaptor.getValue().getCode()); assertEquals("data___loss", statusCaptor.getValue().getDescription()); } - + @Test public void getRequest() { AbstractClientStream.Sink sink = mock(AbstractClientStream.Sink.class); @@ -414,8 +416,7 @@ public class AbstractClientStreamTest { assertTrue(payloadCaptor.getValue() != null); // GET requests don't have BODY. verify(sink, never()) - .writeFrame( - any(WritableBuffer.class), any(Boolean.class), any(Boolean.class), any(Integer.class)); + .writeFrame(any(WritableBuffer.class), anyBoolean(), anyBoolean(), anyInt()); assertThat(tracer.nextOutboundEvent()).isEqualTo("outboundMessage(0)"); assertThat(tracer.nextOutboundEvent()).matches("outboundMessageSent\\(0, [0-9]+, [0-9]+\\)"); assertNull(tracer.nextOutboundEvent()); diff --git a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java index 49ac5bdc73..dbc57aed51 100644 --- a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java +++ b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java @@ -20,6 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.AdditionalAnswers.delegatesTo; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.same; import static org.mockito.Mockito.mock; @@ -270,8 +272,7 @@ public class AbstractServerStreamTest { stream.writeMessage(new ByteArrayInputStream(new byte[]{})); - verify(sink, never()) - .writeFrame(any(WritableBuffer.class), any(Boolean.class), any(Integer.class)); + verify(sink, never()).writeFrame(any(WritableBuffer.class), anyBoolean(), anyInt()); } @Test diff --git a/core/src/test/java/io/grpc/internal/ProxyDetectorImplTest.java b/core/src/test/java/io/grpc/internal/ProxyDetectorImplTest.java index 6091e05f34..adb0d1ccb6 100644 --- a/core/src/test/java/io/grpc/internal/ProxyDetectorImplTest.java +++ b/core/src/test/java/io/grpc/internal/ProxyDetectorImplTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -178,12 +179,13 @@ public class ProxyDetectorImplTest { proxyUser, proxyPassword.toCharArray()); when(authenticator.requestPasswordAuthentication( - any(String.class), - any(InetAddress.class), - any(Integer.class), - any(String.class), - any(String.class), - any(String.class))).thenReturn(auth); + any(String.class), + any(InetAddress.class), + anyInt(), + any(String.class), + any(String.class), + any(String.class))) + .thenReturn(auth); when(proxySelector.select(any(URI.class))).thenReturn(ImmutableList.of(proxy)); ProxyParameters detected = proxyDetector.proxyFor(destination); diff --git a/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java b/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java index da5755f0fe..6ec73cbe57 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java @@ -30,6 +30,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Matchers.same; @@ -437,8 +438,7 @@ public class NettyClientStreamTest extends NettyStreamTestBase callOptTimeoutCaptor = ArgumentCaptor.forClass(Duration.class); - verify(mockSinkWriter).logClientHeader( - any(Integer.class), - any(String.class), - any(String.class), - callOptTimeoutCaptor.capture(), - any(Metadata.class), - any(GrpcLogEntry.Logger.class), - any(Long.class), - any(SocketAddress.class)); + verify(mockSinkWriter) + .logClientHeader( + anyLong(), + any(String.class), + any(String.class), + callOptTimeoutCaptor.capture(), + any(Metadata.class), + any(GrpcLogEntry.Logger.class), + anyLong(), + any(SocketAddress.class)); Duration timeout = callOptTimeoutCaptor.getValue(); assertThat(TimeUnit.SECONDS.toNanos(1) - Durations.toNanos(timeout)) .isAtMost(TimeUnit.MILLISECONDS.toNanos(250)); @@ -1060,15 +1062,16 @@ public final class BinlogHelperTest { ClientCall.Listener mockListener = mock(ClientCall.Listener.class); callFuture.get().start(mockListener, new Metadata()); ArgumentCaptor callOptTimeoutCaptor = ArgumentCaptor.forClass(Duration.class); - verify(mockSinkWriter).logClientHeader( - any(Integer.class), - any(String.class), - any(String.class), - callOptTimeoutCaptor.capture(), - any(Metadata.class), - any(GrpcLogEntry.Logger.class), - any(Long.class), - any(SocketAddress.class)); + verify(mockSinkWriter) + .logClientHeader( + anyLong(), + any(String.class), + any(String.class), + callOptTimeoutCaptor.capture(), + any(Metadata.class), + any(GrpcLogEntry.Logger.class), + anyLong(), + any(SocketAddress.class)); Duration timeout = callOptTimeoutCaptor.getValue(); assertThat(TimeUnit.SECONDS.toNanos(1) - Durations.toNanos(timeout)) .isAtMost(TimeUnit.MILLISECONDS.toNanos(250));