Skip to content

Commit 533ba14

Browse files
authored
fix(bigquery-jdbc): fix Timestamp assertions (#14290)
1 parent 4426ccd commit 533ba14

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

‎java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITNightlyBigQueryTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,8 +1133,9 @@ public void testValidAllDataTypesSerializationFromSelectQueryArrowDataset() thro
11331133
assertEquals("{\"name\":\"Eric\",\"age\":10}", expectedStruct.toString());
11341134
assertArrayEquals(
11351135
new String[] {"one", "two", "three"}, (String[]) resultSet.getArray(9).getArray());
1136-
assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getObject(10));
1137-
assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getTimestamp(10));
1136+
Timestamp expectedTimestamp = Timestamp.from(Instant.parse("2020-04-27T18:07:25.356Z"));
1137+
assertEquals(expectedTimestamp, resultSet.getObject(10));
1138+
assertEquals(expectedTimestamp, resultSet.getTimestamp(10));
11381139
assertEquals(Date.valueOf("2019-1-12"), resultSet.getObject(11));
11391140
assertEquals(Date.valueOf("2019-1-12"), resultSet.getDate(11));
11401141
assertEquals(Time.valueOf("14:00:00"), resultSet.getObject(12));

‎java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITPSCBigQueryTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.sql.Struct;
4141
import java.sql.Time;
4242
import java.sql.Timestamp;
43+
import java.time.Instant;
4344
import java.util.Properties;
4445
import org.junit.jupiter.api.Test;
4546

@@ -198,7 +199,8 @@ public void testValidAllDataTypesSerializationFromSelectQueryInPSC() throws SQLE
198199
assertArrayEquals(
199200
new String[] {"one", "two", "three"}, (String[]) resultSet.getArray(9).getArray());
200201

201-
assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356456"), resultSet.getObject(10));
202+
Timestamp expectedTimestamp = Timestamp.from(Instant.parse("2020-04-27T18:07:25.356456Z"));
203+
assertEquals(expectedTimestamp, resultSet.getObject(10));
202204
assertEquals(Date.valueOf("2019-1-12"), resultSet.getObject(11));
203205
assertEquals(Time.valueOf("14:00:00"), resultSet.getObject(12));
204206
assertEquals(Timestamp.valueOf("2019-02-17 11:24:00"), resultSet.getObject(13));
@@ -245,8 +247,9 @@ public void testValidAllDataTypesSerializationFromSelectQueryArrowDatasetInPSC()
245247
assertEquals("{\"v\":{\"f\":[{\"v\":\"Eric\"},{\"v\":\"10\"}]}}", expectedStruct.toString());
246248
assertArrayEquals(
247249
new String[] {"one", "two", "three"}, (String[]) resultSet.getArray(9).getArray());
248-
assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getObject(10));
249-
assertEquals(Timestamp.valueOf("2020-04-27 18:07:25.356"), resultSet.getTimestamp(10));
250+
Timestamp expectedTimestamp = Timestamp.from(Instant.parse("2020-04-27T18:07:25.356Z"));
251+
assertEquals(expectedTimestamp, resultSet.getObject(10));
252+
assertEquals(expectedTimestamp, resultSet.getTimestamp(10));
250253
assertEquals(Date.valueOf("2019-1-12"), resultSet.getObject(11));
251254
assertEquals(Date.valueOf("2019-1-12"), resultSet.getDate(11));
252255
assertEquals(Time.valueOf("14:00:00"), resultSet.getObject(12));

0 commit comments

Comments
 (0)