Skip to content

chore: Enables launched types in all tests #3824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 23, 2025
Merged

chore: Enables launched types in all tests #3824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9746d61
Enable launched types in all tests
Apr 16, 2025
6bdfb23
Merge branch 'main' into enable_launched_types_in_tests
sagarwaal Apr 16, 2025
01316d3
formatting fix
Apr 16, 2025
14b0da6
Merge branch 'main' into enable_launched_types_in_tests
rahul2393 Apr 21, 2025
8f432ad
Merge branch 'main' into enable_launched_types_in_tests
sagarwaal Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITIntervalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand All @@ -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;
Expand Down Expand Up @@ -83,18 +79,9 @@ public static List<DialectTestParameter> 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);
Expand Down
38 changes: 0 additions & 38 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -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)
Expand All @@ -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());
Expand All @@ -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());
Expand Down Expand Up @@ -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();
Expand All @@ -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());
Expand All @@ -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();
Expand All @@ -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) {
Expand All @@ -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();
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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),
Expand Down Expand Up @@ -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)
Expand All @@ -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()),
Expand All @@ -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),
Expand Down Expand Up @@ -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 =
Expand All @@ -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)
Expand All @@ -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),
Expand All @@ -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");

Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
Loading