Skip to content

Commit ca1facd

Browse files
committed
chore(spanner): fix test
1 parent 58c9a40 commit ca1facd

File tree

1 file changed

+28
-4
lines changed

1 file changed

+28
-4
lines changed

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/PartitionedQueryMockServerTest.java

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,13 @@ public void testPartitionQuery() {
9393
assertFalse(resultSet.next());
9494
}
9595
}
96-
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
96+
if (isMultiplexedSessionsEnabledForPartitionedOps(connection.getSpanner())) {
97+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
98+
} else if (isMultiplexedSessionsEnabled(connection.getSpanner())) {
99+
assertEquals(3, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
100+
} else {
101+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
102+
}
97103
}
98104
assertEquals(2, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
99105
assertEquals(2, mockSpanner.countRequestsOfType(PartitionQueryRequest.class));
@@ -151,7 +157,13 @@ public void testMixNormalAndPartitionQueryInReadOnlyTransaction() {
151157
readTimestamps.add(connection.getReadTimestamp());
152158
connection.commit();
153159
}
154-
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
160+
if (isMultiplexedSessionsEnabledForPartitionedOps(connection.getSpanner())) {
161+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
162+
} else if (isMultiplexedSessionsEnabled(connection.getSpanner())) {
163+
assertEquals(3, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
164+
} else {
165+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
166+
}
155167
}
156168
// The above will start two transactions:
157169
// 1. The initial 'normal' read-only transaction.
@@ -570,7 +582,13 @@ public void testRunPartitionedQueryUsingSql() {
570582
assertEquals(maxPartitions * generatedRowCount, rowCount);
571583
}
572584
}
573-
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
585+
if (isMultiplexedSessionsEnabledForPartitionedOps(connection.getSpanner())) {
586+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
587+
} else if (isMultiplexedSessionsEnabled(connection.getSpanner())) {
588+
assertEquals(3, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
589+
} else {
590+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
591+
}
574592
}
575593
// We have 2 requests of each, as we run the query with data boost both enabled and disabled.
576594
assertEquals(2, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
@@ -755,7 +773,13 @@ public void testAutoPartitionMode() {
755773
.getMessage()
756774
.contains("Partition query is not supported for read/write transaction"));
757775

758-
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
776+
if (isMultiplexedSessionsEnabledForPartitionedOps(connection.getSpanner())) {
777+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
778+
} else if (isMultiplexedSessionsEnabled(connection.getSpanner())) {
779+
assertEquals(3, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
780+
} else {
781+
assertEquals(2, mockSpanner.countRequestsOfType(CreateSessionRequest.class));
782+
}
759783
}
760784
assertEquals(2, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
761785
assertEquals(2, mockSpanner.countRequestsOfType(PartitionQueryRequest.class));

0 commit comments

Comments
 (0)