Fixed the utility to put week date to previous (instead of next) Mond…

…ay when current day is Sunday
vsadokhin · Sep 30, 2018 · dced873 · dced873
1 parent aa29923
commit dced873
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/data/src/main/java/me/vsadokhin/iot/data/utility/DateUtility.java b/data/src/main/java/me/vsadokhin/iot/data/utility/DateUtility.java
@@ -3,6 +3,7 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Calendar;
+import java.util.Locale;
 import java.util.TimeZone;
 
 public final class DateUtility {
@@ -14,7 +15,7 @@ public static long getDayStart(long milliseconds) {
     }
 
     public static long getWeekStart(long milliseconds) {
-        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.UK);
         calendar.setTimeInMillis(milliseconds);
         calendar.set(Calendar.MILLISECOND, 0);
         calendar.set(Calendar.SECOND, 0);

diff --git a/data/src/test/java/me/vsadokhin/iot/data/utility/DateUtilityTest.java b/data/src/test/java/me/vsadokhin/iot/data/utility/DateUtilityTest.java
@@ -9,6 +9,7 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.junit.Test;
@@ -34,7 +35,7 @@ public void getDayStart() {
     }
 
     @Test
-    public void getWeekStart() {
+    public void getWeekStart_checkResultIsMondayMidnight() {
         // setup
         Instant instant = LocalDate.of(2018, 9, 29).atStartOfDay().toInstant(ZoneOffset.UTC);
 
@@ -44,4 +45,17 @@ public void getWeekStart() {
         // verify
         assertThat(result, is(ZonedDateTime.of(2018,9,24,0,0,0,0,ZoneId.of("UTC")).toInstant().toEpochMilli()));
     }
+
+    @Test
+    public void getWeekStart_sundayCornerCase_checkWeekStartIsStillMondayMidnight() {
+        // setup
+        Instant instant = LocalDate.of(2018, 9, 30).atStartOfDay().toInstant(ZoneOffset.UTC);
+
+        // act
+        long result = DateUtility.getWeekStart(instant.toEpochMilli());
+
+        // verify
+        System.out.println(new Date(result));
+        assertThat(result, is(ZonedDateTime.of(2018,9,24,0,0,0,0,ZoneId.of("UTC")).toInstant().toEpochMilli()));
+    }
 }