Skip to content

Commit 27ecea8

Browse files
committed
chore(spanner): fix tests
1 parent 4e91fb3 commit 27ecea8

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,9 +1495,10 @@ public void testSessionNotFoundReadWriteTransaction() {
14951495
.build();
14961496
when(closedSession.asyncClose())
14971497
.thenReturn(ApiFutures.immediateFuture(Empty.getDefaultInstance()));
1498-
when(closedSession.newTransaction(Options.fromTransactionOptions()))
1498+
when(closedSession.newTransaction(eq(Options.fromTransactionOptions()), any()))
14991499
.thenReturn(closedTransactionContext);
1500-
when(closedSession.beginTransactionAsync(any(), eq(true), any())).thenThrow(sessionNotFound);
1500+
when(closedSession.beginTransactionAsync(any(), eq(true), any(), any()))
1501+
.thenThrow(sessionNotFound);
15011502
when(closedSession.getTracer()).thenReturn(tracer);
15021503
TransactionRunnerImpl closedTransactionRunner = new TransactionRunnerImpl(closedSession);
15031504
closedTransactionRunner.setSpan(span);
@@ -1510,9 +1511,9 @@ public void testSessionNotFoundReadWriteTransaction() {
15101511
when(openSession.getName())
15111512
.thenReturn("projects/dummy/instances/dummy/database/dummy/sessions/session-open");
15121513
final TransactionContextImpl openTransactionContext = mock(TransactionContextImpl.class);
1513-
when(openSession.newTransaction(Options.fromTransactionOptions()))
1514+
when(openSession.newTransaction(eq(Options.fromTransactionOptions()), any()))
15141515
.thenReturn(openTransactionContext);
1515-
when(openSession.beginTransactionAsync(any(), eq(true), any()))
1516+
when(openSession.beginTransactionAsync(any(), eq(true), any(), any()))
15161517
.thenReturn(ApiFutures.immediateFuture(ByteString.copyFromUtf8("open-txn")));
15171518
when(openSession.getTracer()).thenReturn(tracer);
15181519
TransactionRunnerImpl openTransactionRunner = new TransactionRunnerImpl(openSession);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.junit.Assert.assertArrayEquals;
2121
import static org.junit.Assert.assertEquals;
2222
import static org.junit.Assert.assertThrows;
23+
import static org.mockito.ArgumentMatchers.any;
2324
import static org.mockito.ArgumentMatchers.eq;
2425
import static org.mockito.Mockito.doThrow;
2526
import static org.mockito.Mockito.eq;
@@ -117,7 +118,7 @@ public void setUp() {
117118
tracer = new TraceWrapper(Tracing.getTracer(), OpenTelemetry.noop().getTracer(""), false);
118119
firstRun = true;
119120
when(session.getErrorHandler()).thenReturn(DefaultErrorHandler.INSTANCE);
120-
when(session.newTransaction(Options.fromTransactionOptions())).thenReturn(txn);
121+
when(session.newTransaction(eq(Options.fromTransactionOptions()), any())).thenReturn(txn);
121122
when(session.getTracer()).thenReturn(tracer);
122123
when(rpc.executeQuery(Mockito.any(ExecuteSqlRequest.class), Mockito.anyMap(), eq(true)))
123124
.thenAnswer(
@@ -343,7 +344,8 @@ private long[] batchDmlException(int status) {
343344
.setTracer(session.getTracer())
344345
.setSpan(session.getTracer().getCurrentSpan())
345346
.build();
346-
when(session.newTransaction(Options.fromTransactionOptions())).thenReturn(transaction);
347+
when(session.newTransaction(eq(Options.fromTransactionOptions()), any()))
348+
.thenReturn(transaction);
347349
when(session.getName()).thenReturn(SessionId.of("p", "i", "d", "test").getName());
348350
TransactionRunnerImpl runner = new TransactionRunnerImpl(session);
349351
runner.setSpan(span);

0 commit comments

Comments
 (0)