From b8f77dc9a67c0b60574ba5b3d922cf21f7c2d787 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sun, 27 Sep 2020 08:21:24 +0200 Subject: [PATCH] replace custom timezones with UTC we are only using UTC --- .../lucares/utils/LongToDateBucketTest.java | 29 ++++--------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/pdb-utils/src/test/java/org/lucares/utils/LongToDateBucketTest.java b/pdb-utils/src/test/java/org/lucares/utils/LongToDateBucketTest.java index 495c62a..314fd6d 100644 --- a/pdb-utils/src/test/java/org/lucares/utils/LongToDateBucketTest.java +++ b/pdb-utils/src/test/java/org/lucares/utils/LongToDateBucketTest.java @@ -54,30 +54,11 @@ public class LongToDateBucketTest { Assertions.assertEquals(expected, actual); } -// @Test -// public void testDateToDateIndexPrefix() { -// -// final long mid_201711 = OffsetDateTime.of(2017, 11, 23, 2, 2, 2, 0, ZoneOffset.UTC).toInstant().toEpochMilli(); -// final long mid_201712 = OffsetDateTime.of(2017, 12, 7, 1, 1, 1, 0, ZoneOffset.UTC).toInstant().toEpochMilli(); -// final long min_201801 = OffsetDateTime.of(2018, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC).toInstant().toEpochMilli(); -// final long max_201801 = OffsetDateTime.of(2018, 1, 31, 23, 59, 59, 999_999_999, ZoneOffset.UTC).toInstant() -// .toEpochMilli(); -// final LongToDateBucket longToDateBucket = new LongToDateBucket("yyyyMM"); -// -// Assertions.assertEquals("201712", longToDateBucket.toDateIndexPrefix(mid_201712)); -// Assertions.assertEquals("201801", longToDateBucket.toDateIndexPrefix(min_201801)); -// Assertions.assertEquals("201801", longToDateBucket.toDateIndexPrefix(max_201801)); -// Assertions.assertEquals("201711", longToDateBucket.toDateIndexPrefix(mid_201711)); -// } - @Test public void testDateRanges() { - final OffsetDateTime mid_201712 = OffsetDateTime.of(2017, 12, 7, 1, 1, 1, 0, ZoneOffset.UTC) - .withOffsetSameInstant(ZoneOffset.ofHours(-2)); - final OffsetDateTime min_201801 = OffsetDateTime.of(2018, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC) - .withOffsetSameInstant(ZoneOffset.ofHours(-8)); - final OffsetDateTime min_201802 = OffsetDateTime.of(2018, 2, 1, 0, 0, 0, 0, ZoneOffset.UTC) - .withOffsetSameInstant(ZoneOffset.ofHours(12)); + final OffsetDateTime mid_201712 = OffsetDateTime.of(2017, 12, 7, 1, 1, 1, 0, ZoneOffset.UTC); + final OffsetDateTime min_201801 = OffsetDateTime.of(2018, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC); + final OffsetDateTime min_201802 = OffsetDateTime.of(2018, 2, 1, 0, 0, 0, 0, ZoneOffset.UTC); final LongToDateBucket longToDateBucket = new LongToDateBucket("yyyyMM", ChronoUnit.MONTHS); @@ -96,8 +77,8 @@ public class LongToDateBucketTest { @Test public void testDateRangeToEpochMilli() { - final OffsetDateTime mid_201712 = OffsetDateTime.of(2017, 12, 7, 1, 1, 1, 0, ZoneOffset.ofHours(3)); - final OffsetDateTime min_201802 = OffsetDateTime.of(2018, 2, 15, 0, 0, 0, 0, ZoneOffset.ofHours(7)); + final OffsetDateTime mid_201712 = OffsetDateTime.of(2017, 12, 7, 1, 1, 1, 0, ZoneOffset.UTC); + final OffsetDateTime min_201802 = OffsetDateTime.of(2018, 2, 15, 0, 0, 0, 0, ZoneOffset.UTC); final long exp_201712 = OffsetDateTime.of(2017, 12, 1, 0, 0, 0, 0, ZoneOffset.UTC).toInstant().toEpochMilli(); final long exp_201801 = OffsetDateTime.of(2018, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC).toInstant().toEpochMilli();