Merge pull request #5466 from grzesiek2010/fix_timezones

Fixed setting timezones
getodk · Feb 28, 2023 · 39c9686 · 39c9686
2 parents 28c77c6 + d2cef99
commit 39c9686
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/...rc/androidTest/java/org/odk/collect/android/instrumented/utilities/DateTimeUtilsTest.java b/...rc/androidTest/java/org/odk/collect/android/instrumented/utilities/DateTimeUtilsTest.java
@@ -27,6 +27,7 @@
 import org.odk.collect.android.application.Collect;
 import org.odk.collect.android.logic.DatePickerDetails;
 import org.odk.collect.android.widgets.utilities.DateTimeWidgetUtils;
+import org.odk.collect.testshared.TimeZoneSetter;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -68,7 +69,7 @@ public void setUp() {
     @Test
     public void getDateTimeLabelTest() {
         Locale.setDefault(Locale.ENGLISH);
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+        TimeZoneSetter.setTimezone(TimeZone.getTimeZone("GMT"));
 
         // 20 Oct 1991 14:00 GMT
         Calendar calendar = Calendar.getInstance();
@@ -100,6 +101,6 @@ public void getDateTimeLabelTest() {
     @After
     public void resetTimeZone() {
         Locale.setDefault(defaultLocale);
-        TimeZone.setDefault(defaultTimezone);
+        TimeZoneSetter.setTimezone(defaultTimezone);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/utilities/DateTimeUtilsTest.java b/collect_app/src/test/java/org/odk/collect/android/utilities/DateTimeUtilsTest.java
@@ -20,14 +20,16 @@
 
 import org.javarosa.core.model.data.TimeData;
 import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
 import org.joda.time.chrono.GregorianChronology;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.odk.collect.testshared.TimeZoneSetter;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.TimeZone;
+
 @RunWith(AndroidJUnit4.class)
 public class DateTimeUtilsTest {
     private final LocalDateTime date = new LocalDateTime().withDate(2010, 5, 12);
@@ -81,14 +83,14 @@ public void getDateWithSkippedDaylightSavingGapIfExists_returnsCorrectDateAndTim
 
     @Test
     public void skipDaylightSavingGapIfExistsTest() {
-        DateTimeZone originalDefaultTimeZone = DateTimeZone.getDefault();
-        DateTimeZone.setDefault(DateTimeZone.forID("Europe/Warsaw"));
+        TimeZone originalDefaultTimeZone = TimeZone.getDefault();
+        TimeZoneSetter.setTimezone(TimeZone.getTimeZone("Europe/Warsaw"));
 
         // 29 March 2020 at 02:00:00 clocks were turned forward to 03:00:00
         LocalDateTime ldtOriginal = new LocalDateTime().withYear(2020).withMonthOfYear(3).withDayOfMonth(29).withHourOfDay(2).withMinuteOfHour(30).withSecondOfMinute(0).withMillisOfSecond(0);
         LocalDateTime ldtExpected = new LocalDateTime().withYear(2020).withMonthOfYear(3).withDayOfMonth(29).withHourOfDay(3).withMinuteOfHour(0).withSecondOfMinute(0).withMillisOfSecond(0);
 
         assertEquals(ldtExpected, DateTimeUtils.skipDaylightSavingGapIfExists(ldtOriginal));
-        DateTimeZone.setDefault(originalDefaultTimeZone);
+        TimeZoneSetter.setTimezone(originalDefaultTimeZone);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/utilities/DaylightSavingTest.java b/collect_app/src/test/java/org/odk/collect/android/utilities/DaylightSavingTest.java
@@ -41,6 +41,7 @@
 import org.odk.collect.android.widgets.DateTimeWidget;
 import org.odk.collect.android.widgets.DateWidget;
 import org.odk.collect.android.widgets.utilities.DateTimeWidgetUtils;
+import org.odk.collect.testshared.TimeZoneSetter;
 
 import java.util.TimeZone;
 
@@ -69,13 +70,14 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        TimeZone.setDefault(currentTimeZone);
+        TimeZoneSetter.setTimezone(currentTimeZone);
     }
 
     @Test
     // 26 Mar 2017 at 02:00:00 clocks were turned forward to 03:00:00.
     public void testESTTimeZoneWithDateTimeWidget() {
-        TimeZone.setDefault(TimeZone.getTimeZone(CET_TIME_ZONE));
+        TimeZoneSetter.setTimezone(TimeZone.getTimeZone(CET_TIME_ZONE));
+
         DateTimeWidget dateTimeWidget = prepareDateTimeWidget(2017, 3, 26, 2, 30);
 
         /*
@@ -88,7 +90,8 @@ public void testESTTimeZoneWithDateTimeWidget() {
     @Test
     // 1 Jan 1960 at 00:00:00 clocks were turned forward to 00:15:00
     public void testEATTimezoneWithDateWidget() {
-        TimeZone.setDefault(TimeZone.getTimeZone(EAT_IME_ZONE));
+        TimeZoneSetter.setTimezone(TimeZone.getTimeZone(EAT_IME_ZONE));
+
         DateWidget dateWidget = prepareDateWidget(1960, 0, 1);
 
         /*

diff --git a/testshared/build.gradle b/testshared/build.gradle
@@ -49,6 +49,7 @@ dependencies {
     implementation Dependencies.junit
     implementation Dependencies.androidx_test_espresso_intents
     implementation Dependencies.android_material
+    implementation Dependencies.danlew_android_joda
     implementation(Dependencies.androidx_fragment_testing) {
         exclude group: 'androidx.test', module: 'monitor' //fixes issue https://github.com/android/android-test/issues/731
     }

diff --git a/testshared/src/main/java/org/odk/collect/testshared/TimeZoneSetter.kt b/testshared/src/main/java/org/odk/collect/testshared/TimeZoneSetter.kt
@@ -0,0 +1,16 @@
+package org.odk.collect.testshared
+
+import org.joda.time.DateTimeZone
+import java.util.TimeZone
+
+object TimeZoneSetter {
+    /**
+     * Always update both java.util.TimeZone and org.joda.time.DateTimeZone to avoid weird bugs in
+     * tests that depend on time zones.
+     */
+    @JvmStatic
+    fun setTimezone(timezone: TimeZone) {
+        TimeZone.setDefault(timezone)
+        DateTimeZone.setDefault(DateTimeZone.forID(timezone.id))
+    }
+}