Skip to content

test(pubsub): fix JSpecify compatibility issues on Java 8 for Mockito tests #13808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lqiu96 merged 2 commits into from
Jul 17, 2026
Merged

test(pubsub): fix JSpecify compatibility issues on Java 8 for Mockito tests #13808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d58ab04
test(pubsub): fix JSpecify compatibility issues on Java 8 for Mockito…
lqiu96 Jul 17, 2026
dbd89d6
test(pubsub): fix mock stubbing to prevent NPEs in StreamingSubscribe…
lqiu96 Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public class MessageDispatcherTest {
public void setUp() {
systemExecutor = new FakeScheduledExecutorService();
clock = new FakeClock();
mockAckLatencyDistribution = mock(Distribution.class);
mockAckLatencyDistribution = mock(Distribution.class, withSettings().withoutAnnotations());

mockAckProcessor = mock(MessageDispatcher.AckProcessor.class);
messageContainsDeliveryAttempt = true;
Expand Down Expand Up @@ -710,8 +710,9 @@ private MessageDispatcher getMessageDispatcherFromBuilder(
.setMinDurationPerAckExtensionDefaultUsed(true)
.setMaxDurationPerAckExtension(Subscriber.DEFAULT_MAX_ACK_DEADLINE_EXTENSION)
.setMaxDurationPerAckExtensionDefaultUsed(true)
.setAckLatencyDistribution(mock(Distribution.class))
.setFlowController(mock(FlowController.class))
.setAckLatencyDistribution(
mock(Distribution.class, withSettings().withoutAnnotations()))
.setFlowController(mock(FlowController.class, withSettings().withoutAnnotations()))
.setExecutor(executor)
.setSubscriptionName(MOCK_SUBSCRIPTION_NAME)
.setSystemExecutor(systemExecutor)
Expand All @@ -734,8 +735,9 @@ private MessageDispatcher getMessageDispatcherFromBuilder(
.setMinDurationPerAckExtensionDefaultUsed(true)
.setMaxDurationPerAckExtension(Subscriber.DEFAULT_MAX_ACK_DEADLINE_EXTENSION)
.setMaxDurationPerAckExtensionDefaultUsed(true)
.setAckLatencyDistribution(mock(Distribution.class))
.setFlowController(mock(FlowController.class))
.setAckLatencyDistribution(
mock(Distribution.class, withSettings().withoutAnnotations()))
.setFlowController(mock(FlowController.class, withSettings().withoutAnnotations()))
.setExecutor(MoreExecutors.newDirectExecutorService())
.setSubscriptionName(MOCK_SUBSCRIPTION_NAME)
.setSystemExecutor(systemExecutor)
Expand Down
63 changes: 32 additions & 31 deletions ...ud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
import com.google.api.gax.rpc.ResponseObserver;
import com.google.api.gax.rpc.StatusCode;
import com.google.api.gax.rpc.StreamController;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.cloud.pubsub.v1.stub.SubscriberStub;
import com.google.common.collect.Lists;
import com.google.protobuf.Any;
import com.google.protobuf.Empty;
import com.google.pubsub.v1.AcknowledgeRequest;
import com.google.pubsub.v1.ModifyAckDeadlineRequest;
import com.google.pubsub.v1.StreamingPullRequest;
Expand Down Expand Up @@ -66,6 +68,9 @@ public class StreamingSubscriberConnectionTest {
private FakeScheduledExecutorService executor;
private FakeClock clock;
private SubscriberStub mockSubscriberStub;
private BidiStreamingCallable<StreamingPullRequest, StreamingPullResponse> mockStreamingCallable;
private UnaryCallable<AcknowledgeRequest, Empty> mockAcknowledgeCallable;
private UnaryCallable<ModifyAckDeadlineRequest, Empty> mockModifyAckDeadlineCallable;

private static final String MOCK_SUBSCRIPTION_NAME =
"projects/MOCK-PROJECT/subscriptions/MOCK-SUBSCRIPTION";
Expand Down Expand Up @@ -99,14 +104,28 @@ public class StreamingSubscriberConnectionTest {
private static final Duration MAX_ACK_EXTENSION_PERIOD = Duration.ofMinutes(60);

@Before
public void setUp() {
public void setUp() throws Exception {
systemExecutor = new FakeScheduledExecutorService();
executor = new FakeScheduledExecutorService();
clock = systemExecutor.getClock();
mockSubscriberStub =
mock(
SubscriberStub.class,
withSettings().withoutAnnotations().defaultAnswer(RETURNS_DEEP_STUBS));

mockStreamingCallable = mock(BidiStreamingCallable.class, withSettings().withoutAnnotations());
mockAcknowledgeCallable = mock(UnaryCallable.class, withSettings().withoutAnnotations());
mockModifyAckDeadlineCallable = mock(UnaryCallable.class, withSettings().withoutAnnotations());

mockSubscriberStub = mock(SubscriberStub.class, withSettings().withoutAnnotations());
when(mockSubscriberStub.streamingPullCallable()).thenReturn(mockStreamingCallable);
when(mockSubscriberStub.acknowledgeCallable()).thenReturn(mockAcknowledgeCallable);
when(mockSubscriberStub.modifyAckDeadlineCallable()).thenReturn(mockModifyAckDeadlineCallable);

ClientStream<StreamingPullRequest> defaultMockClientStream =
mock(ClientStream.class, withSettings().withoutAnnotations());
when(mockStreamingCallable.splitCall(any(), any())).thenReturn(defaultMockClientStream);

when(mockAcknowledgeCallable.futureCall(any()))
.thenAnswer(invocation -> SettableApiFuture.create());
when(mockModifyAckDeadlineCallable.futureCall(any()))
.thenAnswer(invocation -> SettableApiFuture.create());
}

@After
Expand Down Expand Up @@ -391,12 +410,9 @@ public void testSendAckOperationsExactlyOnceEnabledMessageFuturesModacks() {
systemExecutor.advanceTime(Duration.ofSeconds(200));

// Assert expected behavior
verify(mockSubscriberStub.modifyAckDeadlineCallable(), times(1))
.futureCall(modifyAckDeadlineRequestNack);
verify(mockSubscriberStub.modifyAckDeadlineCallable(), times(1))
.futureCall(modifyAckDeadlineRequestInitial);
verify(mockSubscriberStub.modifyAckDeadlineCallable(), times(1))
.futureCall(modifyAckDeadlineRequestRetry);
verify(mockModifyAckDeadlineCallable, times(1)).futureCall(modifyAckDeadlineRequestNack);
verify(mockModifyAckDeadlineCallable, times(1)).futureCall(modifyAckDeadlineRequestInitial);
verify(mockModifyAckDeadlineCallable, times(1)).futureCall(modifyAckDeadlineRequestRetry);
verify(mockSubscriberStub, never()).acknowledgeCallable();

try {
Expand Down Expand Up @@ -511,9 +527,8 @@ public void testSendAckOperationsExactlyOnceEnabledMessageFuturesAcks() {
systemExecutor.advanceTime(Duration.ofMillis(200));

// Assert expected behavior;
verify(mockSubscriberStub.acknowledgeCallable(), times(1))
.futureCall(acknowledgeRequestInitial);
verify(mockSubscriberStub.acknowledgeCallable(), times(1))
verify(mockAcknowledgeCallable, times(1)).futureCall(acknowledgeRequestInitial);
verify(mockAcknowledgeCallable, times(1))
.futureCall(
argThat(new CustomArgumentMatchers.AcknowledgeRequestMatcher(acknowledgeRequestRetry)));
verify(mockSubscriberStub, never()).modifyAckDeadlineCallable();
Expand Down Expand Up @@ -577,7 +592,7 @@ public void testSendAckOperationsExactlyOnceEnabledErrorWithEmptyMetadataMap() {
systemExecutor.advanceTime(Duration.ofMillis(200));

// Assert expected behavior;
verify(mockSubscriberStub.acknowledgeCallable(), times(2)).futureCall(acknowledgeRequest);
verify(mockAcknowledgeCallable, times(2)).futureCall(acknowledgeRequest);
verify(mockSubscriberStub, never()).modifyAckDeadlineCallable();

try {
Expand Down Expand Up @@ -677,27 +692,22 @@ public void testMaxPerRequestChanges() {
.setSubscription(MOCK_SUBSCRIPTION_NAME)
.addAllAckIds(mockAckIdsInRequest)
.build();
verify(mockSubscriberStub.acknowledgeCallable(), times(1))
.futureCall(expectedAcknowledgeRequest);
verify(mockAcknowledgeCallable, times(1)).futureCall(expectedAcknowledgeRequest);

ModifyAckDeadlineRequest expectedModifyAckDeadlineRequest =
ModifyAckDeadlineRequest.newBuilder()
.setSubscription(MOCK_SUBSCRIPTION_NAME)
.addAllAckIds(mockAckIdsInRequest)
.setAckDeadlineSeconds(MOCK_ACK_EXTENSION_DEFAULT_SECONDS)
.build();
verify(mockSubscriberStub.modifyAckDeadlineCallable(), times(1))
.futureCall(expectedModifyAckDeadlineRequest);
verify(mockModifyAckDeadlineCallable, times(1)).futureCall(expectedModifyAckDeadlineRequest);
}
}

@Test
public void testClientPinger_pingSent() {
BidiStreamingCallable<StreamingPullRequest, StreamingPullResponse> mockStreamingCallable =
mock(BidiStreamingCallable.class, withSettings().withoutAnnotations());
ClientStream<StreamingPullRequest> mockClientStream =
mock(ClientStream.class, withSettings().withoutAnnotations());
when(mockSubscriberStub.streamingPullCallable()).thenReturn(mockStreamingCallable);
when(mockStreamingCallable.splitCall(any(ResponseObserver.class), any()))
.thenReturn(mockClientStream);

Expand Down Expand Up @@ -737,11 +747,8 @@ public void testClientPinger_pingSent() {

@Test
public void testClientPinger_pingsNotSentWhenDisabled() {
BidiStreamingCallable<StreamingPullRequest, StreamingPullResponse> mockStreamingCallable =
mock(BidiStreamingCallable.class, withSettings().withoutAnnotations());
ClientStream<StreamingPullRequest> mockClientStream =
mock(ClientStream.class, withSettings().withoutAnnotations());
when(mockSubscriberStub.streamingPullCallable()).thenReturn(mockStreamingCallable);
when(mockStreamingCallable.splitCall(any(ResponseObserver.class), any()))
.thenReturn(mockClientStream);

Expand All @@ -763,13 +770,10 @@ public void testClientPinger_pingsNotSentWhenDisabled() {

@Test
public void testServerMonitor_timesOut() {
BidiStreamingCallable<StreamingPullRequest, StreamingPullResponse> mockStreamingCallable =
mock(BidiStreamingCallable.class, withSettings().withoutAnnotations());
ClientStream<StreamingPullRequest> mockClientStream =
mock(ClientStream.class, withSettings().withoutAnnotations());
ArgumentCaptor<ResponseObserver<StreamingPullResponse>> observerCaptor =
ArgumentCaptor.forClass(ResponseObserver.class);
when(mockSubscriberStub.streamingPullCallable()).thenReturn(mockStreamingCallable);
when(mockStreamingCallable.splitCall(observerCaptor.capture(), any()))
.thenReturn(mockClientStream);

Expand Down Expand Up @@ -813,13 +817,10 @@ public void testServerMonitor_timesOut() {

@Test
public void testServerMonitor_doesNotTimeOutIfResponseReceived() {
BidiStreamingCallable<StreamingPullRequest, StreamingPullResponse> mockStreamingCallable =
mock(BidiStreamingCallable.class, withSettings().withoutAnnotations());
ClientStream<StreamingPullRequest> mockClientStream =
mock(ClientStream.class, withSettings().withoutAnnotations());
ArgumentCaptor<ResponseObserver<StreamingPullResponse>> observerCaptor =
ArgumentCaptor.forClass(ResponseObserver.class);
when(mockSubscriberStub.streamingPullCallable()).thenReturn(mockStreamingCallable);
when(mockStreamingCallable.splitCall(observerCaptor.capture(), any()))
.thenReturn(mockClientStream);

Expand Down
Loading