Chang to tiered approach (#6901)

Author: rishabh-ibm

functional/MBCS_Tests/language_tag/src/CNTagTest.java

@@ -185,7 +185,11 @@ public void firstDayOfWeekTest(){
         String tag = "zh-CN-u-fw-mon";
         Locale l = Locale.forLanguageTag(tag);
         assertEquals("中文 (中国，fw：mon)", l.getDisplayName(l));
-        assertEquals("Chinese (China, First Day of Week Is Monday)", l.getDisplayName(Locale.ENGLISH));
+        // CLDR 48.0 (JDK 26+) changed format from "First Day of Week Is Monday" to "First day of week: Monday"
+        String expectedDisplay = (JavaVersion.getFeature() >= 26)
+            ? "Chinese (China, First day of week: Monday)"
+            : "Chinese (China, First Day of Week Is Monday)";
+        assertEquals(expectedDisplay, l.getDisplayName(Locale.ENGLISH));
         assertEquals(tag, l.toLanguageTag());
         assertEquals("fw-mon", l.getExtension('u'));
         assertEquals("mon", l.getUnicodeLocaleType("fw"));

functional/MBCS_Tests/language_tag/src/JPTagTest.java

@@ -185,7 +185,11 @@ public void firstDayOfWeekTest(){
         String tag = "ja-JP-u-fw-mon";
         Locale l = Locale.forLanguageTag(tag);
         assertEquals("日本語 (日本、fw: mon)", l.getDisplayName(l));
-        assertEquals("Japanese (Japan, First Day of Week Is Monday)", l.getDisplayName(Locale.ENGLISH));
+        // CLDR 48.0 (JDK 26+) changed format from "First Day of Week Is Monday" to "First day of week: Monday"
+        String expectedDisplay = (JavaVersion.getFeature() >= 26)
+            ? "Japanese (Japan, First day of week: Monday)"
+            : "Japanese (Japan, First Day of Week Is Monday)";
+        assertEquals(expectedDisplay, l.getDisplayName(Locale.ENGLISH));
         assertEquals(tag, l.toLanguageTag());
         assertEquals("fw-mon", l.getExtension('u'));
         assertEquals("mon", l.getUnicodeLocaleType("fw"));

functional/MBCS_Tests/language_tag/src/KRTagTest.java

@@ -182,7 +182,11 @@ public void firstDayOfWeekTest(){
         Locale l = Locale.forLanguageTag(tag);
         assertEquals("한국어 (대한민국, fw: mon)",
                      l.getDisplayName(l));
-        assertEquals("Korean (South Korea, First Day of Week Is Monday)",
+        // CLDR 48.0 (JDK 26+) changed format from "First Day of Week Is Monday" to "First day of week: Monday"
+        String expectedDisplay = (JavaVersion.getFeature() >= 26)
+            ? "Korean (South Korea, First day of week: Monday)"
+            : "Korean (South Korea, First Day of Week Is Monday)";
+        assertEquals(expectedDisplay,
                      l.getDisplayName(Locale.ENGLISH));
         assertEquals(tag, l.toLanguageTag());
         assertEquals("fw-mon", l.getExtension('u'));

functional/MBCS_Tests/language_tag/src/TWTagTest.java

@@ -198,7 +198,11 @@ public void firstDayOfWeekTest(){
         String tag = "zh-TW-u-fw-mon";
         Locale l = Locale.forLanguageTag(tag);
         assertEquals("中文 (台灣，fw：mon)", l.getDisplayName(l));
-        assertEquals("Chinese (Taiwan, First Day of Week Is Monday)", l.getDisplayName(Locale.ENGLISH));
+        // CLDR 48.0 (JDK 26+) changed format from "First Day of Week Is Monday" to "First day of week: Monday"
+        String expectedDisplay = (JavaVersion.getFeature() >= 26)
+            ? "Chinese (Taiwan, First day of week: Monday)"
+            : "Chinese (Taiwan, First Day of Week Is Monday)";
+        assertEquals(expectedDisplay, l.getDisplayName(Locale.ENGLISH));
         assertEquals(tag, l.toLanguageTag());
         assertEquals("fw-mon", l.getExtension('u'));
         assertEquals("mon", l.getUnicodeLocaleType("fw"));

functional/MBCS_Tests/language_tag/src/USTagTest.java

@@ -178,7 +178,11 @@ public void timezoneJPCalendarNumberTest(){
     public void firstDayOfWeekTest(){
         String tag = "en-US-u-fw-mon";
         Locale l = Locale.forLanguageTag(tag);
-        assertEquals("English (United States, First Day of Week Is Monday)", l.getDisplayName(Locale.ENGLISH));
+        // CLDR 48.0 (JDK 26+) changed format from "First Day of Week Is Monday" to "First day of week: Monday"
+        String expectedDisplay = (JavaVersion.getFeature() >= 26)
+            ? "English (United States, First day of week: Monday)"
+            : "English (United States, First Day of Week Is Monday)";
+        assertEquals(expectedDisplay, l.getDisplayName(Locale.ENGLISH));
         assertEquals(tag, l.toLanguageTag());
         assertEquals("fw-mon", l.getExtension('u'));
         assertEquals("mon", l.getUnicodeLocaleType("fw"));