test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java

rev 54350 : 8205432: Replace the placeholder Japanese era name
Reviewed-by: rriggs
rev 54351 : 8174268: Declare a public field in JapaneseEra for the era starting May 2019
Reviewed-by: rriggs

*** 174,184 ****
      // creation and cross-checks
      //-----------------------------------------------------------------------
      @DataProvider(name="createByEra")
      Object[][] data_createByEra() {
          return new Object[][] {
!                 {JapaneseEra.of(3), 2020 - YDIFF_REIWA, 2, 29, 60, LocalDate.of(2020, 2, 29)},
                  {JapaneseEra.HEISEI, 1996 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(1996, 2, 29)},
                  {JapaneseEra.HEISEI, 2000 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(2000, 2, 29)},
                  {JapaneseEra.MEIJI, 1874 - YDIFF_MEIJI, 2, 28, 59, LocalDate.of(1874, 2, 28)},
                  {JapaneseEra.SHOWA, 1928 - YDIFF_SHOWA, 12, 25, 360, LocalDate.of(1928, 12, 25)},
                  {JapaneseEra.TAISHO, 1916 - YDIFF_TAISHO, 7, 30, 212, LocalDate.of(1916, 7, 30)},
--- 174,184 ----
      // creation and cross-checks
      //-----------------------------------------------------------------------
      @DataProvider(name="createByEra")
      Object[][] data_createByEra() {
          return new Object[][] {
!                 {JapaneseEra.REIWA, 2020 - YDIFF_REIWA, 2, 29, 60, LocalDate.of(2020, 2, 29)},
                  {JapaneseEra.HEISEI, 1996 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(1996, 2, 29)},
                  {JapaneseEra.HEISEI, 2000 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(2000, 2, 29)},
                  {JapaneseEra.MEIJI, 1874 - YDIFF_MEIJI, 2, 28, 59, LocalDate.of(1874, 2, 28)},
                  {JapaneseEra.SHOWA, 1928 - YDIFF_SHOWA, 12, 25, 360, LocalDate.of(1928, 12, 25)},
                  {JapaneseEra.TAISHO, 1916 - YDIFF_TAISHO, 7, 30, 212, LocalDate.of(1916, 7, 30)},
*** 367,378 ****
      // prolepticYear() and is LeapYear()
      //-----------------------------------------------------------------------
      @DataProvider(name="prolepticYear")
      Object[][] data_prolepticYear() {
          return new Object[][] {
!                 {3, JapaneseEra.of(3), 1, 1 + YDIFF_REIWA, false},
!                 {3, JapaneseEra.of(3), 102, 102 + YDIFF_REIWA, true},
  
                  {2, JapaneseEra.HEISEI, 1, 1 + YDIFF_HEISEI, false},
                  {2, JapaneseEra.HEISEI, 4, 4 + YDIFF_HEISEI, true},
  
                  {-1, JapaneseEra.MEIJI, 9, 9 + YDIFF_MEIJI, true},
--- 367,378 ----
      // prolepticYear() and is LeapYear()
      //-----------------------------------------------------------------------
      @DataProvider(name="prolepticYear")
      Object[][] data_prolepticYear() {
          return new Object[][] {
!                 {3, JapaneseEra.REIWA, 1, 1 + YDIFF_REIWA, false},
!                 {3, JapaneseEra.REIWA, 102, 102 + YDIFF_REIWA, true},
  
                  {2, JapaneseEra.HEISEI, 1, 1 + YDIFF_HEISEI, false},
                  {2, JapaneseEra.HEISEI, 4, 4 + YDIFF_HEISEI, true},
  
                  {-1, JapaneseEra.MEIJI, 9, 9 + YDIFF_MEIJI, true},
*** 553,563 ****
          return new Object[][] {
              { JapaneseEra.MEIJI, -1, "Meiji"},
              { JapaneseEra.TAISHO, 0, "Taisho"},
              { JapaneseEra.SHOWA, 1, "Showa"},
              { JapaneseEra.HEISEI, 2, "Heisei"},
!             { JapaneseEra.of(3), 3, "Reiwa"},
          };
      }
  
      @Test(dataProvider="japaneseEras")
      public void test_Japanese_Eras(Era era, int eraValue, String name) {
--- 553,563 ----
          return new Object[][] {
              { JapaneseEra.MEIJI, -1, "Meiji"},
              { JapaneseEra.TAISHO, 0, "Taisho"},
              { JapaneseEra.SHOWA, 1, "Showa"},
              { JapaneseEra.HEISEI, 2, "Heisei"},
!             { JapaneseEra.REIWA, 3, "Reiwa"},
          };
      }
  
      @Test(dataProvider="japaneseEras")
      public void test_Japanese_Eras(Era era, int eraValue, String name) {