test/java/util/Calendar/CldrFormatNamesTest.java

*** 46,84 ****
       */
      static final Object[][] CLDR_DATA = {
          {
              Locale.JAPAN,
              "field.zone", "\u30bf\u30a4\u30e0\u30be\u30fc\u30f3",
!             "cldr.japanese.DatePatterns", new String[] {
                  "Gy\u5e74M\u6708d\u65e5EEEE",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gyy/MM/dd",
              },
!             "cldr.roc.DatePatterns", new String[] {
                  "Gy\u5e74M\u6708d\u65e5EEEE",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gy/MM/dd",
                  "Gy/MM/dd",
              },
              "calendarname.buddhist", "\u30bf\u30a4\u4ecf\u6559\u66a6",
          },
          {
              Locale.PRC,
              "field.zone", "\u533a\u57df",
!             "cldr.islamic.DatePatterns", new String[] {
                  "Gy\u5e74M\u6708d\u65e5EEEE",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gyy-MM-dd",
              },
              "calendarname.islamic", "\u4f0a\u65af\u5170\u65e5\u5386",
          },
          {
              Locale.GERMANY,
              "field.dayperiod", "Tagesh\u00e4lfte",
!             "cldr.islamic.DatePatterns", new String[] {
                  "EEEE d. MMMM y G",
                  "d. MMMM y G",
                  "d. MMM y G",
                  "d.M.y G",
              },
--- 46,84 ----
       */
      static final Object[][] CLDR_DATA = {
          {
              Locale.JAPAN,
              "field.zone", "\u30bf\u30a4\u30e0\u30be\u30fc\u30f3",
!             "java.time.japanese.DatePatterns", new String[] {
                  "Gy\u5e74M\u6708d\u65e5EEEE",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gyy/MM/dd",
              },
!             "java.time.roc.DatePatterns", new String[] {
                  "Gy\u5e74M\u6708d\u65e5EEEE",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gy/MM/dd",
                  "Gy/MM/dd",
              },
              "calendarname.buddhist", "\u30bf\u30a4\u4ecf\u6559\u66a6",
          },
          {
              Locale.PRC,
              "field.zone", "\u533a\u57df",
!             "java.time.islamic.DatePatterns", new String[] {
                  "Gy\u5e74M\u6708d\u65e5EEEE",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gy\u5e74M\u6708d\u65e5",
                  "Gyy-MM-dd",
              },
              "calendarname.islamic", "\u4f0a\u65af\u5170\u65e5\u5386",
          },
          {
              Locale.GERMANY,
              "field.dayperiod", "Tagesh\u00e4lfte",
!             "java.time.islamic.DatePatterns", new String[] {
                  "EEEE d. MMMM y G",
                  "d. MMMM y G",
                  "d. MMM y G",
                  "d.M.y G",
              },
*** 117,127 ****
      // This test is CLDR data dependent.
      public static void main(String[] args) {
          for (Object[] data : CLDR_DATA) {
              Locale locale = (Locale) data[0];
              ResourceBundle rb = LocaleProviderAdapter.getResourceBundleBased()
!                                     .getLocaleResources(locale).getFormatData();
              for (int i = 1; i < data.length; ) {
                  String key = (String) data[i++];
                  Object expected = data[i++];
                  if (rb.containsKey(key)) {
                      Object value = rb.getObject(key);
--- 117,127 ----
      // This test is CLDR data dependent.
      public static void main(String[] args) {
          for (Object[] data : CLDR_DATA) {
              Locale locale = (Locale) data[0];
              ResourceBundle rb = LocaleProviderAdapter.getResourceBundleBased()
!                                     .getLocaleResources(locale).getJavaTimeFormatData();
              for (int i = 1; i < data.length; ) {
                  String key = (String) data[i++];
                  Object expected = data[i++];
                  if (rb.containsKey(key)) {
                      Object value = rb.getObject(key);
*** 165,175 ****
  
      private static void testSymbolNames(Locale locale, String calType, String[] expected,
                                          int field, int style, String fieldName) {
          for (int i = 0; i < expected.length; i++) {
              String expt = expected[i];
!             String name = CalendarDataUtility.retrieveFieldValueName(calType, field, i, style, locale);
              if (!expt.equals(name)) {
                  errors++;
                  System.err.printf("error: wrong %s %s name in %s: value=%d, got='%s', expected='%s'%n",
                                    calType, fieldName, locale, i, name, expt);
              }
--- 165,175 ----
  
      private static void testSymbolNames(Locale locale, String calType, String[] expected,
                                          int field, int style, String fieldName) {
          for (int i = 0; i < expected.length; i++) {
              String expt = expected[i];
!             String name = CalendarDataUtility.retrieveJavaTimeFieldValueName(calType, field, i, style, locale);
              if (!expt.equals(name)) {
                  errors++;
                  System.err.printf("error: wrong %s %s name in %s: value=%d, got='%s', expected='%s'%n",
                                    calType, fieldName, locale, i, name, expt);
              }