From c12a6c6a4d3d398d73b6889dc29f23e74d05c14b Mon Sep 17 00:00:00 2001
From: sgallese <sebastiangallese@gmail.com>
Date: Wed, 22 Sep 2021 19:48:30 -0700
Subject: [PATCH] Complete tests for DateUtils, move internal functions to
 private

---
 .../org/isoron/uhabits/core/utils/DateUtils.kt  | 11 ++---------
 .../isoron/uhabits/core/utils/DateUtilsTest.kt  | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt
index e812bc2ca..8fe65ce9d 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt
@@ -214,13 +214,7 @@ abstract class DateUtils {
         @JvmStatic
         fun getStartOfTodayCalendarWithOffset(): GregorianCalendar = getCalendar(getStartOfTodayWithOffset())
 
-        @JvmStatic
-        fun getTimeZone(): TimeZone {
-            return fixedTimeZone ?: TimeZone.getDefault()
-        }
-
-        @JvmStatic
-        fun getTimezone(): TimeZone {
+        private fun getTimeZone(): TimeZone {
             return fixedTimeZone ?: TimeZone.getDefault()
         }
 
@@ -236,8 +230,7 @@ abstract class DateUtils {
             startDayMinuteOffset = minuteOffset
         }
 
-        @JvmStatic
-        fun getLocale(): Locale {
+        private fun getLocale(): Locale {
             return fixedLocale ?: Locale.getDefault()
         }
 
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
index a3388b4f7..9076c27d4 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
@@ -274,6 +274,23 @@ class DateUtilsTest : BaseUnitTest() {
         assertThat(truncate(field, t2, firstWeekday), equalTo(expected))
     }
 
+    @Test
+    fun testTruncate_timestamp() {
+        val field = DateUtils.TruncateField.YEAR
+        val nonTruncatedDate = unixTime(2016, Calendar.MAY, 30)
+        val expected = Timestamp(unixTime(2016, Calendar.JANUARY, 1))
+        assertThat(expected, equalTo(truncate(field, Timestamp(nonTruncatedDate), firstWeekday)))
+    }
+
+    @Test
+    fun testGetUpcomingTimeInMillis() {
+        setFixedLocalTime(FIXED_LOCAL_TIME)
+        setFixedTimeZone(TimeZone.getTimeZone("GMT"))
+        val expected = unixTime(2015, Calendar.JANUARY, 25, 10, 1)
+        val upcomingTimeMillis = DateUtils.getUpcomingTimeInMillis(10, 1)
+        assertThat(expected, equalTo(upcomingTimeMillis))
+    }
+
     @Test
     @Throws(Exception::class)
     fun testMillisecondsUntilTomorrow() {