Skip to content

Commit cfae568

Browse files
committed
chore(spanner): remove test skips
1 parent 5afa652 commit cfae568

File tree

2 files changed

+0
-49
lines changed

2 files changed

+0
-49
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,4 @@ protected boolean indexExists(Connection connection, String table, String index)
369369
}
370370
return false;
371371
}
372-
373-
protected boolean isMultiplexedSessionsEnabledForRW(Spanner spanner) {
374-
if (spanner.getOptions() == null || spanner.getOptions().getSessionPoolOptions() == null) {
375-
return false;
376-
}
377-
return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW();
378-
}
379372
}

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

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ Connection createTestConnection(String url) {
112112
public void testSingleUseQuery_withoutSqlStatement() {
113113
try (Connection connection = createTestConnection(getBaseUrl())) {
114114
connection.setAutocommit(true);
115-
assumeFalse(
116-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
117-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
118115
try (ResultSet resultSet = connection.executeQuery(SELECT1_STATEMENT)) {
119116
assertTrue(resultSet.next());
120117
assertFalse(resultSet.next());
@@ -153,9 +150,6 @@ public boolean isEnableExtendedTracing() {
153150

154151
try (Connection connection = createTestConnection(getBaseUrl())) {
155152
connection.setAutocommit(true);
156-
assumeFalse(
157-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
158-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
159153
try (ResultSet resultSet = connection.executeQuery(SELECT1_STATEMENT)) {
160154
assertTrue(resultSet.next());
161155
assertFalse(resultSet.next());
@@ -192,9 +186,6 @@ public boolean isEnableExtendedTracing() {
192186
public void testSingleUseQuery() {
193187
try (Connection connection = createTestConnection()) {
194188
connection.setAutocommit(true);
195-
assumeFalse(
196-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
197-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
198189
try (ResultSet resultSet = connection.executeQuery(SELECT1_STATEMENT)) {
199190
assertTrue(resultSet.next());
200191
assertFalse(resultSet.next());
@@ -230,9 +221,6 @@ public void testSingleUseUpdate() {
230221
try (Connection connection = createTestConnection()) {
231222
connection.setAutocommit(true);
232223
connection.executeUpdate(INSERT_STATEMENT);
233-
assumeFalse(
234-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
235-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
236224
}
237225
assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush());
238226
List<SpanData> spans = spanExporter.getFinishedSpanItems();
@@ -269,9 +257,6 @@ public void testSingleUseBatchUpdate() {
269257
connection.executeUpdate(INSERT_STATEMENT);
270258
connection.executeUpdate(INSERT_STATEMENT);
271259
connection.runBatch();
272-
assumeFalse(
273-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
274-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
275260
}
276261
assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush());
277262
List<SpanData> spans = spanExporter.getFinishedSpanItems();
@@ -313,9 +298,6 @@ public void testSingleUseDdl() {
313298

314299
try (Connection connection = createTestConnection()) {
315300
connection.setAutocommit(true);
316-
assumeFalse(
317-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
318-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
319301
connection.execute(Statement.of(ddl));
320302
}
321303
assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush());
@@ -334,9 +316,6 @@ public void testSingleUseDdlBatch() {
334316

335317
try (Connection connection = createTestConnection()) {
336318
connection.setAutocommit(true);
337-
assumeFalse(
338-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
339-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
340319
connection.startBatchDdl();
341320
connection.execute(Statement.of(ddl1));
342321
connection.execute(Statement.of(ddl2));
@@ -354,9 +333,6 @@ public void testSingleUseDdlBatch() {
354333
public void testMultiUseReadOnlyQueries() {
355334
try (Connection connection = createTestConnection()) {
356335
connection.setAutocommit(false);
357-
assumeFalse(
358-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
359-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
360336
connection.setReadOnly(true);
361337
twice(
362338
() -> {
@@ -388,9 +364,6 @@ public void testMultiUseReadOnlyQueries() {
388364
public void testMultiUseReadWriteQueries() {
389365
try (Connection connection = createTestConnection()) {
390366
connection.setAutocommit(false);
391-
assumeFalse(
392-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
393-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
394367
connection.setReadOnly(false);
395368
twice(
396369
() -> {
@@ -425,9 +398,6 @@ public void testMultiUseReadWriteQueries() {
425398
public void testMultiUseReadWriteUpdates() {
426399
try (Connection connection = createTestConnection()) {
427400
connection.setAutocommit(false);
428-
assumeFalse(
429-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
430-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
431401
connection.setReadOnly(false);
432402
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
433403
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
@@ -457,9 +427,6 @@ public void testMultiUseReadWriteUpdates() {
457427
public void testMultiUseReadWriteBatchUpdates() {
458428
try (Connection connection = createTestConnection()) {
459429
connection.setAutocommit(false);
460-
assumeFalse(
461-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
462-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
463430
connection.setReadOnly(false);
464431

465432
twice(
@@ -500,9 +467,6 @@ public void testMultiUseReadWriteBatchUpdates() {
500467
public void testMultiUseReadWriteAborted() {
501468
try (Connection connection = createTestConnection()) {
502469
connection.setAutocommit(false);
503-
assumeFalse(
504-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
505-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
506470
connection.setReadOnly(false);
507471
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
508472
mockSpanner.abortNextStatement();
@@ -551,9 +515,6 @@ public void testSavepoint() {
551515

552516
try (Connection connection = createTestConnection()) {
553517
connection.setAutocommit(false);
554-
assumeFalse(
555-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
556-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
557518
connection.setReadOnly(false);
558519
connection.setSavepointSupport(SavepointSupport.ENABLED);
559520
assertEquals(1L, connection.executeUpdate(statement1));
@@ -603,9 +564,6 @@ public void testTransactionTag() {
603564
try (Connection connection = createTestConnection()) {
604565
connection.setAutocommit(false);
605566
connection.setReadOnly(false);
606-
assumeFalse(
607-
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
608-
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
609567
connection.setTransactionTag("my_tag");
610568
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
611569
connection.commit();

0 commit comments

Comments
 (0)