FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: Timestamp.of(java.sql.Timestamp) pre-epoch on exact second by olavloite · Pull Request #179 · googleapis/java-core · GitHub

This repository was archived by the owner on Dec 3, 2023. It is now read-only.
/ java-core Public archive

fix: Timestamp.of(java.sql.Timestamp) pre-epoch on exact second #179

Merged
chingor13 merged 4 commits into from
Mar 12, 2020
Conversation 20 Commits 4 Checks 0 Files changed
Merged

fix: Timestamp.of(java.sql.Timestamp) pre-epoch on exact second #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e10e4c0
fix: Timestamp.of(java.sql.Timestamp) pre-epoch on exact second
olavloite Mar 12, 2020
9bdd7f1
fix: review comments
olavloite Mar 12, 2020
7fb96d8
fix: review comments
olavloite Mar 12, 2020
b9e2161
fix: make all testOf method consistent
olavloite Mar 12, 2020
File filter

Filter by extension

Filter by extension .java  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
10 changes: 5 additions & 5 deletions google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ public static Timestamp now() {
public static Timestamp of(java.sql.Timestamp timestamp) {
int nanos = timestamp.getNanos();

// A pre-epoch timestamp will be off by one second because of the way that integer division
// works. For example, -1001 / 1000 == -1. In this case of timestamps, we want this result to be
// -2. This causes any pre-epoch timestamp to be off by 1 second - fix this by adjusting the
// seconds value by 1 if the timestamp < 0.
// A pre-epoch timestamp can be off by one second because of the way that integer division
// works. For example, -1001 / 1000 == -1. In this case, we want this result to be -2. This
// causes any pre-epoch timestamp to be off by 1 second - fix this by subtracting 1 from the
// seconds value if the seconds value is less than zero and is not divisible by 1000.
// TODO: replace with Math.floorDiv when we drop Java 7 support
long seconds = timestamp.getTime() / 1000;
if (seconds < 0) {
if (seconds < 0 && timestamp.getTime() % 1000 != 0) {
--seconds;
}

Expand Down
29 changes: 23 additions & 6 deletions google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static com.google.common.testing.SerializableTester.reserializeAndAssert;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import com.google.common.testing.EqualsTester;
Expand Down Expand Up @@ -81,27 +82,43 @@ public void ofDate() {
}

@Test
public void ofSqlTimestamp() {
public void testOf() {
String expectedTimestampString = "1970-01-01T00:00:12.345000000Z";
java.sql.Timestamp input = new java.sql.Timestamp(12345);
Timestamp timestamp = Timestamp.of(input);
assertThat(timestamp.toString()).isEqualTo(expectedTimestampString);
assertEquals(timestamp.toString(), expectedTimestampString);
}

@Test
public void ofSqlTimestampPreEpoch() {
public void testOf_exactSecond() {
String expectedTimestampString = "1970-01-01T00:00:12Z";
java.sql.Timestamp input = new java.sql.Timestamp(12000);
Timestamp timestamp = Timestamp.of(input);
assertEquals(timestamp.toString(), expectedTimestampString);
}

@Test
public void testOf_preEpoch() {
String expectedTimestampString = "1969-12-31T23:59:47.655000000Z";
java.sql.Timestamp input = new java.sql.Timestamp(-12345);
Timestamp timestamp = Timestamp.of(input);
assertThat(timestamp.toString()).isEqualTo(expectedTimestampString);
assertEquals(timestamp.toString(), expectedTimestampString);
}

@Test
public void ofSqlTimestampOnEpoch() {
public void testOf_onEpoch() {
String expectedTimestampString = "1970-01-01T00:00:00Z";
java.sql.Timestamp input = new java.sql.Timestamp(0);
Timestamp timestamp = Timestamp.of(input);
assertThat(timestamp.toString()).isEqualTo(expectedTimestampString);
assertEquals(timestamp.toString(), expectedTimestampString);
}

@Test
public void testOf_preEpochExactSecond() {
String expectedTimestampString = "1969-12-31T23:59:59Z";
java.sql.Timestamp input = new java.sql.Timestamp(-1000);
Timestamp timestamp = Timestamp.of(input);
assertEquals(timestamp.toString(), expectedTimestampString);
}

@Test
Expand Down
Back | FazBrowse Home | New Git URL