From 9957f18b137af7d62eebd9b975b3ac34b691c942 Mon Sep 17 00:00:00 2001 From: Matt Castelaz Date: Fri, 2 Oct 2026 04:15:50 +0000 Subject: [PATCH 1/2] test(gax-grpc): run the full unit test suite in CI The Surefire value in gax-grpc ended with an entry without a "!", which Surefire treats as an inclusion pattern, so only InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfigWrongCredential ran. Drop the stray inclusion and keep both existing exclusions. Also make testLogDirectPathMisconfigWrongCredential independent of the machine's GOOGLE_CLOUD_DISABLE_DIRECT_PATH by setting an empty env provider. Fixes #14572 --- sdk-platform-java/gax-java/gax-grpc/pom.xml | 2 +- .../api/gax/grpc/InstantiatingGrpcChannelProviderTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk-platform-java/gax-java/gax-grpc/pom.xml b/sdk-platform-java/gax-java/gax-grpc/pom.xml index b0a48224027a..22f3be3d0aa2 100644 --- a/sdk-platform-java/gax-java/gax-grpc/pom.xml +++ b/sdk-platform-java/gax-java/gax-grpc/pom.xml @@ -158,7 +158,7 @@ maven-surefire-plugin - !InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaEnv_warns,!InstantiatingGrpcChannelProviderTest#canUseDirectPath_directPathEnvVarNotSet_attemptDirectPathIsTrue,InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfigWrongCredential + !InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaEnv_warns,!InstantiatingGrpcChannelProviderTest#canUseDirectPath_directPathEnvVarNotSet_attemptDirectPathIsTrue diff --git a/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java b/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java index c7052532955b..0b460d6d8e4f 100644 --- a/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java +++ b/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java @@ -710,6 +710,7 @@ void testLogDirectPathMisconfigWrongCredential() throws Exception { InstantiatingGrpcChannelProvider.newBuilder() .setAttemptDirectPathXds() .setAttemptDirectPath(true) + .setEnvProvider(name -> null) .setHeaderProvider( mock(HeaderProvider.class, Mockito.withSettings().withoutAnnotations())) .setExecutor(mock(Executor.class)) From 8ced5a99323e5db33fc048c0de67e89c98a4d371 Mon Sep 17 00:00:00 2001 From: Matt Castelaz Date: Fri, 2 Oct 2026 14:11:12 +0000 Subject: [PATCH 2/2] test(gax-grpc): don't spy GrpcLoggingInterceptor (fails on JDK 8) Mockito can't subclass @NullMarked classes on JDK 8 because JSpecify's @Target includes ElementType.MODULE. The spy was never verified, so use a plain instance. This test was previously skipped by the surefire config. --- .../com/google/api/gax/grpc/GrpcLoggingInterceptorTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcLoggingInterceptorTest.java b/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcLoggingInterceptorTest.java index fad4cd468b95..c93db599d575 100644 --- a/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcLoggingInterceptorTest.java +++ b/sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcLoggingInterceptorTest.java @@ -32,7 +32,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -83,7 +82,7 @@ void testInterceptor_basic() { void testInterceptor_responseListener() { when(channel.newCall(Mockito.>any(), any(CallOptions.class))) .thenReturn(call); - GrpcLoggingInterceptor interceptor = spy(new GrpcLoggingInterceptor()); + GrpcLoggingInterceptor interceptor = new GrpcLoggingInterceptor(); Channel intercepted = ClientInterceptors.intercept(channel, interceptor); @SuppressWarnings("unchecked") ClientCall.Listener listener = mock(ClientCall.Listener.class);