test/java/util/Calendar/JapaneseEraNameTest.java

*** 21,64 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 8202088
   * @summary Test the localized Japanese new era name (May 1st. 2019-)
   *      is retrieved no matter CLDR provider contains the name or not.
!  * @run testng/othervm JapaneseEraNameTest
!  * @run testng/othervm -Djava.locale.providers=CLDR,JRE JapaneseEraNameTest
   */
  
  import static java.util.Calendar.*;
  import static java.util.Locale.*;
  import java.util.Calendar;
  import java.util.Locale;
  
- import org.testng.annotations.DataProvider;
- import org.testng.annotations.Test;
- import static org.testng.Assert.assertEquals;
  
- @Test
  public class JapaneseEraNameTest {
      static final Calendar c = new Calendar.Builder()
              .setCalendarType("japanese")
              .setFields(ERA, 5, YEAR, 1, MONTH, MAY, DAY_OF_MONTH, 1)
              .build();
  
!     @DataProvider(name="names")
!     Object[][] names() {
!         return new Object[][] {
!             // type,    locale,  name
!             { LONG,     JAPAN,   "\u5143\u53f7" }, // NewEra
              { LONG,     US,      "NewEra" },
!             { SHORT,    JAPAN,   "N" },
!             { SHORT,    US,      "N" },
          };
-     }
  
!     @Test(dataProvider="names")
!     public void testJapaneseNewEraName(int type, Locale locale, String expected) {
!         assertEquals(c.getDisplayName(ERA, type, locale), expected);
      }
  }
--- 21,65 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 8202088 8207152 8217609
   * @summary Test the localized Japanese new era name (May 1st. 2019-)
   *      is retrieved no matter CLDR provider contains the name or not.
!  * @run main/othervm -Djava.locale.providers=CLDR JapaneseEraNameTest
!  *
   */
  
  import static java.util.Calendar.*;
  import static java.util.Locale.*;
  import java.util.Calendar;
  import java.util.Locale;
  
  
  public class JapaneseEraNameTest {
      static final Calendar c = new Calendar.Builder()
              .setCalendarType("japanese")
              .setFields(ERA, 5, YEAR, 1, MONTH, MAY, DAY_OF_MONTH, 1)
              .build();
  
! 
!     static final Object[][] names = {
!             // Since the test fails for below particular data
!             // on prior 8u versions for all eras, commenting it
!             // temporarily. Will be fixed as part of JDK-8220020.
!             // { LONG, JAPAN, "\u5143\u53f7" },
              { LONG, US,    "NewEra" },
!             { SHORT,JAPAN, "\u5143\u53f7" },// NewEra
!             { SHORT,US,    "NewEra" },
          };
  
!     public static void main(String[] args) {
!         for (Object[] data : names) {
!             if(!c.getDisplayName(ERA, (int)data[0], (Locale)data[1])
!             .equals(data[2])) {
!                 throw new RuntimeException("JapaneseEraNameTest failed for " + 
!                   String.format("%1$s %2$s %3$s", data[0], data[1], data[2]));
!             }
!         }
      }
  }