diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITNightlyBigQueryTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITNightlyBigQueryTest.java index 8d51cf08df9f..bf011b9446f8 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITNightlyBigQueryTest.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITNightlyBigQueryTest.java @@ -1133,8 +1133,9 @@ public void testValidAllDataTypesSerializationFromSelectQueryArrowDataset() thro assertEquals("{\"name\":\"Eric\",\"age\":10}", expectedStruct.toString()); assertArrayEquals( new String[] {"one", "two", "three"}, (String[]) resultSet.getArray(9).getArray()); - assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getObject(10)); - assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getTimestamp(10)); + Timestamp expectedTimestamp = Timestamp.from(Instant.parse("2020-04-27T18:07:25.356Z")); + assertEquals(expectedTimestamp, resultSet.getObject(10)); + assertEquals(expectedTimestamp, resultSet.getTimestamp(10)); assertEquals(Date.valueOf("2019-1-12"), resultSet.getObject(11)); assertEquals(Date.valueOf("2019-1-12"), resultSet.getDate(11)); assertEquals(Time.valueOf("14:00:00"), resultSet.getObject(12)); diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITPSCBigQueryTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITPSCBigQueryTest.java index aa62a7cf3d7a..592e2811c5b9 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITPSCBigQueryTest.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITPSCBigQueryTest.java @@ -40,6 +40,7 @@ import java.sql.Struct; import java.sql.Time; import java.sql.Timestamp; +import java.time.Instant; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -198,7 +199,8 @@ public void testValidAllDataTypesSerializationFromSelectQueryInPSC() throws SQLE assertArrayEquals( new String[] {"one", "two", "three"}, (String[]) resultSet.getArray(9).getArray()); - assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356456"), resultSet.getObject(10)); + Timestamp expectedTimestamp = Timestamp.from(Instant.parse("2020-04-27T18:07:25.356456Z")); + assertEquals(expectedTimestamp, resultSet.getObject(10)); assertEquals(Date.valueOf("2019-1-12"), resultSet.getObject(11)); assertEquals(Time.valueOf("14:00:00"), resultSet.getObject(12)); assertEquals(Timestamp.valueOf("2019-02-17 11:24:00"), resultSet.getObject(13)); @@ -245,8 +247,9 @@ public void testValidAllDataTypesSerializationFromSelectQueryArrowDatasetInPSC() assertEquals("{\"v\":{\"f\":[{\"v\":\"Eric\"},{\"v\":\"10\"}]}}", expectedStruct.toString()); assertArrayEquals( new String[] {"one", "two", "three"}, (String[]) resultSet.getArray(9).getArray()); - assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getObject(10)); - assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getTimestamp(10)); + Timestamp expectedTimestamp = Timestamp.from(Instant.parse("2020-04-27T18:07:25.356Z")); + assertEquals(expectedTimestamp, resultSet.getObject(10)); + assertEquals(expectedTimestamp, resultSet.getTimestamp(10)); assertEquals(Date.valueOf("2019-1-12"), resultSet.getObject(11)); assertEquals(Date.valueOf("2019-1-12"), resultSet.getDate(11)); assertEquals(Time.valueOf("14:00:00"), resultSet.getObject(12));