Merge "Test for forcing Gregorian as default Calendar"
diff --git a/luni/src/test/java/libcore/java/util/CalendarTest.java b/luni/src/test/java/libcore/java/util/CalendarTest.java
index abe5ab8..cdeab95 100644
--- a/luni/src/test/java/libcore/java/util/CalendarTest.java
+++ b/luni/src/test/java/libcore/java/util/CalendarTest.java
@@ -418,4 +418,16 @@
}
}
+
+ /**
+ * Ensures that Gregorian is the default Calendar for all Locales in Android. This is the
+ * historic behavior on Android; this test exists to avoid unintentional regressions.
+ * http://b/80294184
+ */
+ public void testAllDefaultCalendar_Gregorian() {
+ for (Locale locale : Locale.getAvailableLocales()) {
+ assertTrue("Default calendar should be Gregorian: " + locale,
+ Calendar.getInstance(locale) instanceof GregorianCalendar);
+ }
+ }
}
diff --git a/luni/src/test/java/libcore/libcore/icu/ICUCalendarTest.java b/luni/src/test/java/libcore/libcore/icu/ICUCalendarTest.java
new file mode 100644
index 0000000..e01de4d
--- /dev/null
+++ b/luni/src/test/java/libcore/libcore/icu/ICUCalendarTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package libcore.libcore.icu;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.icu.impl.ICUData;
+import android.icu.impl.ICUResourceBundle;
+import android.icu.util.Calendar;
+import android.icu.util.GregorianCalendar;
+import android.icu.util.ULocale;
+
+import org.junit.Test;
+
+/**
+ * Test for Android patches in ICU's calendar.
+ */
+public class ICUCalendarTest {
+
+ /**
+ * Ensures that Gregorian is the default Calendar for all Locales in Android. This is the
+ * historic behavior on Android; this test exists to avoid unintentional regressions.
+ * http://b/80294184
+ */
+ @Test
+ public void testAllDefaultCalendar_Gregorian() {
+ for (ULocale locale : ULocale.getAvailableLocales()) {
+ assertTrue("Default calendar should be Gregorian: " + locale,
+ Calendar.getInstance(locale) instanceof GregorianCalendar);
+ }
+
+ for (ULocale locale : ULocale.getAvailableLocales()) {
+ // Classes, e.g. RelativeDateTimeFormatter, use a different property,
+ // i.e. calendar/default, for calendar type. However, there is no direct way to obtain
+ // the calendar type via the APIs. Verify the property value directly here.
+ ICUResourceBundle bundle = (ICUResourceBundle) ICUResourceBundle.getBundleInstance(
+ ICUData.ICU_BASE_NAME, locale);
+ String calType = bundle.getStringWithFallback("calendar/default");
+ assertEquals("calendar/default should be Gregorian: " + locale, "gregorian", calType);
+ }
+ }
+}
