From 4c1bab9ed5ab2f01bd68081c337404726eec39e7 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 28 Sep 2020 13:19:56 -0700 Subject: [PATCH] Prepare for JUnit 4.13 It deprecates ExpectedException and Assert.assertThat(T, org.hamcrest.Matcher). Without Java 8 we don't want to migrate away from ExpectedException at this time. We tend to prefer Truth over Hamcrest, so I swapped the one instance of Assert.assertThat() to use Truth. With this change we get a warning-less build with JUnit 4.13. We don't yet upgrade because we still need to support JUnit 4.12 for some use-cases, but will be able to upgrade to 4.13 soon when they upgrade. --- api/src/test/java/io/grpc/ContextsTest.java | 5 ++--- api/src/test/java/io/grpc/MetadataTest.java | 1 + api/src/test/java/io/grpc/MethodDescriptorTest.java | 1 + api/src/test/java/io/grpc/ServerInterceptorsTest.java | 1 + api/src/test/java/io/grpc/ServerServiceDefinitionTest.java | 1 + api/src/test/java/io/grpc/ServiceDescriptorTest.java | 1 + .../test/java/io/grpc/internal/AbstractClientStreamTest.java | 1 + .../test/java/io/grpc/internal/AbstractServerStreamTest.java | 1 + .../test/java/io/grpc/internal/AbstractTransportTest.java | 1 + .../java/io/grpc/internal/ConnectivityStateManagerTest.java | 1 + core/src/test/java/io/grpc/internal/DnsNameResolverTest.java | 1 + core/src/test/java/io/grpc/internal/GrpcUtilTest.java | 1 + .../test/java/io/grpc/internal/InternalSubchannelTest.java | 1 + core/src/test/java/io/grpc/internal/JsonParserTest.java | 3 ++- .../java/io/grpc/internal/ManagedChannelImplBuilderTest.java | 1 + .../io/grpc/internal/ManagedChannelServiceConfigTest.java | 3 ++- core/src/test/java/io/grpc/internal/MessageDeframerTest.java | 1 + core/src/test/java/io/grpc/internal/ServerCallImplTest.java | 1 + core/src/test/java/io/grpc/internal/ServerImplTest.java | 1 + .../java/io/grpc/util/GracefulSwitchLoadBalancerTest.java | 1 + .../src/test/java/io/grpc/netty/NettyChannelBuilderTest.java | 1 + .../src/test/java/io/grpc/netty/NettyServerBuilderTest.java | 1 + .../src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java | 1 + .../test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java | 1 + .../java/io/grpc/okhttp/OkHttpProtocolNegotiatorTest.java | 1 + okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java | 1 + .../test/java/io/grpc/protobuf/lite/ProtoLiteUtilsTest.java | 1 + .../src/test/java/io/grpc/testing/GrpcCleanupRuleTest.java | 1 + xds/src/test/java/io/grpc/xds/BootstrapperTest.java | 1 + .../java/io/grpc/xds/PriorityLoadBalancerProviderTest.java | 1 + xds/src/test/java/io/grpc/xds/WeightedRandomPickerTest.java | 1 + xds/src/test/java/io/grpc/xds/XdsClientImplTest.java | 1 + xds/src/test/java/io/grpc/xds/XdsClientTest.java | 1 + .../io/grpc/xds/internal/rbac/engine/AuthzEngineTest.java | 1 + 34 files changed, 37 insertions(+), 5 deletions(-) diff --git a/api/src/test/java/io/grpc/ContextsTest.java b/api/src/test/java/io/grpc/ContextsTest.java index 185100685c..cfcfa7d498 100644 --- a/api/src/test/java/io/grpc/ContextsTest.java +++ b/api/src/test/java/io/grpc/ContextsTest.java @@ -16,15 +16,14 @@ package io.grpc; +import static com.google.common.truth.Truth.assertThat; import static io.grpc.Contexts.interceptCall; import static io.grpc.Contexts.statusFromCancelled; -import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -240,7 +239,7 @@ public class ContextsTest { executorService.command.run(); assertTrue(cancellableContext.isCancelled()); - assertThat(cancellableContext.cancellationCause(), instanceOf(TimeoutException.class)); + assertThat(cancellableContext.cancellationCause()).isInstanceOf(TimeoutException.class); Status status = statusFromCancelled(cancellableContext); assertNotNull(status); diff --git a/api/src/test/java/io/grpc/MetadataTest.java b/api/src/test/java/io/grpc/MetadataTest.java index 122a11f85e..51aecc638e 100644 --- a/api/src/test/java/io/grpc/MetadataTest.java +++ b/api/src/test/java/io/grpc/MetadataTest.java @@ -49,6 +49,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class MetadataTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private static final Metadata.BinaryMarshaller FISH_MARSHALLER = diff --git a/api/src/test/java/io/grpc/MethodDescriptorTest.java b/api/src/test/java/io/grpc/MethodDescriptorTest.java index ec89976a01..5e742fb47e 100644 --- a/api/src/test/java/io/grpc/MethodDescriptorTest.java +++ b/api/src/test/java/io/grpc/MethodDescriptorTest.java @@ -37,6 +37,7 @@ import org.junit.runners.JUnit4; */ @RunWith(JUnit4.class) public class MethodDescriptorTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/api/src/test/java/io/grpc/ServerInterceptorsTest.java b/api/src/test/java/io/grpc/ServerInterceptorsTest.java index 8ea2801a2d..fa4e7e747a 100644 --- a/api/src/test/java/io/grpc/ServerInterceptorsTest.java +++ b/api/src/test/java/io/grpc/ServerInterceptorsTest.java @@ -56,6 +56,7 @@ public class ServerInterceptorsTest { @Rule public final MockitoRule mocks = MockitoJUnit.rule(); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/api/src/test/java/io/grpc/ServerServiceDefinitionTest.java b/api/src/test/java/io/grpc/ServerServiceDefinitionTest.java index 3078d44a6e..6a84d640d7 100644 --- a/api/src/test/java/io/grpc/ServerServiceDefinitionTest.java +++ b/api/src/test/java/io/grpc/ServerServiceDefinitionTest.java @@ -52,6 +52,7 @@ public class ServerServiceDefinitionTest { = ServerMethodDefinition.create(method1, methodHandler1); private ServerMethodDefinition methodDef2 = ServerMethodDefinition.create(method2, methodHandler2); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/api/src/test/java/io/grpc/ServiceDescriptorTest.java b/api/src/test/java/io/grpc/ServiceDescriptorTest.java index 0ba64e3676..a05858680d 100644 --- a/api/src/test/java/io/grpc/ServiceDescriptorTest.java +++ b/api/src/test/java/io/grpc/ServiceDescriptorTest.java @@ -36,6 +36,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class ServiceDescriptorTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java b/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java index 06db8f2869..4ce8a467d9 100644 --- a/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java +++ b/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java @@ -75,6 +75,7 @@ import org.mockito.stubbing.Answer; public class AbstractClientStreamTest { @Rule public final MockitoRule mocks = MockitoJUnit.rule(); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private final StatsTraceContext statsTraceCtx = StatsTraceContext.NOOP; diff --git a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java index 1d928d2485..65fc89be23 100644 --- a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java +++ b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java @@ -57,6 +57,7 @@ public class AbstractServerStreamTest { private static final int TIMEOUT_MS = 1000; private static final int MAX_MESSAGE_SIZE = 100; + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private final WritableBufferAllocator allocator = new WritableBufferAllocator() { diff --git a/core/src/test/java/io/grpc/internal/AbstractTransportTest.java b/core/src/test/java/io/grpc/internal/AbstractTransportTest.java index aa9f269de2..5c2b9c5691 100644 --- a/core/src/test/java/io/grpc/internal/AbstractTransportTest.java +++ b/core/src/test/java/io/grpc/internal/AbstractTransportTest.java @@ -224,6 +224,7 @@ public abstract class AbstractTransportTest { } })); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java b/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java index e12f9bf16c..2a759a4f38 100644 --- a/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java +++ b/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java @@ -38,6 +38,7 @@ import org.junit.runners.JUnit4; */ @RunWith(JUnit4.class) public class ConnectivityStateManagerTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java index 09d1df6921..c7c00994cf 100644 --- a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java +++ b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java @@ -98,6 +98,7 @@ public class DnsNameResolverTest { @Rule public final TestRule globalTimeout = new DisableOnDebug(Timeout.seconds(10)); @Rule public final MockitoRule mocks = MockitoJUnit.rule(); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private final Map serviceConfig = new LinkedHashMap<>(); diff --git a/core/src/test/java/io/grpc/internal/GrpcUtilTest.java b/core/src/test/java/io/grpc/internal/GrpcUtilTest.java index 30573f396d..7a3808de6e 100644 --- a/core/src/test/java/io/grpc/internal/GrpcUtilTest.java +++ b/core/src/test/java/io/grpc/internal/GrpcUtilTest.java @@ -44,6 +44,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class GrpcUtilTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @Test diff --git a/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java b/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java index 3709999583..0359dbef95 100644 --- a/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java +++ b/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java @@ -77,6 +77,7 @@ import org.mockito.junit.MockitoRule; public class InternalSubchannelTest { @Rule public final MockitoRule mocks = MockitoJUnit.rule(); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/core/src/test/java/io/grpc/internal/JsonParserTest.java b/core/src/test/java/io/grpc/internal/JsonParserTest.java index d783a65059..1e74c753d4 100644 --- a/core/src/test/java/io/grpc/internal/JsonParserTest.java +++ b/core/src/test/java/io/grpc/internal/JsonParserTest.java @@ -35,6 +35,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class JsonParserTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @@ -122,4 +123,4 @@ public class JsonParserTest { assertEquals(expected, JsonParser.parse("{\"hi\": 2}")); } -} \ No newline at end of file +} diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java index dfe9d1973d..9534c16fbb 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java @@ -80,6 +80,7 @@ public class ManagedChannelImplBuilderTest { }; @Rule public final MockitoRule mocks = MockitoJUnit.rule(); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @Rule public final GrpcCleanupRule grpcCleanupRule = new GrpcCleanupRule(); diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelServiceConfigTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelServiceConfigTest.java index dde3adf84d..4507150433 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelServiceConfigTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelServiceConfigTest.java @@ -41,6 +41,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class ManagedChannelServiceConfigTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @@ -224,4 +225,4 @@ public class ManagedChannelServiceConfigTest { private static Map parseConfig(String json) throws Exception { return (Map) JsonParser.parse(json); } -} \ No newline at end of file +} diff --git a/core/src/test/java/io/grpc/internal/MessageDeframerTest.java b/core/src/test/java/io/grpc/internal/MessageDeframerTest.java index 961e51771b..c1907e5170 100644 --- a/core/src/test/java/io/grpc/internal/MessageDeframerTest.java +++ b/core/src/test/java/io/grpc/internal/MessageDeframerTest.java @@ -337,6 +337,7 @@ public class MessageDeframerTest { @RunWith(JUnit4.class) public static class SizeEnforcingInputStreamTests { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java index a4c0da2d69..5130bc05aa 100644 --- a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java +++ b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java @@ -59,6 +59,7 @@ import org.mockito.MockitoAnnotations; @RunWith(JUnit4.class) public class ServerCallImplTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @Mock private ServerStream stream; @Mock private ServerCall.Listener callListener; diff --git a/core/src/test/java/io/grpc/internal/ServerImplTest.java b/core/src/test/java/io/grpc/internal/ServerImplTest.java index cf71a8b7af..5ca3685ee8 100644 --- a/core/src/test/java/io/grpc/internal/ServerImplTest.java +++ b/core/src/test/java/io/grpc/internal/ServerImplTest.java @@ -139,6 +139,7 @@ public class ServerImplTest { }; private static final String AUTHORITY = "some_authority"; + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @BeforeClass diff --git a/core/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java b/core/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java index f55d93c205..2131cd725b 100644 --- a/core/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java +++ b/core/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java @@ -62,6 +62,7 @@ import org.mockito.InOrder; */ @RunWith(JUnit4.class) public class GracefulSwitchLoadBalancerTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/netty/src/test/java/io/grpc/netty/NettyChannelBuilderTest.java b/netty/src/test/java/io/grpc/netty/NettyChannelBuilderTest.java index 94fc74f577..a4184eb47d 100644 --- a/netty/src/test/java/io/grpc/netty/NettyChannelBuilderTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyChannelBuilderTest.java @@ -41,6 +41,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class NettyChannelBuilderTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private final SslContext noSslContext = null; diff --git a/netty/src/test/java/io/grpc/netty/NettyServerBuilderTest.java b/netty/src/test/java/io/grpc/netty/NettyServerBuilderTest.java index 660cd88399..44e13d80c3 100644 --- a/netty/src/test/java/io/grpc/netty/NettyServerBuilderTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyServerBuilderTest.java @@ -40,6 +40,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class NettyServerBuilderTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private NettyServerBuilder builder = NettyServerBuilder.forPort(8080); diff --git a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java index 92b95eefa2..454632715a 100644 --- a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java +++ b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java @@ -122,6 +122,7 @@ public class ProtocolNegotiatorsTest { private static final int TIMEOUT_SECONDS = 60; @Rule public final TestRule globalTimeout = new DisableOnDebug(Timeout.seconds(TIMEOUT_SECONDS)); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private final EventLoopGroup group = new DefaultEventLoop(); diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java index 1316463f7a..e15bca3da0 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java @@ -47,6 +47,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class OkHttpChannelBuilderTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @Rule public final GrpcCleanupRule grpcCleanupRule = new GrpcCleanupRule(); diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpProtocolNegotiatorTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpProtocolNegotiatorTest.java index fefa598fdd..3a4a21b246 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpProtocolNegotiatorTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpProtocolNegotiatorTest.java @@ -49,6 +49,7 @@ import org.mockito.ArgumentMatchers; */ @RunWith(JUnit4.class) public class OkHttpProtocolNegotiatorTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private final SSLSocket sock = mock(SSLSocket.class); diff --git a/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java b/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java index cdaf98c573..895ba7ff7c 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java @@ -37,6 +37,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class UtilsTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/protobuf-lite/src/test/java/io/grpc/protobuf/lite/ProtoLiteUtilsTest.java b/protobuf-lite/src/test/java/io/grpc/protobuf/lite/ProtoLiteUtilsTest.java index d05e884105..6ea836f96a 100644 --- a/protobuf-lite/src/test/java/io/grpc/protobuf/lite/ProtoLiteUtilsTest.java +++ b/protobuf-lite/src/test/java/io/grpc/protobuf/lite/ProtoLiteUtilsTest.java @@ -51,6 +51,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class ProtoLiteUtilsTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); private Marshaller marshaller = ProtoLiteUtils.marshaller(Type.getDefaultInstance()); diff --git a/testing/src/test/java/io/grpc/testing/GrpcCleanupRuleTest.java b/testing/src/test/java/io/grpc/testing/GrpcCleanupRuleTest.java index 1ec096522d..3be53ae8b8 100644 --- a/testing/src/test/java/io/grpc/testing/GrpcCleanupRuleTest.java +++ b/testing/src/test/java/io/grpc/testing/GrpcCleanupRuleTest.java @@ -51,6 +51,7 @@ import org.mockito.InOrder; public class GrpcCleanupRuleTest { public static final FakeClock fakeClock = new FakeClock(); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/xds/src/test/java/io/grpc/xds/BootstrapperTest.java b/xds/src/test/java/io/grpc/xds/BootstrapperTest.java index c49e3fe964..f664a8d01c 100644 --- a/xds/src/test/java/io/grpc/xds/BootstrapperTest.java +++ b/xds/src/test/java/io/grpc/xds/BootstrapperTest.java @@ -40,6 +40,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class BootstrapperTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public ExpectedException thrown = ExpectedException.none(); @Test diff --git a/xds/src/test/java/io/grpc/xds/PriorityLoadBalancerProviderTest.java b/xds/src/test/java/io/grpc/xds/PriorityLoadBalancerProviderTest.java index f0d6958a5b..a7abcf822e 100644 --- a/xds/src/test/java/io/grpc/xds/PriorityLoadBalancerProviderTest.java +++ b/xds/src/test/java/io/grpc/xds/PriorityLoadBalancerProviderTest.java @@ -34,6 +34,7 @@ import org.junit.runners.JUnit4; /** Tests for {@link PriorityLoadBalancerProvider}. */ @RunWith(JUnit4.class) public class PriorityLoadBalancerProviderTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); @SuppressWarnings("ExpectedExceptionChecker") diff --git a/xds/src/test/java/io/grpc/xds/WeightedRandomPickerTest.java b/xds/src/test/java/io/grpc/xds/WeightedRandomPickerTest.java index e88f9cbfba..8418e80bf2 100644 --- a/xds/src/test/java/io/grpc/xds/WeightedRandomPickerTest.java +++ b/xds/src/test/java/io/grpc/xds/WeightedRandomPickerTest.java @@ -42,6 +42,7 @@ import org.mockito.junit.MockitoRule; */ @RunWith(JUnit4.class) public class WeightedRandomPickerTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java index c0f48873ed..ae9e94a1e5 100644 --- a/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java +++ b/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java @@ -176,6 +176,7 @@ public class XdsClientImplTest { @Rule public final GrpcCleanupRule cleanupRule = new GrpcCleanupRule(); + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/xds/src/test/java/io/grpc/xds/XdsClientTest.java b/xds/src/test/java/io/grpc/xds/XdsClientTest.java index 56fca6dc09..a7bfc166db 100644 --- a/xds/src/test/java/io/grpc/xds/XdsClientTest.java +++ b/xds/src/test/java/io/grpc/xds/XdsClientTest.java @@ -34,6 +34,7 @@ import org.junit.runners.JUnit4; */ @RunWith(JUnit4.class) public class XdsClientTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/xds/src/test/java/io/grpc/xds/internal/rbac/engine/AuthzEngineTest.java b/xds/src/test/java/io/grpc/xds/internal/rbac/engine/AuthzEngineTest.java index 9716260af2..9d890430ba 100644 --- a/xds/src/test/java/io/grpc/xds/internal/rbac/engine/AuthzEngineTest.java +++ b/xds/src/test/java/io/grpc/xds/internal/rbac/engine/AuthzEngineTest.java @@ -44,6 +44,7 @@ import org.mockito.junit.MockitoRule; /** Unit tests for constructor of CEL-based Authorization Engine. */ @RunWith(JUnit4.class) public class AuthzEngineTest { + @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467 @Rule public final ExpectedException thrown = ExpectedException.none();