From 12bdfe297d6166a132714239deee31bf73fb974f Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Mon, 19 Jan 2026 11:17:38 +0530 Subject: [PATCH 1/4] test:Enable Integration Tests for UUID in Production and Emulator --- .../google/cloud/spanner/it/ITQueryTest.java | 25 ------------------- .../google/cloud/spanner/it/ITUuidTest.java | 4 --- 2 files changed, 29 deletions(-) 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 4a21af49aaa..eb3f1b00edd 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 @@ -428,11 +428,6 @@ public void bindDateNull() { @Test public void bindUuid() { - // TODO: Remove once it is enabled in emulator. - assumeFalse("Emulator does not support UUID yet", isUsingEmulator()); - // TODO: Remove once it is enabled in production universe. - assumeTrue("UUID is currently only supported in cloud-devel", isUsingCloudDevel()); - UUID uuid = UUID.randomUUID(); Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(uuid), Type.uuid()); assertThat(row.isNull(0)).isFalse(); @@ -441,11 +436,6 @@ public void bindUuid() { @Test public void bindUuidNull() { - // TODO: Remove once it is enabled in emulator. - assumeFalse("Emulator does not support UUID yet", isUsingEmulator()); - // TODO: Remove once it is enabled in production universe. - assumeTrue("UUID is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to((UUID) null), Type.uuid()); assertThat(row.isNull(0)).isTrue(); @@ -848,11 +838,6 @@ public void bindDateArrayNull() { @Test public void bindUuidArray() { - // TODO: Remove once it is enabled in emulator. - assumeFalse("Emulator does not support UUID yet", isUsingEmulator()); - // TODO: Remove once it is enabled in production universe. - assumeTrue("UUID is currently only supported in cloud-devel", isUsingCloudDevel()); - UUID u1 = UUID.randomUUID(); UUID u2 = UUID.randomUUID(); @@ -866,11 +851,6 @@ public void bindUuidArray() { @Test public void bindUuidArrayEmpty() { - // TODO: Remove once it is enabled in emulator. - assumeFalse("Emulator does not support UUID yet", isUsingEmulator()); - // TODO: Remove once it is enabled in production universe. - assumeTrue("UUID is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").toUuidArray(Collections.emptyList()), @@ -881,11 +861,6 @@ public void bindUuidArrayEmpty() { @Test public void bindUuidArrayNull() { - // TODO: Remove once it is enabled in emulator. - assumeFalse("Emulator does not support UUID yet", isUsingEmulator()); - // TODO: Remove once it is enabled in production universe. - assumeTrue("UUID is currently only supported in cloud-devel", isUsingCloudDevel()); - Struct row = execute( Statement.newBuilder(selectValueQuery).bind("p1").toUuidArray(null), diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java index 561602abfe2..987092905ae 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java @@ -71,13 +71,9 @@ private static boolean isUsingCloudDevel() { @Parameterized.Parameters(name = "Dialect = {0}") public static List data() { - // TODO: Remove once it is enabled in production universe. - if (isUsingCloudDevel()) { return Arrays.asList( new DialectTestParameter(Dialect.GOOGLE_STANDARD_SQL), new DialectTestParameter(Dialect.POSTGRESQL)); - } - return Collections.emptyList(); } @Parameterized.Parameter() public DialectTestParameter dialect; From 2a5e173e02385e6deaafc1b8aac29a7b6ba249d9 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Mon, 19 Jan 2026 11:24:15 +0530 Subject: [PATCH 2/4] refactor: delete unused function --- .../test/java/com/google/cloud/spanner/it/ITUuidTest.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java index 987092905ae..82d68aec2cb 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java @@ -61,14 +61,6 @@ public class ITUuidTest { @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv(); - private static boolean isUsingCloudDevel() { - String jobType = System.getenv("JOB_TYPE"); - - // Assumes that the jobType contains the string "cloud-devel" to signal that - // the environment is cloud-devel. - return !isNullOrEmpty(jobType) && jobType.contains("cloud-devel"); - } - @Parameterized.Parameters(name = "Dialect = {0}") public static List data() { return Arrays.asList( From e3f051b78e75c2b7476fa08e36bd6db3b7ee5b15 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Mon, 19 Jan 2026 11:39:04 +0530 Subject: [PATCH 3/4] style:fix intentation --- .../test/java/com/google/cloud/spanner/it/ITUuidTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java index 82d68aec2cb..ea0ad2c6a83 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java @@ -63,9 +63,9 @@ public class ITUuidTest { @Parameterized.Parameters(name = "Dialect = {0}") public static List data() { - return Arrays.asList( - new DialectTestParameter(Dialect.GOOGLE_STANDARD_SQL), - new DialectTestParameter(Dialect.POSTGRESQL)); + return Arrays.asList( + new DialectTestParameter(Dialect.GOOGLE_STANDARD_SQL), + new DialectTestParameter(Dialect.POSTGRESQL)); } @Parameterized.Parameter() public DialectTestParameter dialect; From bd6b703a0fa2e3cc3d423f657628e930c4de7d59 Mon Sep 17 00:00:00 2001 From: Gagan Gupta Date: Mon, 19 Jan 2026 12:27:40 +0530 Subject: [PATCH 4/4] chore: Remove unused `isNullOrEmpty` import from `ITUuidTest.java`. --- .../src/test/java/com/google/cloud/spanner/it/ITUuidTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java index ea0ad2c6a83..7bec70930c7 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java @@ -16,7 +16,6 @@ package com.google.cloud.spanner.it; -import static com.google.common.base.Strings.isNullOrEmpty; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue;