From 3c93fb808a1ac6e2ee4b796a0463c89ed745fe80 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Wed, 6 Aug 2025 20:31:40 +0530 Subject: [PATCH] chore: Revert patched emulator tests --- .../com/google/cloud/spanner/it/ITJsonWriteReadTest.java | 7 ++++--- .../test/java/com/google/cloud/spanner/it/ITWriteTest.java | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java index 098f9244f55..026e3649b2e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java @@ -16,7 +16,6 @@ package com.google.cloud.spanner.it; -import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; @@ -133,8 +132,10 @@ public void testWriteAndReadInvalidJsonValues() throws IOException { .to(Value.json(jsonStr)) .build()))); - if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW() - && !isUsingEmulator()) { + if (env.getTestHelper() + .getOptions() + .getSessionPoolOptions() + .getUseMultiplexedSessionForRW()) { assertEquals(ErrorCode.INVALID_ARGUMENT, exception.getErrorCode()); } else { assertEquals(ErrorCode.FAILED_PRECONDITION, exception.getErrorCode()); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java index 9e30efb80d8..5dde683bcb8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java @@ -1081,8 +1081,10 @@ public void incorrectType() { write(baseInsert().set("StringValue").to(1.234).build()); fail("Expected exception"); } catch (SpannerException ex) { - if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW() - && !isUsingEmulator()) { + if (env.getTestHelper() + .getOptions() + .getSessionPoolOptions() + .getUseMultiplexedSessionForRW()) { assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT); } else { assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);