Skip to content

Commit 74ad439

Browse files
surbhigarg92surbhigarg92
authored
Merge branch 'main' into revert-3818-revert-3724-afe_metric
2 parents 128d325 + bafa0bb commit 74ad439

File tree

2 files changed

+0
-51
lines changed

2 files changed

+0
-51
lines changed

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITIntervalTest.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
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.assertTrue;
22-
import static org.junit.Assume.assumeFalse;
23-
import static org.junit.Assume.assumeTrue;
2421

2522
import com.google.cloud.Timestamp;
2623
import com.google.cloud.spanner.*;
@@ -29,7 +26,6 @@
2926
import java.util.Arrays;
3027
import java.util.Collections;
3128
import java.util.List;
32-
import java.util.Objects;
3329
import java.util.concurrent.ExecutionException;
3430
import java.util.concurrent.TimeoutException;
3531
import org.junit.AfterClass;
@@ -83,18 +79,9 @@ public static List<DialectTestParameter> data() {
8379

8480
private static DatabaseClient client;
8581

86-
private static boolean isUsingCloudDevel() {
87-
return Objects.equals(
88-
System.getProperty("spanner.gce.config.server_url"),
89-
"https://staging-wrenchworks.sandbox.googleapis.com");
90-
}
91-
9282
@BeforeClass
9383
public static void setUpDatabase()
9484
throws ExecutionException, InterruptedException, TimeoutException {
95-
assumeTrue("INTERVAL is supported only in Cloud-Devel for now", isUsingCloudDevel());
96-
assumeFalse("INTERVAL is not yet supported on Emulator", isUsingEmulator());
97-
9885
Database googleStandardSQLDatabase =
9986
env.getTestHelper().createTestDatabase(GOOGLE_STANDARD_SQL_SCHEMA);
10087
googleStandardSQLClient = env.getTestHelper().getDatabaseClient(googleStandardSQLDatabase);

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@ private static boolean isUsingCloudDevel() {
267267

268268
@Test
269269
public void bindFloat32() {
270-
assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator());
271-
assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel());
272-
273270
Struct row =
274271
execute(Statement.newBuilder(selectValueQuery).bind("p1").to(2.0f), Type.float32());
275272
assertThat(row.isNull(0)).isFalse();
@@ -278,9 +275,6 @@ public void bindFloat32() {
278275

279276
@Test
280277
public void bindFloat32Null() {
281-
assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator());
282-
assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel());
283-
284278
Struct row =
285279
execute(Statement.newBuilder(selectValueQuery).bind("p1").to((Float) null), Type.float32());
286280
assertThat(row.isNull(0)).isTrue();
@@ -342,7 +336,6 @@ public void bindStringNull() {
342336
@Test
343337
public void bindJson() {
344338
assumeFalse("JSON are not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL);
345-
assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator());
346339
Struct row =
347340
execute(
348341
Statement.newBuilder(selectValueQuery)
@@ -356,7 +349,6 @@ public void bindJson() {
356349
@Test
357350
public void bindJsonEmpty() {
358351
assumeFalse("JSON are not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL);
359-
assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator());
360352
Struct row =
361353
execute(
362354
Statement.newBuilder(selectValueQuery).bind("p1").to(Value.json("{}")), Type.json());
@@ -367,7 +359,6 @@ public void bindJsonEmpty() {
367359
@Test
368360
public void bindJsonNull() {
369361
assumeFalse("JSON is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL);
370-
assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator());
371362
Struct row =
372363
execute(
373364
Statement.newBuilder(selectValueQuery).bind("p1").to(Value.json(null)), Type.json());
@@ -426,8 +417,6 @@ public void bindDateNull() {
426417

427418
@Test
428419
public void bindInterval() {
429-
assumeFalse(
430-
"INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator());
431420
Interval d = Interval.parseFromString("P1Y2M3DT4H5M6.789123S");
432421
Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(d), Type.interval());
433422
assertThat(row.isNull(0)).isFalse();
@@ -436,8 +425,6 @@ public void bindInterval() {
436425

437426
@Test
438427
public void bindIntervalNull() {
439-
assumeFalse(
440-
"INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator());
441428
Struct row =
442429
execute(
443430
Statement.newBuilder(selectValueQuery).bind("p1").to((Interval) null), Type.interval());
@@ -446,7 +433,6 @@ public void bindIntervalNull() {
446433

447434
@Test
448435
public void bindNumeric() {
449-
assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator());
450436
BigDecimal b = new BigDecimal("1.1");
451437
Statement.Builder statement = Statement.newBuilder(selectValueQuery);
452438
Type expectedType = Type.numeric();
@@ -471,7 +457,6 @@ public void bindNumeric() {
471457

472458
@Test
473459
public void bindNumericNull() {
474-
assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator());
475460
Statement.Builder statement = Statement.newBuilder(selectValueQuery);
476461
Type expectedType = Type.numeric();
477462
if (dialect.dialect == Dialect.POSTGRESQL) {
@@ -486,7 +471,6 @@ public void bindNumericNull() {
486471

487472
@Test
488473
public void bindNumeric_doesNotPreservePrecision() {
489-
assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator());
490474
BigDecimal b = new BigDecimal("1.10");
491475
Statement.Builder statement = Statement.newBuilder(selectValueQuery);
492476
Type expectedType = Type.numeric();
@@ -574,9 +558,6 @@ public void bindInt64ArrayNull() {
574558

575559
@Test
576560
public void bindFloat32Array() {
577-
assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator());
578-
assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel());
579-
580561
Struct row =
581562
execute(
582563
Statement.newBuilder(selectValueQuery)
@@ -599,9 +580,6 @@ public void bindFloat32Array() {
599580

600581
@Test
601582
public void bindFloat32ArrayEmpty() {
602-
assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator());
603-
assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel());
604-
605583
Struct row =
606584
execute(
607585
Statement.newBuilder(selectValueQuery)
@@ -614,9 +592,6 @@ public void bindFloat32ArrayEmpty() {
614592

615593
@Test
616594
public void bindFloat32ArrayNull() {
617-
assumeFalse("Emulator does not support FLOAT32 yet", isUsingEmulator());
618-
assumeTrue("FLOAT32 is currently only supported in cloud-devel", isUsingCloudDevel());
619-
620595
Struct row =
621596
execute(
622597
Statement.newBuilder(selectValueQuery).bind("p1").toFloat32Array((float[]) null),
@@ -702,7 +677,6 @@ public void bindStringArrayNull() {
702677
public void bindJsonArray() {
703678
assumeFalse(
704679
"array JSON binding is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL);
705-
assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator());
706680
Struct row =
707681
execute(
708682
Statement.newBuilder(selectValueQuery)
@@ -718,7 +692,6 @@ public void bindJsonArray() {
718692
@Test
719693
public void bindJsonArrayEmpty() {
720694
assumeFalse("JSON is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL);
721-
assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator());
722695
Struct row =
723696
execute(
724697
Statement.newBuilder(selectValueQuery).bind("p1").toJsonArray(Collections.emptyList()),
@@ -730,7 +703,6 @@ public void bindJsonArrayEmpty() {
730703
@Test
731704
public void bindJsonArrayNull() {
732705
assumeFalse("JSON is not supported on POSTGRESQL", dialect.dialect == Dialect.POSTGRESQL);
733-
assumeFalse("Emulator does not yet support JSON", EmulatorSpannerHelper.isUsingEmulator());
734706
Struct row =
735707
execute(
736708
Statement.newBuilder(selectValueQuery).bind("p1").toJsonArray(null),
@@ -840,8 +812,6 @@ public void bindDateArrayNull() {
840812

841813
@Test
842814
public void bindIntervalArray() {
843-
assumeFalse(
844-
"INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator());
845815
Interval d1 = Interval.parseFromString("P-1Y-2M-3DT4H5M6.789123S");
846816
Interval d2 = Interval.parseFromString("P1Y2M3DT-4H-5M-6.789123S");
847817
Struct row =
@@ -854,8 +824,6 @@ public void bindIntervalArray() {
854824

855825
@Test
856826
public void bindIntervalArrayEmpty() {
857-
assumeFalse(
858-
"INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator());
859827
Struct row =
860828
execute(
861829
Statement.newBuilder(selectValueQuery)
@@ -868,8 +836,6 @@ public void bindIntervalArrayEmpty() {
868836

869837
@Test
870838
public void bindIntervalArrayNull() {
871-
assumeFalse(
872-
"INTERVAL is not yet supported on Emulator", EmulatorSpannerHelper.isUsingEmulator());
873839
Struct row =
874840
execute(
875841
Statement.newBuilder(selectValueQuery).bind("p1").toIntervalArray(null),
@@ -880,7 +846,6 @@ public void bindIntervalArrayNull() {
880846
@Test
881847
public void bindNumericArrayGoogleStandardSQL() {
882848
assumeTrue(dialect.dialect == Dialect.GOOGLE_STANDARD_SQL);
883-
assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator());
884849
BigDecimal b1 = new BigDecimal("3.14");
885850
BigDecimal b2 = new BigDecimal("6.626");
886851

@@ -895,7 +860,6 @@ public void bindNumericArrayGoogleStandardSQL() {
895860
@Test
896861
public void bindNumericArrayPostgreSQL() {
897862
assumeTrue(dialect.dialect == Dialect.POSTGRESQL);
898-
assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator());
899863
Struct row =
900864
execute(
901865
Statement.newBuilder(selectValueQuery)
@@ -909,7 +873,6 @@ public void bindNumericArrayPostgreSQL() {
909873
@Test
910874
public void bindNumericArrayEmptyGoogleStandardSQL() {
911875
assumeTrue(dialect.dialect == Dialect.GOOGLE_STANDARD_SQL);
912-
assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator());
913876
Struct row =
914877
execute(
915878
Statement.newBuilder(selectValueQuery)
@@ -923,7 +886,6 @@ public void bindNumericArrayEmptyGoogleStandardSQL() {
923886
@Test
924887
public void bindNumericArrayEmptyPostgreSQL() {
925888
assumeTrue(dialect.dialect == Dialect.POSTGRESQL);
926-
assumeFalse("Emulator does not yet support NUMERIC", EmulatorSpannerHelper.isUsingEmulator());
927889
Struct row =
928890
execute(
929891
Statement.newBuilder(selectValueQuery)

0 commit comments

Comments
 (0)