test: update tests to consistently truncate OffsetDateTime instances to account for differing precision on java11+ (#3183)

Author: BenWhitehead

google-cloud-storage/src/test/java/com/google/cloud/storage/ITExtraHeadersOptionTest.java

@@ -56,6 +56,7 @@
 import java.time.Clock;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -316,7 +317,9 @@ public void batch() throws Exception {
     batch.submit();
     assertAll(
         () -> assertThat(r1).isNotNull(),
-        () -> assertThat(r2.get().getCustomTimeOffsetDateTime()).isEqualTo(now),
+        () ->
+            assertThat(r2.get().getCustomTimeOffsetDateTime().truncatedTo(ChronoUnit.MILLIS))
+                .isEqualTo(now.truncatedTo(ChronoUnit.MILLIS)),
         () -> assertThat(r3.get()).isTrue(),
         () -> {
           IterableSubject subject = headers.assertRequestHeader(batchHeaderKey);

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBatchTest.java

@@ -48,6 +48,7 @@
 import java.time.Clock;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -238,15 +239,17 @@ public void batchSuccessiveUpdatesWork() {
                 })
             .collect(Collectors.toList());
 
-    OffsetDateTime now1 = Clock.systemUTC().instant().atOffset(ZoneOffset.UTC);
+    OffsetDateTime now1 =
+        Clock.systemUTC().instant().atOffset(ZoneOffset.UTC).truncatedTo(ChronoUnit.MILLIS);
 
     List<Blob> update1 =
         storage.update(
             blobs.stream()
                 .map(id -> BlobInfo.newBuilder(id).setCustomTimeOffsetDateTime(now1).build())
                 .collect(Collectors.toList()));
 
-    OffsetDateTime now2 = Clock.systemUTC().instant().atOffset(ZoneOffset.UTC);
+    OffsetDateTime now2 =
+        Clock.systemUTC().instant().atOffset(ZoneOffset.UTC).truncatedTo(ChronoUnit.MILLIS);
     List<Blob> update2 =
         storage.update(
             blobs.stream()
@@ -255,7 +258,10 @@ public void batchSuccessiveUpdatesWork() {
 
     assertThat(
             update2.stream()
-                .filter(b -> !now2.equals(b.getCustomTimeOffsetDateTime()))
+                .filter(
+                    b ->
+                        !now2.equals(
+                            b.getCustomTimeOffsetDateTime().truncatedTo(ChronoUnit.MILLIS)))
                 .map(BlobInfo::getBlobId)
                 .map(BlobId::toGsUtilUriWithGeneration)
                 .collect(Collectors.toList()))

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITHttpIdempotencyTokenTest.java

@@ -47,6 +47,7 @@
 import java.time.Clock;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -206,7 +207,9 @@ public void batch() throws Exception {
     batch.submit();
     assertAll(
         () -> assertThat(r1).isNotNull(),
-        () -> assertThat(r2.get().getCustomTimeOffsetDateTime()).isEqualTo(now),
+        () ->
+            assertThat(r2.get().getCustomTimeOffsetDateTime().truncatedTo(ChronoUnit.MILLIS))
+                .isEqualTo(now.truncatedTo(ChronoUnit.MILLIS)),
         () -> assertThat(r3.get()).isTrue(),
         () -> {
           IterableSubject subject =