commit 78bf6982ba02e954ec768e2bfd9cdf27d5930910
author Ivan Chiang <chiangi@google.com> Tue Jul 27 18:47:31 2021 +0800
committer Ivan Chiang <chiangi@google.com> Tue Jul 27 18:52:33 2021 +0800
tree 50902942bd8bec77bbdea95f7ae34745074a1302
parent 5b084a6ab7148102552cc9daae8b1b27ff10b684

Fix the flaky test by using the system time zone

In different timezone, it may cause the date time result is not as
expected. Use the system time zone to fix the issue.

Test: atest DateTimeUtilsTest
Test: run test with the timezone and the time from issue
Fix: 194762210
Fix: 194762152
Fix: 194761559
Fix: 194761674
Fix: 194762151
Change-Id: Ic724607e42419d2654f80a6a211d5004bddf1464

tests/src/com/android/providers/media/photopicker/util/DateTimeUtilsTest.java

diff --git a/tests/src/com/android/providers/media/photopicker/util/DateTimeUtilsTest.java b/tests/src/com/android/providers/media/photopicker/util/DateTimeUtilsTest.java
index 9dd303b..e87c88b 100644
--- a/tests/src/com/android/providers/media/photopicker/util/DateTimeUtilsTest.java
+++ b/tests/src/com/android/providers/media/photopicker/util/DateTimeUtilsTest.java
@@ -23,13 +23,12 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.providers.media.photopicker.util.DateTimeUtils;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 
 @RunWith(AndroidJUnit4.class)
@@ -48,7 +47,9 @@
 
     @Test
     public void testGetDateTimeString_today() throws Exception {
-        final String result = DateTimeUtils.getDateTimeString(mContext, FAKE_TIME, FAKE_DATE);
+        final long when = generateDateTimeMillis(FAKE_DATE);
+
+        final String result = DateTimeUtils.getDateTimeString(mContext, when, FAKE_DATE);
 
         assertThat(result).isEqualTo(DateTimeUtils.getTodayString());
     }
@@ -56,8 +57,7 @@
     @Test
     public void testGetDateTimeString_yesterday() throws Exception {
         final LocalDate whenDate = FAKE_DATE.minusDays(1);
-        final long when = generateDateTimeMillis(whenDate.getYear(), whenDate.getMonthValue(),
-                whenDate.getDayOfMonth());
+        final long when = generateDateTimeMillis(whenDate);
 
         final String result = DateTimeUtils.getDateTimeString(mContext, when, FAKE_DATE);
 
@@ -67,8 +67,7 @@
     @Test
     public void testGetDateTimeString_weekday() throws Exception {
         final LocalDate whenDate = FAKE_DATE.minusDays(3);
-        final long when = generateDateTimeMillis(whenDate.getYear(), whenDate.getMonthValue(),
-                whenDate.getDayOfMonth());
+        final long when = generateDateTimeMillis(whenDate);
 
         final String result = DateTimeUtils.getDateTimeString(mContext, when, FAKE_DATE);
 
@@ -78,8 +77,7 @@
     @Test
     public void testGetDateTimeString_weekdayAndDate() throws Exception {
         final LocalDate whenDate = FAKE_DATE.minusMonths(1);
-        final long when = generateDateTimeMillis(whenDate.getYear(), whenDate.getMonthValue(),
-                whenDate.getDayOfMonth());
+        final long when = generateDateTimeMillis(whenDate);
 
         final String result = DateTimeUtils.getDateTimeString(mContext, when, FAKE_DATE);
 
@@ -89,8 +87,7 @@
     @Test
     public void testGetDateTimeString_weekdayDateAndYear() throws Exception {
         final LocalDate whenDate = FAKE_DATE.minusYears(1);
-        long when = generateDateTimeMillis(whenDate.getYear(), whenDate.getMonthValue(),
-                whenDate.getDayOfMonth());
+        long when = generateDateTimeMillis(whenDate);
 
         final String result = DateTimeUtils.getDateTimeString(mContext, when, FAKE_DATE);
 
@@ -100,8 +97,7 @@
     @Test
     public void testIsSameDay_differentYear_false() throws Exception {
         final LocalDate whenDate = FAKE_DATE.minusYears(1);
-        long when = generateDateTimeMillis(whenDate.getYear(), whenDate.getMonthValue(),
-                whenDate.getDayOfMonth());
+        long when = generateDateTimeMillis(whenDate);
 
         assertThat(DateTimeUtils.isSameDate(when, FAKE_TIME)).isFalse();
     }
@@ -109,17 +105,15 @@
     @Test
     public void testIsSameDay_differentMonth_false() throws Exception {
         final LocalDate whenDate = FAKE_DATE.minusMonths(1);
-        final long when = generateDateTimeMillis(whenDate.getYear(), whenDate.getMonthValue(),
-                whenDate.getDayOfMonth());
+        final long when = generateDateTimeMillis(whenDate);
 
         assertThat(DateTimeUtils.isSameDate(when, FAKE_TIME)).isFalse();
     }
 
     @Test
     public void testIsSameDay_differentDay_false() throws Exception {
-        final LocalDate whenDate = FAKE_DATE.minusDays(1);
-        final long when = generateDateTimeMillis(whenDate.getYear(), whenDate.getMonthValue(),
-                whenDate.getDayOfMonth());
+        final LocalDate whenDate = FAKE_DATE.minusDays(2);
+        final long when = generateDateTimeMillis(whenDate);
 
         assertThat(DateTimeUtils.isSameDate(when, FAKE_TIME)).isFalse();
     }
@@ -129,9 +123,8 @@
         assertThat(DateTimeUtils.isSameDate(FAKE_TIME, FAKE_TIME)).isTrue();
     }
 
-    private static long generateDateTimeMillis(int year, int month, int dayOfMonth) {
-        final LocalDate result = LocalDate.of(year, month, dayOfMonth);
-        return result.atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli();
+    private static long generateDateTimeMillis(LocalDate when) {
+        return when.atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli();
     }
 }