diff --git a/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java b/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java index 21827135f..722652f40 100644 --- a/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java +++ b/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java @@ -24,6 +24,7 @@ import androidx.test.core.app.ApplicationProvider; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Locale; +import java.util.TimeZone; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -35,15 +36,14 @@ import org.robolectric.annotation.internal.DoNotInstrument; @DoNotInstrument public class DateStringsTest { - private static final int CURRENT_YEAR = Calendar.getInstance().get(Calendar.YEAR); + private static final TimeZone UTC = TimeZone.getTimeZone("UTC"); + private static final int CURRENT_YEAR = Calendar.getInstance(UTC).get(Calendar.YEAR); private Calendar startDate; private Calendar endDate; private static Calendar setupLocalizedCalendar(Locale locale, int year, int month, int day) { - Locale.setDefault(locale); - Calendar calendar = Calendar.getInstance(); - calendar.clear(); + Calendar calendar = Calendar.getInstance(UTC, locale); calendar.set(Calendar.YEAR, year); calendar.set(Calendar.MONTH, month); calendar.set(Calendar.DAY_OF_MONTH, day);