fix: enables emulator tests #380

thiagotnunes · 2020-08-12T06:01:14Z

Enables emulator for integration tests that were previously being skipped. The emulator now provides the features for theses tests to run with it.

The tests that are now enabled to use the emulator are:

ITAsyncAPITest
ITClosedSessionTest
ITCommitTimestampTest

Enables emulator for integration tests that were previously being skipped. The emulator now provides the features for theses tests to run with it.

thiagotnunes · 2020-08-12T06:02:54Z

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

@@ -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()) {


This needed to be updated so that the tests run properly with the emulator. This enables a new spanner instance to be created when running with the emulator.

thiagotnunes · 2020-08-12T06:03:21Z

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

@@ -279,9 +278,6 @@ public void columnNotFound() throws Exception {

  @Test
  public void asyncRunnerFireAndForgetInvalidUpdate() throws Exception {
-    assumeFalse(


Enables this test to use the emulator.

thiagotnunes · 2020-08-12T06:03:28Z

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

@@ -61,10 +60,6 @@

  @BeforeClass
  public static void setUpDatabase() {
-    // TODO: Enable when the emulator returns ResourceInfo for Session not found errors.


Enables this test to use the emulator.

thiagotnunes · 2020-08-12T06:04:08Z

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

@@ -336,8 +336,6 @@ public void interleavedTableHierarchy1() {
  // 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.


Enables this test to use the emulator.

thiagotnunes · 2020-08-12T06:07:11Z

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

@@ -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()) {


Enables this test to use the emulator.

Fixes formatting of code

Deprecates method to check for the emulator and uses the new SpannerEmulatorHelper class.

Renames helper class

thiagotnunes · 2020-08-12T06:38:04Z

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

+   * @deprecated use {@link EmulatorSpannerHelper#isUsingEmulator()} instead.
+   * @return true if the emulator is being used. Returns false otherwise.
+   */
+  @Deprecated


Refactors: deprecate this method and use the newly created method.

This is an auto-generated regeneration of the .pb.go files by cloud.google.com/go/internal/gapicgen. Once this PR is submitted, genmgr will update the corresponding CL at gocloud to depend on the newer version of go-genproto, and assign reviewers. Whilst this or any regen PR is open in go-genproto, gapicgen will not create any more regeneration PRs or CLs. If all regen PRs are closed, gapicgen will create a new set of regeneration PRs and CLs once per night. If you have been assigned to review this CL, please: - Ensure that CI is passing. If it's failing, it requires your manual attention. - Approve and submit this PR if you believe it's ready to ship. That will prompt genmgr to assign reviewers to the gocloud CL. Corresponding gocloud CL: https://code-review.googlesource.com/c/gocloud/+/57051

google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Aug 12, 2020

fix: enables emulator tests

e6e4424

Enables emulator for integration tests that were previously being skipped. The emulator now provides the features for theses tests to run with it.

thiagotnunes force-pushed the fix-enables-emulator-tests branch from ff377ce to e6e4424 Compare August 12, 2020 06:06

thiagotnunes commented Aug 12, 2020

View reviewed changes

thiagotnunes added 3 commits August 12, 2020 16:14

fix: formatting

4992104

Fixes formatting of code

fix: deprecates method for emulator check

75197c6

Deprecates method to check for the emulator and uses the new SpannerEmulatorHelper class.

refactor: renames class

11dc86f

Renames helper class

thiagotnunes commented Aug 12, 2020

View reviewed changes

thiagotnunes requested review from olavloite and skuruppu August 12, 2020 07:04

olavloite approved these changes Aug 12, 2020

View reviewed changes

thiagotnunes merged commit f61c6d0 into googleapis:master Aug 13, 2020

thiagotnunes deleted the fix-enables-emulator-tests branch August 13, 2020 01:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: enables emulator tests #380

fix: enables emulator tests #380

thiagotnunes commented Aug 12, 2020

thiagotnunes Aug 12, 2020 •

edited

Loading

thiagotnunes Aug 12, 2020

thiagotnunes Aug 12, 2020

thiagotnunes Aug 12, 2020

thiagotnunes Aug 12, 2020

thiagotnunes Aug 12, 2020

fix: enables emulator tests #380

fix: enables emulator tests #380

Conversation

thiagotnunes commented Aug 12, 2020

thiagotnunes Aug 12, 2020 • edited Loading

Choose a reason for hiding this comment

thiagotnunes Aug 12, 2020

Choose a reason for hiding this comment

thiagotnunes Aug 12, 2020

Choose a reason for hiding this comment

thiagotnunes Aug 12, 2020

Choose a reason for hiding this comment

thiagotnunes Aug 12, 2020

Choose a reason for hiding this comment

thiagotnunes Aug 12, 2020

Choose a reason for hiding this comment

thiagotnunes Aug 12, 2020 •

edited

Loading