--- old/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java 2019-03-31 20:59:45.050625903 -0700 +++ new/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java 2019-03-31 20:59:44.138608620 -0700 @@ -34,6 +34,7 @@ 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 @@ -59,7 +60,7 @@ { 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 + { JapaneseEra.of(3), 1, 5, 1, 2019 }, }; } @@ -77,7 +78,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 + { JapaneseEra.of(3), 1, 1, 5, 1 }, }; } @@ -110,8 +111,8 @@ { 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 + { JapaneseEra.of(3), 1, 4, 30 }, + { JapaneseEra.of(3), Year.MAX_VALUE, 12, 31 }, }; } @@ -131,9 +132,9 @@ { 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 + { JapaneseEra.of(3), -1 }, + { JapaneseEra.of(3), 0 }, + { JapaneseEra.of(3), Year.MAX_VALUE }, }; } @@ -151,8 +152,21 @@ { JapaneseEra.HEISEI, 1, 360 }, { JapaneseEra.HEISEI, 2, 366 }, { JapaneseEra.HEISEI, 31, 121 }, - { JapaneseEra.of(3), 1, 246 }, // NEWERA - { JapaneseEra.of(3), 2, 367 }, // NEWERA + { 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}, }; } @@ -204,4 +218,13 @@ 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)); + } + } }