diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITIntervalTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITIntervalTest.java index 1259c5026f1..5f0b778f0c5 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITIntervalTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITIntervalTest.java @@ -16,11 +16,8 @@ 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.assertTrue; -import static org.junit.Assume.assumeFalse; -import static org.junit.Assume.assumeTrue; import com.google.cloud.Timestamp; import com.google.cloud.spanner.*; @@ -29,7 +26,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Objects; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.junit.AfterClass; @@ -83,18 +79,9 @@ public static List data() { private static DatabaseClient client; - private static boolean isUsingCloudDevel() { - return Objects.equals( - System.getProperty("spanner.gce.config.server_url"), - "https://staging-wrenchworks.sandbox.googleapis.com"); - } - @BeforeClass public static void setUpDatabase() throws ExecutionException, InterruptedException, TimeoutException { - assumeTrue("INTERVAL is supported only in Cloud-Devel for now", isUsingCloudDevel()); - assumeFalse("INTERVAL is not yet supported on Emulator", isUsingEmulator()); - Database googleStandardSQLDatabase = env.getTestHelper().createTestDatabase(GOOGLE_STANDARD_SQL_SCHEMA); googleStandardSQLClient = env.getTestHelper().getDatabaseClient(googleStandardSQLDatabase); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java index ed26835da78..ec5b3e77036 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java @@ -267,9 +267,6 @@ private static boolean isUsingCloudDevel() { @Test public void bindFloat32() { - assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator()); - assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(2.0f), Type.float32()); assertThat(row.isNull(0)).isFalse(); @@ -278,9 +275,6 @@ public void bindFloat32() { @Test public void bindFloat32Null() { - assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator()); - assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to((Float) null), Type.float32()); assertThat(row.isNull(0)).isTrue(); @@ -342,7 +336,6 @@ public void bindStringNull() { @Test public void bindJson() { assumeFalse("JSON are not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery) @@ -356,7 +349,6 @@ public void bindJson() { @Test public void bindJsonEmpty() { assumeFalse("JSON are not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").to(Value.json("{}")), Type.json()); @@ -367,7 +359,6 @@ public void bindJsonEmpty() { @Test public void bindJsonNull() { assumeFalse("JSON is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").to(Value.json(null)), Type.json()); @@ -426,8 +417,6 @@ public void bindDateNull() { @Test public void bindInterval() { - assumeFalse( - "INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator()); Interval d = Interval.parseFromString("P1Y2M3DT4H5M6.789123S"); Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(d), Type.interval()); assertThat(row.isNull(0)).isFalse(); @@ -436,8 +425,6 @@ public void bindInterval() { @Test public void bindIntervalNull() { - assumeFalse( - "INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").to((Interval) null), Type.interval()); @@ -446,7 +433,6 @@ public void bindIntervalNull() { @Test public void bindNumeric() { - assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator()); BigDecimal b = new BigDecimal("1.1"); Statement.Builder statement = Statement.newBuilder(selectValueQuery); Type expectedType = Type.numeric(); @@ -471,7 +457,6 @@ public void bindNumeric() { @Test public void bindNumericNull() { - assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator()); Statement.Builder statement = Statement.newBuilder(selectValueQuery); Type expectedType = Type.numeric(); if (dialect.dialect == Dialect.POSTGRESQL) { @@ -486,7 +471,6 @@ public void bindNumericNull() { @Test public void bindNumeric_doesNotPreservePrecision() { - assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator()); BigDecimal b = new BigDecimal("1.10"); Statement.Builder statement = Statement.newBuilder(selectValueQuery); Type expectedType = Type.numeric(); @@ -574,9 +558,6 @@ public void bindInt64ArrayNull() { @Test public void bindFloat32Array() { - assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator()); - assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute( Statement.newBuilder(selectValueQuery) @@ -599,9 +580,6 @@ public void bindFloat32Array() { @Test public void bindFloat32ArrayEmpty() { - assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator()); - assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute( Statement.newBuilder(selectValueQuery) @@ -614,9 +592,6 @@ public void bindFloat32ArrayEmpty() { @Test public void bindFloat32ArrayNull() { - assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator()); - assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").toFloat32Array((float[]) null), @@ -702,7 +677,6 @@ public void bindStringArrayNull() { public void bindJsonArray() { assumeFalse( "array JSON binding is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery) @@ -718,7 +692,6 @@ public void bindJsonArray() { @Test public void bindJsonArrayEmpty() { assumeFalse("JSON is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").toJsonArray(Collections.emptyList()), @@ -730,7 +703,6 @@ public void bindJsonArrayEmpty() { @Test public void bindJsonArrayNull() { assumeFalse("JSON is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").toJsonArray(null), @@ -840,8 +812,6 @@ public void bindDateArrayNull() { @Test public void bindIntervalArray() { - assumeFalse( - "INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator()); Interval d1 = Interval.parseFromString("P-1Y-2M-3DT4H5M6.789123S"); Interval d2 = Interval.parseFromString("P1Y2M3DT-4H-5M-6.789123S"); Struct row = @@ -854,8 +824,6 @@ public void bindIntervalArray() { @Test public void bindIntervalArrayEmpty() { - assumeFalse( - "INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery) @@ -868,8 +836,6 @@ public void bindIntervalArrayEmpty() { @Test public void bindIntervalArrayNull() { - assumeFalse( - "INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").toIntervalArray(null), @@ -880,7 +846,6 @@ public void bindIntervalArrayNull() { @Test public void bindNumericArrayGoogleStandardSQL() { assumeTrue(dialect.dialect == Dialect.GOOGLE_STANDARD_SQL); - assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator()); BigDecimal b1 = new BigDecimal("3.14"); BigDecimal b2 = new BigDecimal("6.626"); @@ -895,7 +860,6 @@ public void bindNumericArrayGoogleStandardSQL() { @Test public void bindNumericArrayPostgreSQL() { assumeTrue(dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery) @@ -909,7 +873,6 @@ public void bindNumericArrayPostgreSQL() { @Test public void bindNumericArrayEmptyGoogleStandardSQL() { assumeTrue(dialect.dialect == Dialect.GOOGLE_STANDARD_SQL); - assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery) @@ -923,7 +886,6 @@ public void bindNumericArrayEmptyGoogleStandardSQL() { @Test public void bindNumericArrayEmptyPostgreSQL() { assumeTrue(dialect.dialect == Dialect.POSTGRESQL); - assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator()); Struct row = execute( Statement.newBuilder(selectValueQuery)