Skip to content

Commit 35100b4

Browse files
chore: Revert patched emulator tests (#4011)
1 parent 1a4adb4 commit 35100b4

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.spanner.it;
1818

19-
import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator;
2019
import static org.junit.Assert.assertEquals;
2120
import static org.junit.Assert.assertThrows;
2221

@@ -133,8 +132,10 @@ public void testWriteAndReadInvalidJsonValues() throws IOException {
133132
.to(Value.json(jsonStr))
134133
.build())));
135134

136-
if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()
137-
&& !isUsingEmulator()) {
135+
if (env.getTestHelper()
136+
.getOptions()
137+
.getSessionPoolOptions()
138+
.getUseMultiplexedSessionForRW()) {
138139
assertEquals(ErrorCode.INVALID_ARGUMENT, exception.getErrorCode());
139140
} else {
140141
assertEquals(ErrorCode.FAILED_PRECONDITION, exception.getErrorCode());

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,8 +1081,10 @@ public void incorrectType() {
10811081
write(baseInsert().set("StringValue").to(1.234).build());
10821082
fail("Expected exception");
10831083
} catch (SpannerException ex) {
1084-
if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()
1085-
&& !isUsingEmulator()) {
1084+
if (env.getTestHelper()
1085+
.getOptions()
1086+
.getSessionPoolOptions()
1087+
.getUseMultiplexedSessionForRW()) {
10861088
assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
10871089
} else {
10881090
assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);

0 commit comments

Comments
 (0)