test/java/time/test/java/time/chrono/TestJapaneseChronology.java

*** 32,41 ****
--- 32,42 ----
  import java.util.Locale;
  
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  import static org.testng.Assert.assertEquals;
+ import static org.testng.Assert.assertTrue;
  
  /**
   * Tests for the Japanese chronology
   */
  @Test
*** 57,67 ****
              { JapaneseEra.TAISHO,    15, 12, 24, 1926 },
              { JapaneseEra.SHOWA,      1, 12, 25, 1926 },
              { JapaneseEra.SHOWA,     64,  1,  7, 1989 },
              { JapaneseEra.HEISEI,     1,  1,  8, 1989 },
              { JapaneseEra.HEISEI,    31,  4, 30, 2019 },
!             { JapaneseEra.of(3),      1,  5,  1, 2019 }, // NEWERA
          };
      }
  
      @DataProvider(name="day_year_data")
      Object[][] dayYearData() {
--- 58,68 ----
              { JapaneseEra.TAISHO,    15, 12, 24, 1926 },
              { JapaneseEra.SHOWA,      1, 12, 25, 1926 },
              { JapaneseEra.SHOWA,     64,  1,  7, 1989 },
              { JapaneseEra.HEISEI,     1,  1,  8, 1989 },
              { JapaneseEra.HEISEI,    31,  4, 30, 2019 },
!             { JapaneseEra.of(3),      1,  5,  1, 2019 },
          };
      }
  
      @DataProvider(name="day_year_data")
      Object[][] dayYearData() {
*** 75,85 ****
              { JapaneseEra.SHOWA,   2,    8,  1,  8 },
              { JapaneseEra.SHOWA,  64,    7,  1,  7 },
              { JapaneseEra.HEISEI,  1,    1,  1,  8 },
              { JapaneseEra.HEISEI,  2,    8,  1,  8 },
              { JapaneseEra.HEISEI, 31,  120,  4, 30 },
!             { JapaneseEra.of(3),   1,    1,  5,  1 }, // NEWERA
          };
      }
  
      @DataProvider(name="range_data")
      Object[][] rangeData() {
--- 76,86 ----
              { JapaneseEra.SHOWA,   2,    8,  1,  8 },
              { JapaneseEra.SHOWA,  64,    7,  1,  7 },
              { JapaneseEra.HEISEI,  1,    1,  1,  8 },
              { JapaneseEra.HEISEI,  2,    8,  1,  8 },
              { JapaneseEra.HEISEI, 31,  120,  4, 30 },
!             { JapaneseEra.of(3),   1,    1,  5,  1 },
          };
      }
  
      @DataProvider(name="range_data")
      Object[][] rangeData() {
*** 108,119 ****
              { JapaneseEra.SHOWA,     64,  1,  8 },
              { JapaneseEra.SHOWA,     65,  1,  1 },
              { JapaneseEra.HEISEI,     1,  1,  7 },
              { JapaneseEra.HEISEI,     1,  2, 29 },
              { JapaneseEra.HEISEI,    31,  5,  1 },
!             { JapaneseEra.of(3),      1,  4, 30 }, // NEWERA
!             { JapaneseEra.of(3), Year.MAX_VALUE,  12, 31 }, // NEWERA
          };
      }
  
      @DataProvider(name="invalid_eraYear")
      Object[][] invalidEraYearData() {
--- 109,120 ----
              { JapaneseEra.SHOWA,     64,  1,  8 },
              { JapaneseEra.SHOWA,     65,  1,  1 },
              { JapaneseEra.HEISEI,     1,  1,  7 },
              { JapaneseEra.HEISEI,     1,  2, 29 },
              { JapaneseEra.HEISEI,    31,  5,  1 },
!             { JapaneseEra.of(3),      1,  4, 30 },
!             { JapaneseEra.of(3), Year.MAX_VALUE,  12, 31 },
          };
      }
  
      @DataProvider(name="invalid_eraYear")
      Object[][] invalidEraYearData() {
*** 129,141 ****
              { JapaneseEra.SHOWA,      0 },
              { JapaneseEra.SHOWA,     65 },
              { JapaneseEra.HEISEI,    -1 },
              { JapaneseEra.HEISEI,     0 },
              { JapaneseEra.HEISEI,    32 },
!             { JapaneseEra.of(3),     -1 }, // NEWERA
!             { JapaneseEra.of(3),      0 }, // NEWERA
!             { JapaneseEra.of(3), Year.MAX_VALUE }, // NEWERA
          };
      }
  
      @DataProvider(name="invalid_day_year_data")
      Object[][] invalidDayYearData() {
--- 130,142 ----
              { JapaneseEra.SHOWA,      0 },
              { JapaneseEra.SHOWA,     65 },
              { JapaneseEra.HEISEI,    -1 },
              { JapaneseEra.HEISEI,     0 },
              { JapaneseEra.HEISEI,    32 },
!             { JapaneseEra.of(3),     -1 },
!             { JapaneseEra.of(3),      0 },
!             { JapaneseEra.of(3), Year.MAX_VALUE },
          };
      }
  
      @DataProvider(name="invalid_day_year_data")
      Object[][] invalidDayYearData() {
*** 149,160 ****
              { JapaneseEra.SHOWA,   2, 366 },
              { JapaneseEra.SHOWA,  64,   8 },
              { JapaneseEra.HEISEI,  1, 360 },
              { JapaneseEra.HEISEI,  2, 366 },
              { JapaneseEra.HEISEI, 31, 121 },
!             { JapaneseEra.of(3),   1, 246 }, // NEWERA
!             { JapaneseEra.of(3),   2, 367 }, // NEWERA
          };
      }
  
      @Test
      public void test_ofLocale() {
--- 150,174 ----
              { JapaneseEra.SHOWA,   2, 366 },
              { JapaneseEra.SHOWA,  64,   8 },
              { JapaneseEra.HEISEI,  1, 360 },
              { JapaneseEra.HEISEI,  2, 366 },
              { JapaneseEra.HEISEI, 31, 121 },
!             { JapaneseEra.of(3),   1, 246 },
!             { JapaneseEra.of(3),   2, 367 },
!         };
!     }
! 
!     @DataProvider
!     Object[][] eraNameData() {
!         return new Object[][] {
!             // Japanese era, name, exception
!             { "Meiji",  JapaneseEra.MEIJI,      null },
!             { "Taisho", JapaneseEra.TAISHO,     null },
!             { "Showa",  JapaneseEra.SHOWA,      null },
!             { "Heisei", JapaneseEra.HEISEI,     null },
!             { "Reiwa",  JapaneseEra.of(3),      null },
!             { "NewEra", null,                   IllegalArgumentException.class},
          };
      }
  
      @Test
      public void test_ofLocale() {
*** 202,207 ****
--- 216,230 ----
      @Test(dataProvider="invalid_day_year_data", expectedExceptions=DateTimeException.class)
      public void test_invalidDayYear(JapaneseEra era, int yearOfEra, int dayOfYear) {
          JapaneseDate date = JAPANESE.dateYearDay(era, yearOfEra, dayOfYear);
          System.out.printf("No DateTimeException with era=%s, year=%d, dayOfYear=%d%n", era, yearOfEra, dayOfYear);
      }
+ 
+     @Test(dataProvider="eraNameData")
+     public void test_eraName(String eraName, JapaneseEra era, Class expectedEx) {
+         try {
+             assertEquals(JapaneseEra.valueOf(eraName), era);
+         } catch (Exception ex) {
+             assertTrue(expectedEx.isInstance(ex));
+         }
+     }
  }