From d84931d92500c8af356d38557d9087d817ab48bc Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Thu, 25 Jun 2020 13:50:32 +1000 Subject: [PATCH 1/2] test: unskip tests passing against the emulator --- .../java/com/google/cloud/spanner/it/ITBatchDmlTest.java | 5 +---- .../java/com/google/cloud/spanner/it/ITBatchReadTest.java | 3 --- .../src/test/java/com/google/cloud/spanner/it/ITDMLTest.java | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java index a080d1c3968..f45fa2c427c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java @@ -195,10 +195,7 @@ public long[] run(TransactionContext transaction) { runner.run(callable); Assert.fail("Expecting an exception."); } catch (SpannerBatchUpdateException e) { - // TODO: Remove if-statement when emulator returns the same error code as Cloud Spanner. - if (!env.getTestHelper().isEmulator()) { - assertThat(e.getErrorCode()).isEqualTo(ErrorCode.ALREADY_EXISTS); - } + assertThat(e.getErrorCode()).isEqualTo(ErrorCode.ALREADY_EXISTS); long[] rowCounts = e.getUpdateCounts(); assertThat(rowCounts.length).isEqualTo(1); for (long rc : rowCounts) { diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java index a6aa4f715d6..aace34a7aed 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java @@ -89,9 +89,6 @@ private static List manyRows() { @BeforeClass public static void setUpDatabase() throws Exception { - assumeFalse( - "BatchReadOnlyTransactions are not supported on the emulator", - env.getTestHelper().isEmulator()); db = env.getTestHelper() .createTestDatabase( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java index 9af4a22f76b..4285959aefe 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java @@ -137,8 +137,6 @@ public void abortOnceShouldSucceedAfterRetry() { @Test public void partitionedDML() { - assumeFalse("The emulator does not support partitioned DML", env.getTestHelper().isEmulator()); - executeUpdate(DML_COUNT, insertDml()); assertThat( client From 39819e20b0e260fbf4386b54da175b70987920d0 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Thu, 25 Jun 2020 14:11:51 +1000 Subject: [PATCH 2/2] fix: lint --- .../test/java/com/google/cloud/spanner/it/ITBatchReadTest.java | 1 - .../src/test/java/com/google/cloud/spanner/it/ITDMLTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java index aace34a7aed..9c3f11d3eeb 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java @@ -17,7 +17,6 @@ package com.google.cloud.spanner.it; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assume.assumeFalse; import com.google.cloud.ByteArray; import com.google.cloud.Timestamp; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java index 4285959aefe..aabf93b3a6c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; import com.google.cloud.spanner.AbortedException; import com.google.cloud.spanner.Database;