fix: enables emulator tests

google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java

@@ -25,7 +25,6 @@
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.SpannerExceptionFactory;
 import com.google.cloud.spanner.SpannerOptions;
-import com.google.common.base.Strings;
 import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58,10 +57,6 @@ public SpannerOptions getOptions() {
     return options;
   }
 
-  public boolean isEmulator() {
-    return !Strings.isNullOrEmpty(System.getenv("SPANNER_EMULATOR_HOST"));
-  }
-
   public Spanner getClient() {
     return client;
   }

google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/SpannerEmulatorHelper.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.spanner.testing;
+
+import com.google.common.base.Strings;
+
+/**
+ * Utility class for checking emulator state for tests
+ */
+public class SpannerEmulatorHelper {
+
+  public static boolean isUsingEmulator() {
+    return !Strings.isNullOrEmpty(System.getenv("SPANNER_EMULATOR_HOST"));
+  }
+}

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

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.api.gax.longrunning.OperationFuture;
@@ -79,7 +80,7 @@ protected void before() throws Throwable {
     SpannerOptions options = config.spannerOptions();
     String instanceProperty = System.getProperty(TEST_INSTANCE_PROPERTY, "");
     InstanceId instanceId;
-    if (!instanceProperty.isEmpty()) {
+    if (!instanceProperty.isEmpty() && !isUsingEmulator()) {
       instanceId = InstanceId.of(instanceProperty);
       isOwnedInstance = false;
       logger.log(Level.INFO, "Using existing test instance: {0}", instanceId);

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.connection.it;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -169,7 +170,7 @@ public void testStatementTimeoutAutocommit() {
 
   @Test
   public void testAnalyzeQuery() {
-    assumeFalse("analyze query is not supported on the emulator", env.getTestHelper().isEmulator());
+    assumeFalse("analyze query is not supported on the emulator", isUsingEmulator());
     try (ITConnection connection = createConnection()) {
       for (QueryAnalyzeMode mode : QueryAnalyzeMode.values()) {
         try (ResultSet rs =

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.connection.it;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -76,7 +77,7 @@ public void test02_WriteMutation() {
   public void test03_MultipleStatements_WithTimeouts() {
     assumeFalse(
         "Rolling back a transaction while an update statement is still in flight can cause the transaction to remain active on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     try (ITConnection connection = createConnection()) {
       // do an insert that should succeed
       assertThat(

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.connection.it;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -61,7 +62,7 @@ public void test01_RunScript() throws Exception {
   public void test02_RunAbortedTest() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
 
     final long SINGER_ID = 2L;
     final long VENUE_ID = 68L;

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java

@@ -16,6 +16,8 @@
 
 package com.google.cloud.spanner.connection.it;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
+
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.SpannerException;
@@ -76,7 +78,7 @@ public void test02_InsertTestData() throws Exception {
           INSERT_AND_VERIFY_TEST_DATA,
           SqlScriptVerifier.class);
     } catch (SpannerException e) {
-      if (env.getTestHelper().isEmulator() && e.getErrorCode() == ErrorCode.ALREADY_EXISTS) {
+      if (isUsingEmulator() && e.getErrorCode() == ErrorCode.ALREADY_EXISTS) {
         // Errors in a transaction are 'sticky' on the emulator, so any query in the same
         // transaction will return the same error as the error generated by a previous (update)
         // statement.
@@ -102,7 +104,7 @@ public void test04_TestGetCommitTimestamp() throws Exception {
           TEST_GET_COMMIT_TIMESTAMP,
           SqlScriptVerifier.class);
     } catch (SpannerException e) {
-      if (env.getTestHelper().isEmulator() && e.getErrorCode() == ErrorCode.INVALID_ARGUMENT) {
+      if (isUsingEmulator() && e.getErrorCode() == ErrorCode.INVALID_ARGUMENT) {
         // Errors in a transaction are 'sticky' on the emulator, so any query in the same
         // transaction will return the same error as the error generated by a previous statement.
       }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.connection.it;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -490,7 +491,7 @@ public void testAbortWithResultSetFullyConsumed() {
   public void testAbortWithConcurrentInsert() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     try (ITConnection connection =
         createConnection(interceptor, new CountTransactionRetryListener())) {
@@ -527,7 +528,7 @@ public void testAbortWithConcurrentInsert() {
   public void testAbortWithConcurrentDelete() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
     try (ITConnection connection = createConnection()) {
@@ -568,7 +569,7 @@ public void testAbortWithConcurrentDelete() {
   public void testAbortWithConcurrentUpdate() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
     try (ITConnection connection = createConnection()) {
@@ -614,7 +615,7 @@ public void testAbortWithConcurrentUpdate() {
   public void testAbortWithUnseenConcurrentInsert() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     try (ITConnection connection =
         createConnection(interceptor, new CountTransactionRetryListener())) {
@@ -664,7 +665,7 @@ public void testAbortWithUnseenConcurrentInsert() {
   public void testAbortWithUnseenConcurrentInsertAbortOnNext() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     // no calls to next(), this should succeed
     assertThat(testAbortWithUnseenConcurrentInsertAbortOnNext(0) >= 1, is(true));
     // 1 call to next() should also succeed, as there were 2 records in the original result set
@@ -688,7 +689,7 @@ private int testAbortWithUnseenConcurrentInsertAbortOnNext(int callsToNext)
       throws AbortedDueToConcurrentModificationException {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     int retries = 0;
     clearTable();
     clearStatistics();
@@ -750,7 +751,7 @@ private int testAbortWithUnseenConcurrentInsertAbortOnNext(int callsToNext)
   public void testAbortWithConcurrentInsertAndContinue() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     try (ITConnection connection =
         createConnection(interceptor, new CountTransactionRetryListener())) {
@@ -962,7 +963,7 @@ protected boolean shouldAbort(String statement, ExecutionStep step) {
   public void testNestedAbortWithConcurrentInsert() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor =
         new AbortInterceptor(0) {
           private boolean alreadyAborted = false;
@@ -1027,7 +1028,7 @@ protected boolean shouldAbort(String statement, ExecutionStep step) {
   public void testAbortWithDifferentUpdateCount() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
     try (ITConnection connection = createConnection()) {
@@ -1075,7 +1076,7 @@ public void testAbortWithDifferentUpdateCount() {
   public void testAbortWithExceptionOnSelect() {
     assumeFalse(
         "resume after error in transaction is not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
     try (ITConnection connection = createConnection()) {
@@ -1127,7 +1128,7 @@ public void testAbortWithExceptionOnSelect() {
   public void testAbortWithExceptionOnSelectAndConcurrentModification() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     boolean abortedDueToConcurrentModification = false;
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
@@ -1197,7 +1198,7 @@ public void testAbortWithExceptionOnSelectAndConcurrentModification() {
   public void testAbortWithExceptionOnInsertAndConcurrentModification() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     boolean abortedDueToConcurrentModification = false;
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
@@ -1266,7 +1267,7 @@ public void testAbortWithExceptionOnInsertAndConcurrentModification() {
   public void testAbortWithDroppedTableConcurrentModification() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     boolean abortedDueToConcurrentModification = false;
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
@@ -1331,7 +1332,7 @@ public void testAbortWithDroppedTableConcurrentModification() {
   public void testAbortWithInsertOnDroppedTableConcurrentModification() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     boolean abortedDueToConcurrentModification = false;
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
@@ -1393,7 +1394,7 @@ public void testAbortWithInsertOnDroppedTableConcurrentModification() {
   public void testAbortWithCursorHalfwayDroppedTableConcurrentModification() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     boolean abortedDueToConcurrentModification = false;
     AbortInterceptor interceptor = new AbortInterceptor(0);
     // first insert two test records
@@ -1548,7 +1549,7 @@ public void testRetryHighAbortRate() {
   public void testAbortWithConcurrentInsertOnEmptyTable() {
     assumeFalse(
         "concurrent transactions are not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
     AbortInterceptor interceptor = new AbortInterceptor(0);
     try (ITConnection connection =
         createConnection(interceptor, new CountTransactionRetryListener())) {

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.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.api.core.ApiFuture;
 import com.google.cloud.spanner.AsyncResultSet;
@@ -279,9 +278,6 @@ public void columnNotFound() throws Exception {
 
   @Test
   public void asyncRunnerFireAndForgetInvalidUpdate() throws Exception {
-    assumeFalse(
-        "errors in read/write transactions on emulator are sticky",
-        env.getTestHelper().isEmulator());
     try {
       assertThat(client.singleUse().readRow("TestTable", Key.of("k999"), ALL_COLUMNS)).isNull();
       AsyncRunner runner = client.runAsync();

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.it;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
@@ -93,7 +94,7 @@ public class ITBackupTest {
 
   @BeforeClass
   public static void doNotRunOnEmulator() {
-    assumeFalse("backups are not supported on the emulator", env.getTestHelper().isEmulator());
+    assumeFalse("backups are not supported on the emulator", isUsingEmulator());
   }
 
   @Before

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java

@@ -19,7 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
 
 import com.google.cloud.spanner.AbortedException;
 import com.google.cloud.spanner.Database;
@@ -61,10 +60,6 @@ public class ITClosedSessionTest {
 
   @BeforeClass
   public static void setUpDatabase() {
-    // TODO: Enable when the emulator returns ResourceInfo for Session not found errors.
-    assumeFalse(
-        "Emulator does not return ResourceInfo for Session not found errors",
-        env.getTestHelper().isEmulator());
     // Empty database.
     db = env.getTestHelper().createTestDatabase();
     client = (DatabaseClientWithClosedSessionImpl) env.getTestHelper().getDatabaseClient(db);

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.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.Timestamp;
 import com.google.cloud.spanner.Database;
@@ -325,19 +324,14 @@ public void interleavedTableHierarchy1() {
                   .build()));
       fail("missing expected exception");
     } catch (SpannerException e) {
-      // TODO: Remove when the emulator returns the same error code as Cloud Spanner.
-      if (!env.getTestHelper().isEmulator()) {
-        assertThat(e.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);
-      }
+      assertThat(e.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);
     }
   }
 
   // In interleaved table, use of commit timestamp in parent table is not
   // allowed if child tables are not allow_commmit_timestamp=true
   @Test
   public void interleavedTableHierarchy2() {
-    // TODO: Remove the following line once the emulator is as strict as Cloud Spanner.
-    assumeFalse("The emulator allows this situation", env.getTestHelper().isEmulator());
     Database db =
         testHelper.createTestDatabase(
             "CREATE TABLE T1 (ts TIMESTAMP OPTIONS (allow_commit_timestamp = true)) "

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.it;
 
+import static com.google.cloud.spanner.testing.SpannerEmulatorHelper.isUsingEmulator;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
@@ -266,7 +267,7 @@ public void onClose(Status status, Metadata metadata) {
   public void testRetryNonIdempotentRpcsReturningLongRunningOperations() throws Exception {
     assumeFalse(
         "Querying long-running operations is not supported on the emulator",
-        env.getTestHelper().isEmulator());
+        isUsingEmulator());
 
     // RPCs that return a long-running operation such as CreateDatabase, CreateBackup and
     // RestoreDatabase are non-idempotent and can normally not be automatically retried in case of a