From 4e907f2cdd263f990e005d9d23bdaa5c72739e67 Mon Sep 17 00:00:00 2001
From: pubiqq <serj.ese@gmail.com>
Date: Wed, 15 Mar 2023 19:37:15 +0000
Subject: [PATCH] [Internal] Fix DateStrings tests

Resolves https://github.com/material-components/material-components-android/pull/3236

GIT_ORIGIN_REV_ID=de3a02067586b9918036ae1b4244589d28cdc272
PiperOrigin-RevId: 516900137
---
 .../android/material/datepicker/DateStringsTest.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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);