diff --git a/make/data/unicodedata/UnicodeData.txt b/make/data/unicodedata/UnicodeData.txt index 8c4efa2c07a3ab502951b301f25d7b0073ce69bf..062805885d94ee2e9c3efaf9faaf0b39bf0d89cd 100644 --- a/make/data/unicodedata/UnicodeData.txt +++ b/make/data/unicodedata/UnicodeData.txt @@ -11408,7 +11408,7 @@ 32FC;CIRCLED KATAKANA WI;So;0;L; 30F0;;;;N;;;;; 32FD;CIRCLED KATAKANA WE;So;0;L; 30F1;;;;N;;;;; 32FE;CIRCLED KATAKANA WO;So;0;L; 30F2;;;;N;;;;; -32FF;SQUARE ERA NAME NEWERA;So;0;L; 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;; +32FF;SQUARE ERA NAME REIWA;So;0;L; 4EE4 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME REIWA;;;; 3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;; 3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;; 3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;; diff --git a/src/share/classes/java/time/chrono/JapaneseEra.java b/src/share/classes/java/time/chrono/JapaneseEra.java index d7dac43d543e9422adbd51e2f1cc8dcaadc3585e..205238a4a71cc84a8ce41112a8cd81dc0653e673 100644 --- a/src/share/classes/java/time/chrono/JapaneseEra.java +++ b/src/share/classes/java/time/chrono/JapaneseEra.java @@ -151,14 +151,14 @@ public final class JapaneseEra */ public static final JapaneseEra HEISEI = new JapaneseEra(2, LocalDate.of(1989, 1, 8)); /** - * The singleton instance for the 'NewEra' era (2019-05-01 - current) + * The singleton instance for the 'Reiwa' era (2019-05-01 - ) * which has the value 3. */ - private static final JapaneseEra NEWERA = new JapaneseEra(3, LocalDate.of(2019, 5, 1)); + private static final JapaneseEra REIWA = new JapaneseEra(3, LocalDate.of(2019, 5, 1)); // The number of predefined JapaneseEra constants. // There may be a supplemental era defined by the property. - private static final int N_ERA_CONSTANTS = NEWERA.getValue() + ERA_OFFSET; + private static final int N_ERA_CONSTANTS = REIWA.getValue() + ERA_OFFSET; /** * Serialization version. @@ -176,7 +176,7 @@ public final class JapaneseEra KNOWN_ERAS[1] = TAISHO; KNOWN_ERAS[2] = SHOWA; KNOWN_ERAS[3] = HEISEI; - KNOWN_ERAS[4] = NEWERA; + KNOWN_ERAS[4] = REIWA; for (int i = N_ERA_CONSTANTS; i < ERA_CONFIG.length; i++) { CalendarDate date = ERA_CONFIG[i].getSinceDate(); LocalDate isoDate = LocalDate.of(date.getYear(), date.getMonth(), date.getDayOfMonth()); diff --git a/src/share/classes/java/util/JapaneseImperialCalendar.java b/src/share/classes/java/util/JapaneseImperialCalendar.java index 08bd975c8d3be3beb80b6d56b957f69a3a2329f8..a4c9c08c2d3d6e1a36df5f6688f1d62bb9ac558d 100644 --- a/src/share/classes/java/util/JapaneseImperialCalendar.java +++ b/src/share/classes/java/util/JapaneseImperialCalendar.java @@ -38,21 +38,21 @@ import sun.util.calendar.LocalGregorianCalendar; import sun.util.calendar.ZoneInfo; /** - * JapaneseImperialCalendar implements a Japanese + * {@code JapaneseImperialCalendar} implements a Japanese * calendar system in which the imperial era-based year numbering is * supported from the Meiji era. The following are the eras supported * by this calendar system. - * 

+ * 
{@code
  * ERA value   Era name    Since (in Gregorian)
  * ------------------------------------------------------
  *     0       N/A         N/A
- *     1       Meiji       1868-01-01 midnight local time
- *     2       Taisho      1912-07-30 midnight local time
- *     3       Showa       1926-12-25 midnight local time
- *     4       Heisei      1989-01-08 midnight local time
- *     5       NewEra      2019-05-01 midnight local time
+ *     1       Meiji       1868-01-01T00:00:00 local time
+ *     2       Taisho      1912-07-30T00:00:00 local time
+ *     3       Showa       1926-12-25T00:00:00 local time
+ *     4       Heisei      1989-01-08T00:00:00 local time
+ *     5       Reiwa       2019-05-01T00:00:00 local time
  * ------------------------------------------------------
- * 

+ * }
* *

ERA value 0 specifies the years before Meiji and * the Gregorian year values are used. Unlike {@link @@ -103,12 +103,11 @@ class JapaneseImperialCalendar extends Calendar { public static final int HEISEI = 4; /** - * The ERA constant designating the NewEra era. + * The ERA constant designating the Reiwa era. */ - private static final int NEWERA = 5; + private static final int REIWA = 5; private static final int EPOCH_OFFSET = 719163; // Fixed date of January 1, 1970 (Gregorian) - private static final int EPOCH_YEAR = 1970; // Useful millisecond constants. Although ONE_DAY and ONE_WEEK can fit // into ints, they must be longs in order to prevent arithmetic overflow @@ -354,6 +353,7 @@ class JapaneseImperialCalendar extends Calendar { * false otherwise. * @see Calendar#compareTo(Calendar) */ + @Override public boolean equals(Object obj) { return obj instanceof JapaneseImperialCalendar && super.equals(obj); @@ -363,6 +363,7 @@ class JapaneseImperialCalendar extends Calendar { * Generates the hash code for this * JapaneseImperialCalendar object. */ + @Override public int hashCode() { return super.hashCode() ^ jdate.hashCode(); } @@ -395,6 +396,7 @@ class JapaneseImperialCalendar extends Calendar { * or if any calendar fields have out-of-range values in * non-lenient mode. */ + @Override public void add(int field, int amount) { // If amount == 0, do nothing even the given field is out of // range. This is tested by JCK. @@ -523,6 +525,7 @@ class JapaneseImperialCalendar extends Calendar { } } + @Override public void roll(int field, boolean up) { roll(field, up ? +1 : -1); } @@ -547,6 +550,7 @@ class JapaneseImperialCalendar extends Calendar { * @see #add(int,int) * @see #set(int,int) */ + @Override public void roll(int field, int amount) { // If amount == 0, do nothing even the given field is out of // range. This is tested by JCK. @@ -1729,12 +1733,12 @@ class JapaneseImperialCalendar extends Calendar { } } else if (transitionYear) { if (jdate.getYear() == 1) { - // As of NewEra (since Meiji) there's no case + // As of Reiwa (since Meiji) there's no case // that there are multiple transitions in a // year. Historically there was such // case. There might be such case again in the // future. - if (era > NEWERA) { + if (era > REIWA) { CalendarDate pd = eras[era - 1].getSinceDate(); if (normalizedYear == pd.getYear()) { d.setMonth(pd.getMonth()).setDayOfMonth(pd.getDayOfMonth()); diff --git a/src/share/classes/sun/text/resources/FormatData.java b/src/share/classes/sun/text/resources/FormatData.java index a007baf67351429586bb59c00a16644e8b3bfe43..07bdd68f9a238ca9fe279ea770a380b270f5b66c 100644 --- a/src/share/classes/sun/text/resources/FormatData.java +++ b/src/share/classes/sun/text/resources/FormatData.java @@ -106,7 +106,7 @@ public class FormatData extends ParallelListResourceBundle { "T", "S", "H", - "N", // NewEra + "R", }; // Japanese imperial calendar era strings @@ -116,7 +116,7 @@ public class FormatData extends ParallelListResourceBundle { "Taisho", "Showa", "Heisei", - "NewEra", // NewEra + "Reiwa", }; return new Object[][] { diff --git a/src/share/classes/sun/text/resources/JavaTimeSupplementary.java b/src/share/classes/sun/text/resources/JavaTimeSupplementary.java index 18a56d22e5e7b043123032af92f47de284d6542f..c00edac21925c80cb1dfbe24ef830e1bd5986e28 100644 --- a/src/share/classes/sun/text/resources/JavaTimeSupplementary.java +++ b/src/share/classes/sun/text/resources/JavaTimeSupplementary.java @@ -237,7 +237,7 @@ public class JavaTimeSupplementary extends OpenListResourceBundle { "Taisho", "Showa", "Heisei", - "NewEra", // New Era + "Reiwa", } }, { "java.time.japanese.short.Eras", @@ -247,7 +247,7 @@ public class JavaTimeSupplementary extends OpenListResourceBundle { "Taisho", "Showa", "Heisei", - "NewEra", // New Era + "Reiwa", } }, { "java.time.roc.DatePatterns", diff --git a/src/share/classes/sun/text/resources/ja/FormatData_ja.java b/src/share/classes/sun/text/resources/ja/FormatData_ja.java index 2dcddd1cfa511846f01a41d9d858cb472a6e6a5b..a3380803aba46ff2e6863a80acacec1a1dca6671 100644 --- a/src/share/classes/sun/text/resources/ja/FormatData_ja.java +++ b/src/share/classes/sun/text/resources/ja/FormatData_ja.java @@ -91,7 +91,7 @@ public class FormatData_ja extends ParallelListResourceBundle { "\u5927\u6b63", // Taisho "\u662d\u548c", // Showa "\u5e73\u6210", // Heisei - "\u5143\u53f7", // NewEra + "\u4ee4\u548c", // Reiwa }; final String[] rocEras = { "\u6c11\u56fd\u524d", diff --git a/src/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java b/src/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java index cc6f5776494761ffc1c699a99e0bf54afbc2aeb0..e76d6ed775e3c51e04466a0e6c843a8c2bce9118 100644 --- a/src/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java +++ b/src/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java @@ -198,7 +198,7 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle { "\u5927\u6b63", "\u662d\u548c", "\u5e73\u6210", - "\u5143\u53f7", // NewEra + "\u4ee4\u548c", } }, { "java.time.japanese.short.Eras", @@ -208,7 +208,7 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle { "\u5927\u6b63", "\u662d\u548c", "\u5e73\u6210", - "\u5143\u53f7", // NewEra + "\u4ee4\u548c", } }, { "java.time.long.Eras", diff --git a/src/share/classes/sun/util/calendar/Era.java b/src/share/classes/sun/util/calendar/Era.java index dea9cb429dfe81eeabbd3fca6caf18736315f252..3687952225b1884c62a9958b85c41bb276e26f85 100644 --- a/src/share/classes/sun/util/calendar/Era.java +++ b/src/share/classes/sun/util/calendar/Era.java @@ -41,21 +41,16 @@ import java.util.TimeZone; * CalendarDate. * *

The following era names are defined in this release. - * - * 


+ * 
{@code
  *   Calendar system         Era name         Since (in Gregorian)
  *   -----------------------------------------------------------------------
- *   Japanese calendar       Meiji            1868-01-01 midnight local time
- *                           Taisho           1912-07-30 midnight local time
- *                           Showa            1926-12-26 midnight local time
- *                           Heisei           1989-01-08 midnight local time
- *                           NewEra           2019-05-01 midnight local time
- *   Julian calendar         BeforeCommonEra  -292275055-05-16T16:47:04.192Z
- *                           CommonEra        0000-12-30 midnight local time
- *   Taiwanese calendar      MinGuo           1911-01-01 midnight local time
- *   Thai Buddhist calendar  BuddhistEra      -543-01-01 midnight local time
+ *   Japanese calendar       Meiji            1868-01-01T00:00:00 local time
+ *                           Taisho           1912-07-30T00:00:00 local time
+ *                           Showa            1926-12-25T00:00:00 local time
+ *                           Heisei           1989-01-08T00:00:00 local time
+ *                           Reiwa            2019-05-01T00:00:00 local time
  *   -----------------------------------------------------------------------
- * 

+ * }
* * @author Masayoshi Okutsu * @since 1.5 diff --git a/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml b/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml index 37efa1c2d27d540a17e63f87e0efa65325de310d..f02dd606378c6ce25cff2c3bf7af539d6883bfa7 100644 --- a/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml +++ b/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml @@ -2410,7 +2410,7 @@ 大正 昭和 平成 - 元号 + 令和 diff --git a/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml b/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml index 983132bed16a080a7ba7ee27d56c71f2d9422e82..01ba74f8a0416008e90432319812e3bda4bfffc7 100644 --- a/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml +++ b/src/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml @@ -1657,14 +1657,14 @@ Taishō Shōwa Heisei - NewEra + Reiwa M T S H - N + R diff --git a/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java b/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java index 10fdd3af8744f2be847b6c53aa120b499c4fb41e..73e05f731000c1b8882752b6f35983a2abd00861 100644 --- a/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java +++ b/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java @@ -76,10 +76,10 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av Era[] jeras = CalendarSystem.forName("japanese").getEras(); if (value <= jeras.length) { // Localized era name could not be retrieved from this provider. - // This can occur either for NewEra or SupEra. + // This can occur either for Reiwa or SupEra. // // If it's CLDR provider, try COMPAT first, which is guaranteed to have - // the name for NewEra. + // the name for Reiwa. if (type == LocaleProviderAdapter.Type.CLDR) { lr = LocaleProviderAdapter.forJRE().getLocaleResources(locale); key = getResourceKeyFor(LocaleProviderAdapter.Type.JRE, diff --git a/src/share/lib/calendars.properties b/src/share/lib/calendars.properties index 8ffee4ca3ffba6460fb6f20939db3f8e44f293fb..6007d7a57df3394d2e699497c47879bc377ada04 100644 --- a/src/share/lib/calendars.properties +++ b/src/share/lib/calendars.properties @@ -29,14 +29,14 @@ # Taisho since 1912-07-30 00:00:00 local time (Gregorian) # Showa since 1926-12-25 00:00:00 local time (Gregorian) # Heisei since 1989-01-08 00:00:00 local time (Gregorian) -# NewEra since 2019-05-01 00:00:00 local time (Gregorian) +# Reiwa since 2019-05-01 00:00:00 local time (Gregorian) calendar.japanese.type: LocalGregorianCalendar calendar.japanese.eras: \ name=Meiji,abbr=M,since=-3218832000000; \ name=Taisho,abbr=T,since=-1812153600000; \ name=Showa,abbr=S,since=-1357603200000; \ name=Heisei,abbr=H,since=600220800000; \ - name=NewEra,abbr=N,since=1556668800000 + name=Reiwa,abbr=R,since=1556668800000 # # Taiwanese calendar diff --git a/test/java/text/Format/DateFormat/WeekDateTest.java b/test/java/text/Format/DateFormat/WeekDateTest.java index 4dc99456d6bb20fe5727c08e0aabe2dfb1047b28..5b947e0f939080f48e098da0aee78e27abc2d7b1 100644 --- a/test/java/text/Format/DateFormat/WeekDateTest.java +++ b/test/java/text/Format/DateFormat/WeekDateTest.java @@ -137,9 +137,9 @@ public class WeekDateTest { Calendar jcal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), new Locale("ja", "JP", "JP")); - String format = "2-W01-2"; // 2019-12-31 == N1-12-31 + String format = "2-W01-2"; // 2019-12-31 == R1-12-31 int expectedYear = 2019; - // Check the current era, Heisei or NewEra + // Check the current era, Heisei or Reiwa if (System.currentTimeMillis() < 1556668800000L) { format = "21-W01-3"; // 2008-12-31 == H20-12-31 expectedYear = 2008; diff --git a/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java b/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java index 29714b3532890a83f62b770c2e6fb20da54a9b3a..951b30c152fb47497dbea86175559d36808d4f1d 100644 --- a/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java +++ b/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java @@ -111,7 +111,9 @@ import org.testng.annotations.Test; */ @Test public class TCKJapaneseChronology { - private static final int YDIFF_NEWERA = 2018; + + // Year differences from Gregorian years. + private static final int YDIFF_REIWA = 2018; private static final int YDIFF_HEISEI = 1988; private static final int YDIFF_MEIJI = 1867; private static final int YDIFF_SHOWA = 1925; @@ -174,7 +176,7 @@ public class TCKJapaneseChronology { @DataProvider(name="createByEra") Object[][] data_createByEra() { return new Object[][] { - {JapaneseEra.of(3), 2020 - YDIFF_NEWERA, 2, 29, 60, LocalDate.of(2020, 2, 29)}, // NEWERA + {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)}, @@ -367,8 +369,8 @@ public class TCKJapaneseChronology { @DataProvider(name="prolepticYear") Object[][] data_prolepticYear() { return new Object[][] { - {3, JapaneseEra.of(3), 1, 1 + YDIFF_NEWERA, false}, // NEWERA - {3, JapaneseEra.of(3), 102, 102 + YDIFF_NEWERA, true}, // NEWERA + {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}, @@ -553,7 +555,7 @@ public class TCKJapaneseChronology { { JapaneseEra.TAISHO, 0, "Taisho"}, { JapaneseEra.SHOWA, 1, "Showa"}, { JapaneseEra.HEISEI, 2, "Heisei"}, - { JapaneseEra.of(3), 3, "NewEra"}, // NEWERA + { JapaneseEra.of(3), 3, "Reiwa"}, }; } @@ -689,7 +691,7 @@ public class TCKJapaneseChronology { {JapaneseChronology.INSTANCE.date(1989, 1, 7), "Japanese Showa 64-01-07"}, {JapaneseChronology.INSTANCE.date(1989, 1, 8), "Japanese Heisei 1-01-08"}, {JapaneseChronology.INSTANCE.date(2012, 12, 6), "Japanese Heisei 24-12-06"}, - {JapaneseChronology.INSTANCE.date(2020, 1, 6), "Japanese NewEra 2-01-06"}, + {JapaneseChronology.INSTANCE.date(2020, 1, 6), "Japanese Reiwa 2-01-06"}, }; } diff --git a/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java b/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java index 943520dc461f4c88020b291bd7574b90b55487ea..e37a6a577d7b8441700eedb4e84544e8582dac75 100644 --- a/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java +++ b/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java @@ -77,7 +77,7 @@ public class TCKJapaneseEra { @DataProvider(name = "JapaneseEras") Object[][] data_of_eras() { return new Object[][] { - {JapaneseEra.of(3), "NewEra", 3}, // NEWERA + {JapaneseEra.of(3), "Reiwa", 3}, {JapaneseEra.HEISEI, "Heisei", 2}, {JapaneseEra.SHOWA, "Showa", 1}, {JapaneseEra.TAISHO, "Taisho", 0}, diff --git a/test/java/time/test/java/time/chrono/TestJapaneseChronology.java b/test/java/time/test/java/time/chrono/TestJapaneseChronology.java index a1df28acf20bfcacb0bb23cff776fde2053f6733..ca7a9130b0fb4265e0dd4e534d166e0e95a677e4 100644 --- a/test/java/time/test/java/time/chrono/TestJapaneseChronology.java +++ b/test/java/time/test/java/time/chrono/TestJapaneseChronology.java @@ -34,6 +34,7 @@ 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 @@ -59,7 +60,7 @@ public class TestJapaneseChronology { { 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 @@ public class TestJapaneseChronology { { 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 @@ public class TestJapaneseChronology { { 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 @@ public class TestJapaneseChronology { { 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 @@ public class TestJapaneseChronology { { 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 @@ public class TestJapaneseChronology { 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)); + } + } } diff --git a/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java b/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java index cb987f651804d5201220d685cdd3ca4d3ad59d6d..f86f1443b83b08d65a27c15df7d8b71fea3da287 100644 --- a/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java +++ b/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java @@ -776,9 +776,9 @@ public class TestUmmAlQuraChronology { {HijrahDate.of(1434,5,1), "Japanese Heisei 25-03-13"}, {HijrahDate.of(1436,1,1), "Japanese Heisei 26-10-25"}, {HijrahDate.of(1440,8,25), "Japanese Heisei 31-04-30"}, - {HijrahDate.of(1440,8,26), "Japanese NewEra 1-05-01"}, - {HijrahDate.of(1500,6,12), "Japanese NewEra 59-05-05"}, - {HijrahDate.of(1550,3,11), "Japanese NewEra 107-08-11"}, + {HijrahDate.of(1440,8,26), "Japanese Reiwa 1-05-01"}, + {HijrahDate.of(1500,6,12), "Japanese Reiwa 59-05-05"}, + {HijrahDate.of(1550,3,11), "Japanese Reiwa 107-08-11"}, }; } diff --git a/test/java/time/test/java/time/format/TestNonIsoFormatter.java b/test/java/time/test/java/time/format/TestNonIsoFormatter.java index 2dcd634428fcf67f99b5fd577153a238c3d019a0..240443f8f35e656ef9a958ef814220a177efa6c6 100644 --- a/test/java/time/test/java/time/format/TestNonIsoFormatter.java +++ b/test/java/time/test/java/time/format/TestNonIsoFormatter.java @@ -142,7 +142,7 @@ public class TestNonIsoFormatter { // Chronology, lenient era/year, strict era/year { JAPANESE, "Meiji 123", "Heisei 2" }, { JAPANESE, "Showa 65", "Heisei 2" }, - { JAPANESE, "Heisei 32", "NewEra 2" }, // NewEra + { JAPANESE, "Heisei 32", "Reiwa 2" }, }; } diff --git a/test/java/util/Calendar/CalendarTestScripts/CalendarAdapter.java b/test/java/util/Calendar/CalendarTestScripts/CalendarAdapter.java index 1f3f1d0f2c704e96916bad9a6b3e40a5fb04ba2d..90d63e287d746e6c7a7ad65f8857b6f308cec003 100644 --- a/test/java/util/Calendar/CalendarTestScripts/CalendarAdapter.java +++ b/test/java/util/Calendar/CalendarTestScripts/CalendarAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -364,7 +364,7 @@ public class CalendarAdapter extends Calendar { "Taisho", "Showa", "Heisei", - "NewEra" + "Reiwa" }; break; } diff --git a/test/java/util/Calendar/CalendarTestScripts/Symbol.java b/test/java/util/Calendar/CalendarTestScripts/Symbol.java index 7368a6da8da806bec9cccf9e7e3363bd2a9cfce1..a310f968ded548de3215444ceaa8682ff18351d9 100644 --- a/test/java/util/Calendar/CalendarTestScripts/Symbol.java +++ b/test/java/util/Calendar/CalendarTestScripts/Symbol.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -322,7 +322,7 @@ public class Symbol { put("taisho", new Symbol(Type.ERA, 2)); put("showa", new Symbol(Type.ERA, 3)); put("heisei", new Symbol(Type.ERA, 4)); - put("newera", new Symbol(Type.ERA, 5)); + put("reiwa", new Symbol(Type.ERA, 5)); } } diff --git a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese.cts b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese.cts index bf4c8cba13529db4ccd0da2d35e7dadd5ce3f81b..71b6e945b376852aee3f81f398d3a20c21fcbb44 100644 --- a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese.cts +++ b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese.cts @@ -57,7 +57,7 @@ test Default dates check millisecond 0 clear all - set era NewEra + set era Reiwa check era Heisei check datetime 31 Jan 1 0 0 0 check millisecond 0 diff --git a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_add.cts b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_add.cts index 63e5debc84d82188791ee4136e496b63bf02a7f8..b698b785815216233bf6b71d17a6a47fd422d420 100644 --- a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_add.cts +++ b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_add.cts @@ -16,10 +16,10 @@ set non-lenient test add ERA use jcal clear all - set date NewEra 17 Mar 8 + set date Reiwa 17 Mar 8 add era 10 - # as of NewEra 17 March 8 - check era NewEra + # as of Reiwa 17 March 8 + check era Reiwa add era -100 check era BeforeMeiji @@ -342,12 +342,12 @@ test add MONTH check date BeforeMeiji $minyear May 18 check timeofday 1 47 4 191 - set date NewEra 17 Jan 1 + set date Reiwa 17 Jan 1 get max year assign $result $max - set date NewEra $max Jul 17 + set date Reiwa $max Jul 17 add month 1 - check date NewEra $max Aug 17 + check date Reiwa $max Aug 17 # set date Heisei $max Jul 28 # set timeofday 23 59 59 999 # add month 1 diff --git a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_minmax.cts b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_minmax.cts index 1faea67908c4623078144de74a51017801d815a8..b907a378fce7ac28d5f9cfcce07e3f1f231256ed 100644 --- a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_minmax.cts +++ b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_minmax.cts @@ -14,10 +14,10 @@ new instance tokyocal test Make sure that the maximum year value doesn't depent on era use jcal - # Note: the max year value is as of NewEra + # Note: the max year value is as of Reiwa assign 292276976 $max clear all - set date NewEra 1 May 1 + set date Reiwa 1 May 1 get millis check max year $max assign $max $maxyear @@ -39,9 +39,9 @@ test Make sure that the maximum year value doesn't depent on era test Max of ERA use jcal - # Assumption: NewEra is the current era - check maximum era NewEra - check leastmax era NewEra + # Assumption: Reiwa is the current era + check maximum era Reiwa + check leastmax era Reiwa test Actual max MONTH use jcal @@ -78,7 +78,7 @@ test Actual max MONTH check actualmax month Apr clear all - set date NewEra 2 Jan 1 + set date Reiwa 2 Jan 1 set year $maxyear check actualmax month Aug get millis @@ -133,8 +133,8 @@ test Actual max DAY_OF_YEAR # time zone dependent use tokyocal clear all - set date NewEra $maxyear Jan 1 - # the last date of NewEra is N292276976.08.17T16:12:55.807+0900 + set date Reiwa $maxyear Jan 1 + # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900 check actualmax day_of_year 229 # 31+28+31+30+31+30+31+17 test Actual max WEEK_OF_YEAR @@ -165,12 +165,12 @@ test Actual max WEEK_OF_YEAR clear all set date Heisei 31 Apr 28 check actualmax week_of_year 17 - set date NewEra 1 Aug 9 + set date Reiwa 1 Aug 9 check actualmax week_of_year 35 use tokyocal - set date NewEra $maxyear Jan 1 - # the last date of NewEra is N292276976.08.17T16:12:55.807+0900 (Sunday) + set date Reiwa $maxyear Jan 1 + # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900 (Sunday) # The year is equivalent to 2003 (Gregorian). check actualmax week_of_year 34 @@ -197,12 +197,12 @@ test Actual max WEEK_OF_MONTH clear all set date Heisei 31 Apr 30 check actualmax week_of_month 5 - set date NewEra 1 May 1 + set date Reiwa 1 May 1 check actualmax week_of_month 5 use tokyocal - set date NewEra $maxyear Jan 1 - # the last date of NewEra is N292276976.08.17T16:12:55.807+0900 (Sunday) + set date Reiwa $maxyear Jan 1 + # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900 (Sunday) # The year is equivalent to 2003 (Gregorian). check actualmax week_of_month 4 @@ -229,13 +229,13 @@ test Actual max DAY_OF_WEEK_IN_MONTH clear all set date Heisei 31 Apr 30 check actualmax week_of_month 5 - set date NewEra 1 May 1 + set date Reiwa 1 May 1 check actualmax week_of_month 5 use tokyocal clear all - set date NewEra $maxyear Jan 1 - # the last date of NewEra is N292276976.08.17T16:12:55.807+0900 (Sunday) + set date Reiwa $maxyear Jan 1 + # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900 (Sunday) # The year is equivalent to 2003 (Gregorian). check actualmax week_of_month 4 @@ -269,11 +269,11 @@ test Actual max YEAR set date Heisei 1 Aug 18 check actualmax year 30 - set date NewEra 1 Apr 30 + set date Reiwa 1 Apr 30 check actualmax year 31 # Date/time beyond the last date in the max year. - set date NewEra 1 Aug 18 + set date Reiwa 1 Aug 18 check actualmax year 292276975 test Least max YEAR diff --git a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_roll.cts b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_roll.cts index fe82f6aa5e2929ae66c09afefb6ae92057fbeaba..daa2bd4d8fa07feb48820c4c6349bd2443534f60 100644 --- a/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_roll.cts +++ b/test/java/util/Calendar/CalendarTestScripts/japanese/japanese_roll.cts @@ -147,13 +147,13 @@ test roll YEAR roll year -1 check date Heisei 31 Apr 30 - set date NewEra 2 Apr 30 + set date Reiwa 2 Apr 30 get max year assign $result $hmax roll year -1 - check date NewEra $hmax Apr 30 + check date Reiwa $hmax Apr 30 roll year 1 - check date NewEra 2 Apr 30 + check date Reiwa 2 Apr 30 test roll MONTH set date BeforeMeiji 1867 Dec 1 @@ -276,16 +276,16 @@ test roll MONTH check date BeforeMeiji $minyear May 18 check timeofday 1 47 4 191 - set date NewEra 17 Jan 1 + set date Reiwa 17 Jan 1 get max year assign $result $max - set date NewEra $max Jul 28 + set date Reiwa $max Jul 28 roll month 1 - check date NewEra $max Aug 17 - set date NewEra $max Jul 28 + check date Reiwa $max Aug 17 + set date Reiwa $max Jul 28 set timeofday 23 59 59 999 roll month 1 - check date NewEra $max Aug 16 + check date Reiwa $max Aug 16 check timeofday 23 59 59 999 test roll WEEK_OF_YEAR diff --git a/test/java/util/Calendar/JapaneseEraNameTest.java b/test/java/util/Calendar/JapaneseEraNameTest.java index e3051bd3890b00a4af1b2fbfa71886dacb5087fc..66a86e653bd1ed9e3bf123cd9229e23ef3d264d9 100644 --- a/test/java/util/Calendar/JapaneseEraNameTest.java +++ b/test/java/util/Calendar/JapaneseEraNameTest.java @@ -47,12 +47,12 @@ public class JapaneseEraNameTest { // 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" }, - { LONG, CHINA, "NewEra" }, - { SHORT,JAPAN, "\u5143\u53f7" },// NewEra - { SHORT,US, "NewEra" }, - { SHORT,CHINA, "N" }, + // { LONG, JAPAN, "\u4ee4\u548c" }, + { LONG, US, "Reiwa" }, + { LONG, CHINA, "Reiwa" }, + { SHORT, JAPAN, "\u4ee4\u548c" }, + { SHORT, US, "Reiwa" }, + { SHORT, CHINA, "R" }, }; public static void main(String[] args) { diff --git a/test/java/util/Calendar/JapaneseLenientEraTest.java b/test/java/util/Calendar/JapaneseLenientEraTest.java index 285177219f46fa0eb66085a8868d552731ab4b83..1248031513e3d48e30ddfba5da171a853d45a695 100644 --- a/test/java/util/Calendar/JapaneseLenientEraTest.java +++ b/test/java/util/Calendar/JapaneseLenientEraTest.java @@ -47,7 +47,7 @@ public class JapaneseLenientEraTest { // lenient era/year, strict era/year { "Meiji 123", "Heisei 2" }, { "Showa 65", "Heisei 2" }, - { "Heisei 32", "NewEra 2" }, // NewEra + { "Heisei 32", "Reiwa 2" }, }; } diff --git a/test/java/util/Calendar/NarrowNamesTest.java b/test/java/util/Calendar/NarrowNamesTest.java index 16674fadb20341595bb5c217e2d9b7bc9884bb1c..0b9dd020e695a8b529c5981ebc41830ed8bface7 100644 --- a/test/java/util/Calendar/NarrowNamesTest.java +++ b/test/java/util/Calendar/NarrowNamesTest.java @@ -48,7 +48,7 @@ public class NarrowNamesTest { HOUR_OF_DAY, 23); test(JAJPJP, DAY_OF_WEEK, LocalDateTime.now().isBefore(LocalDateTime.of(2019, 5, 1, 0, 0)) ? - "\u65e5" : "\u706b", // "Sun" for HEISEI, "Tue" for NEWERA + "\u65e5" : "\u706b", // "Sun" for HEISEI, "Tue" for REIWA YEAR, 24, MONTH, DECEMBER, DAY_OF_MONTH, 23); test(THTH, MONTH, NARROW_STANDALONE, "\u0e18.\u0e04.", YEAR, 2555, MONTH, DECEMBER, DAY_OF_MONTH, 5);