Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit 07c9cd1

Browse files
author
Arpan Mishra
committed
chore: fix broken unit tests.
1 parent d7f70fa commit 07c9cd1

5 files changed

Lines changed: 79 additions & 6 deletions

File tree

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,17 @@
3030
import com.google.cloud.Timestamp;
3131
import com.google.cloud.grpc.GrpcTransportOptions;
3232
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
33+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStub;
34+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStubSettings;
35+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStub;
36+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
3337
import com.google.cloud.spanner.spi.v1.SpannerRpc;
3438
import com.google.protobuf.ByteString;
3539
import com.google.protobuf.util.Timestamps;
3640
import com.google.spanner.v1.Session;
3741
import com.google.spanner.v1.Transaction;
3842
import io.opentelemetry.api.OpenTelemetry;
43+
import java.io.IOException;
3944
import java.util.Collections;
4045
import java.util.Map;
4146
import org.junit.Before;
@@ -59,6 +64,10 @@ public final class BatchClientImplTest {
5964

6065
@Mock private SpannerRpc gapicRpc;
6166
@Mock private SpannerOptions spannerOptions;
67+
@Mock private InstanceAdminStubSettings instanceAdminStubSettings;
68+
@Mock private DatabaseAdminStubSettings databaseAdminStubSettings;
69+
@Mock private DatabaseAdminStub databaseAdminStub;
70+
@Mock private InstanceAdminStub instanceAdminStub;
6271
@Captor private ArgumentCaptor<Map<SpannerRpc.Option, Object>> optionsCaptor;
6372
@Mock private BatchTransactionId txnID;
6473

@@ -72,7 +81,7 @@ public static void setupOpenTelemetry() {
7281

7382
@SuppressWarnings("unchecked")
7483
@Before
75-
public void setUp() {
84+
public void setUp() throws IOException {
7685
initMocks(this);
7786
DatabaseId db = DatabaseId.of(DB_NAME);
7887
when(spannerOptions.getNumChannels()).thenReturn(4);
@@ -86,6 +95,10 @@ public void setUp() {
8695
GrpcTransportOptions transportOptions = mock(GrpcTransportOptions.class);
8796
when(transportOptions.getExecutorFactory()).thenReturn(mock(ExecutorFactory.class));
8897
when(spannerOptions.getTransportOptions()).thenReturn(transportOptions);
98+
when(instanceAdminStubSettings.createStub()).thenReturn(instanceAdminStub);
99+
when(databaseAdminStubSettings.createStub()).thenReturn(databaseAdminStub);
100+
when(gapicRpc.getInstanceAdminStubSettings()).thenReturn(instanceAdminStubSettings);
101+
when(gapicRpc.getDatabaseAdminStubSettings()).thenReturn(databaseAdminStubSettings);
89102
@SuppressWarnings("resource")
90103
SpannerImpl spanner = new SpannerImpl(gapicRpc, spannerOptions);
91104
client = new BatchClientImpl(spanner.getSessionClient(db));

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
import com.google.cloud.Timestamp;
3535
import com.google.cloud.grpc.GrpcTransportOptions;
3636
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
37+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStub;
38+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStubSettings;
39+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStub;
40+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
3741
import com.google.cloud.spanner.spi.v1.SpannerRpc;
3842
import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
3943
import com.google.protobuf.ByteString;
@@ -52,6 +56,7 @@
5256
import io.opentelemetry.api.OpenTelemetry;
5357
import io.opentelemetry.api.trace.Span;
5458
import io.opentelemetry.context.Scope;
59+
import java.io.IOException;
5560
import java.text.ParseException;
5661
import java.util.Calendar;
5762
import java.util.Collections;
@@ -76,6 +81,10 @@
7681
public class SessionImplTest {
7782
@Mock private SpannerRpc rpc;
7883
@Mock private SpannerOptions spannerOptions;
84+
@Mock private InstanceAdminStubSettings instanceAdminStubSettings;
85+
@Mock private DatabaseAdminStubSettings databaseAdminStubSettings;
86+
@Mock private DatabaseAdminStub databaseAdminStub;
87+
@Mock private InstanceAdminStub instanceAdminStub;
7988
private com.google.cloud.spanner.Session session;
8089
@Captor private ArgumentCaptor<Map<SpannerRpc.Option, Object>> optionsCaptor;
8190
private Map<SpannerRpc.Option, Object> options;
@@ -88,7 +97,7 @@ public static void setupOpenTelemetry() {
8897

8998
@SuppressWarnings("unchecked")
9099
@Before
91-
public void setUp() {
100+
public void setUp() throws IOException {
92101
MockitoAnnotations.initMocks(this);
93102
when(spannerOptions.getNumChannels()).thenReturn(4);
94103
when(spannerOptions.getPrefetchChunks()).thenReturn(1);
@@ -101,6 +110,10 @@ public void setUp() {
101110
when(spannerOptions.getTransportOptions()).thenReturn(transportOptions);
102111
when(spannerOptions.getSessionPoolOptions()).thenReturn(mock(SessionPoolOptions.class));
103112
when(spannerOptions.getOpenTelemetry()).thenReturn(OpenTelemetry.noop());
113+
when(instanceAdminStubSettings.createStub()).thenReturn(instanceAdminStub);
114+
when(databaseAdminStubSettings.createStub()).thenReturn(databaseAdminStub);
115+
when(rpc.getInstanceAdminStubSettings()).thenReturn(instanceAdminStubSettings);
116+
when(rpc.getDatabaseAdminStubSettings()).thenReturn(databaseAdminStubSettings);
104117
@SuppressWarnings("resource")
105118
SpannerImpl spanner = new SpannerImpl(rpc, spannerOptions);
106119
String dbName = "projects/p1/instances/i1/databases/d1";

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@
2929
import com.google.cloud.grpc.GrpcTransportOptions;
3030
import com.google.cloud.spanner.SpannerException.DoNotConstructDirectly;
3131
import com.google.cloud.spanner.SpannerImpl.ClosedException;
32+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStub;
33+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStubSettings;
34+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStub;
35+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
3236
import com.google.cloud.spanner.spi.v1.SpannerRpc;
3337
import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions;
3438
import io.opentelemetry.api.OpenTelemetry;
39+
import java.io.IOException;
3540
import java.io.PrintWriter;
3641
import java.io.StringWriter;
3742
import java.util.Collections;
@@ -55,6 +60,10 @@
5560
public class SpannerImplTest {
5661
@Mock private SpannerRpc rpc;
5762
@Mock private SpannerOptions spannerOptions;
63+
@Mock private InstanceAdminStubSettings instanceAdminStubSettings;
64+
@Mock private DatabaseAdminStubSettings databaseAdminStubSettings;
65+
@Mock private DatabaseAdminStub databaseAdminStub;
66+
@Mock private InstanceAdminStub instanceAdminStub;
5867
private SpannerImpl impl;
5968

6069
@Captor ArgumentCaptor<Map<SpannerRpc.Option, Object>> options;
@@ -66,7 +75,7 @@ public static void setupOpenTelemetry() {
6675
}
6776

6877
@Before
69-
public void setUp() {
78+
public void setUp() throws IOException {
7079
MockitoAnnotations.initMocks(this);
7180
when(spannerOptions.getNumChannels()).thenReturn(4);
7281
when(spannerOptions.getDatabaseRole()).thenReturn("role");
@@ -75,6 +84,10 @@ public void setUp() {
7584
when(spannerOptions.getClock()).thenReturn(NanoClock.getDefaultClock());
7685
when(spannerOptions.getSessionLabels()).thenReturn(Collections.emptyMap());
7786
when(spannerOptions.getOpenTelemetry()).thenReturn(OpenTelemetry.noop());
87+
when(instanceAdminStubSettings.createStub()).thenReturn(instanceAdminStub);
88+
when(databaseAdminStubSettings.createStub()).thenReturn(databaseAdminStub);
89+
when(rpc.getInstanceAdminStubSettings()).thenReturn(instanceAdminStubSettings);
90+
when(rpc.getDatabaseAdminStubSettings()).thenReturn(databaseAdminStubSettings);
7891
impl = new SpannerImpl(rpc, spannerOptions);
7992
}
8093

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
import com.google.cloud.grpc.GrpcTransportOptions;
3535
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
3636
import com.google.cloud.spanner.TransactionManager.TransactionState;
37+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStub;
38+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStubSettings;
39+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStub;
40+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
3741
import com.google.cloud.spanner.spi.v1.SpannerRpc;
3842
import com.google.protobuf.ByteString;
3943
import com.google.protobuf.Empty;
@@ -47,6 +51,7 @@
4751
import com.google.spanner.v1.Session;
4852
import com.google.spanner.v1.Transaction;
4953
import io.opentelemetry.api.OpenTelemetry;
54+
import java.io.IOException;
5055
import java.util.Collections;
5156
import java.util.UUID;
5257
import java.util.concurrent.Executors;
@@ -77,6 +82,10 @@ public void release(ScheduledExecutorService exec) {
7782

7883
@Mock private SessionImpl session;
7984
@Mock TransactionRunnerImpl.TransactionContextImpl txn;
85+
@Mock private InstanceAdminStubSettings instanceAdminStubSettings;
86+
@Mock private DatabaseAdminStubSettings databaseAdminStubSettings;
87+
@Mock private DatabaseAdminStub databaseAdminStub;
88+
@Mock private InstanceAdminStub instanceAdminStub;
8089
private TransactionManagerImpl manager;
8190

8291
@BeforeClass
@@ -201,7 +210,7 @@ public void commitAfterRollbackFails() {
201210

202211
@SuppressWarnings("unchecked")
203212
@Test
204-
public void usesPreparedTransaction() {
213+
public void usesPreparedTransaction() throws IOException {
205214
SpannerOptions options = mock(SpannerOptions.class);
206215
when(options.getNumChannels()).thenReturn(4);
207216
GrpcTransportOptions transportOptions = mock(GrpcTransportOptions.class);
@@ -248,6 +257,11 @@ public void usesPreparedTransaction() {
248257
com.google.protobuf.Timestamp.newBuilder()
249258
.setSeconds(System.currentTimeMillis() * 1000))
250259
.build()));
260+
when(instanceAdminStubSettings.createStub()).thenReturn(instanceAdminStub);
261+
when(databaseAdminStubSettings.createStub()).thenReturn(databaseAdminStub);
262+
when(rpc.getInstanceAdminStubSettings()).thenReturn(instanceAdminStubSettings);
263+
when(rpc.getDatabaseAdminStubSettings()).thenReturn(databaseAdminStubSettings);
264+
251265
DatabaseId db = DatabaseId.of("test", "test", "test");
252266
try (SpannerImpl spanner = new SpannerImpl(rpc, options)) {
253267
DatabaseClient client = spanner.getDatabaseClient(db);
@@ -263,7 +277,7 @@ public void usesPreparedTransaction() {
263277

264278
@SuppressWarnings({"unchecked", "resource"})
265279
@Test
266-
public void inlineBegin() {
280+
public void inlineBegin() throws IOException {
267281
SpannerOptions options = mock(SpannerOptions.class);
268282
when(options.getNumChannels()).thenReturn(4);
269283
GrpcTransportOptions transportOptions = mock(GrpcTransportOptions.class);
@@ -332,6 +346,11 @@ public void inlineBegin() {
332346
com.google.protobuf.Timestamp.newBuilder()
333347
.setSeconds(System.currentTimeMillis() * 1000))
334348
.build()));
349+
when(instanceAdminStubSettings.createStub()).thenReturn(instanceAdminStub);
350+
when(databaseAdminStubSettings.createStub()).thenReturn(databaseAdminStub);
351+
when(rpc.getInstanceAdminStubSettings()).thenReturn(instanceAdminStubSettings);
352+
when(rpc.getDatabaseAdminStubSettings()).thenReturn(databaseAdminStubSettings);
353+
335354
DatabaseId db = DatabaseId.of("test", "test", "test");
336355
try (SpannerImpl spanner = new SpannerImpl(rpc, options)) {
337356
DatabaseClient client = spanner.getDatabaseClient(db);

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
3535
import com.google.cloud.spanner.SessionClient.SessionId;
3636
import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
37+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStub;
38+
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStubSettings;
39+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStub;
40+
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
3741
import com.google.cloud.spanner.spi.v1.SpannerRpc;
3842
import com.google.common.base.Preconditions;
3943
import com.google.protobuf.ByteString;
@@ -63,6 +67,7 @@
6367
import io.opentelemetry.api.OpenTelemetry;
6468
import io.opentelemetry.api.trace.Span;
6569
import io.opentelemetry.context.Scope;
70+
import java.io.IOException;
6671
import java.util.Arrays;
6772
import java.util.Collections;
6873
import java.util.UUID;
@@ -81,6 +86,7 @@
8186
/** Unit test for {@link com.google.cloud.spanner.TransactionRunnerImpl} */
8287
@RunWith(JUnit4.class)
8388
public class TransactionRunnerImplTest {
89+
8490
private static final class TestExecutorFactory
8591
implements ExecutorFactory<ScheduledExecutorService> {
8692
@Override
@@ -97,6 +103,10 @@ public void release(ScheduledExecutorService exec) {
97103
@Mock private SpannerRpc rpc;
98104
@Mock private SessionImpl session;
99105
@Mock private TransactionRunnerImpl.TransactionContextImpl txn;
106+
@Mock private InstanceAdminStubSettings instanceAdminStubSettings;
107+
@Mock private DatabaseAdminStubSettings databaseAdminStubSettings;
108+
@Mock private DatabaseAdminStub databaseAdminStub;
109+
@Mock private InstanceAdminStub instanceAdminStub;
100110
private TransactionRunnerImpl transactionRunner;
101111
private boolean firstRun;
102112
private boolean usedInlinedBegin;
@@ -151,7 +161,7 @@ public void setUp() {
151161

152162
@SuppressWarnings("unchecked")
153163
@Test
154-
public void usesPreparedTransaction() {
164+
public void usesPreparedTransaction() throws IOException {
155165
SpannerOptions options = mock(SpannerOptions.class);
156166
when(options.getNumChannels()).thenReturn(4);
157167
GrpcTransportOptions transportOptions = mock(GrpcTransportOptions.class);
@@ -196,6 +206,11 @@ public void usesPreparedTransaction() {
196206
.setCommitTimestamp(
197207
Timestamp.newBuilder().setSeconds(System.currentTimeMillis() * 1000))
198208
.build()));
209+
when(instanceAdminStubSettings.createStub()).thenReturn(instanceAdminStub);
210+
when(databaseAdminStubSettings.createStub()).thenReturn(databaseAdminStub);
211+
when(rpc.getInstanceAdminStubSettings()).thenReturn(instanceAdminStubSettings);
212+
when(rpc.getDatabaseAdminStubSettings()).thenReturn(databaseAdminStubSettings);
213+
199214
DatabaseId db = DatabaseId.of("test", "test", "test");
200215
try (SpannerImpl spanner = new SpannerImpl(rpc, options)) {
201216
DatabaseClient client = spanner.getDatabaseClient(db);

0 commit comments

Comments
 (0)