ICU-23108 Reenable tests

Author: robertbastian

icu4c/source/i18n/erarules.cpp

@@ -329,11 +329,7 @@ int32_t EraRules::getEraCode(int32_t year, int32_t month, int32_t day, UErrorCod
         }
     }
     // Linear search from the end, which should hit the most likely eras first.
-    // Also this is the most efficient for any era if we have < 8 or so eras, so only less
-    // efficient for early eras in Japanese calendar (while we still have them). Formerly
-    // this used binary search which would only be better for those early Japanese eras,
-    // but now that is much more difficult since there may be holes in the sorted list.
-    // Note with this change, this no longer uses or depends on currentEra.
+    // Also this is the most efficient for any era if we have < 8 or so eras.
     for (int startIdx = startDatesLength; startIdx > 0;) {
         if (!isSet(startDates[--startIdx])) {
             continue;

icu4c/source/i18n/japancal.cpp

@@ -149,6 +149,10 @@ int32_t JapaneseCalendar::getDefaultMonthInYear(int32_t eyear, UErrorCode& statu
 
     int32_t month = 0;
 
+    if (era <= 1) {
+        return month;
+    }
+
     // Find out if we are at the edge of an era
     int32_t eraStart[3] = { 0,0,0 };
     gJapaneseEraRules->getStartDate(era, eraStart, status);
@@ -172,6 +176,10 @@ int32_t JapaneseCalendar::getDefaultDayInMonth(int32_t eyear, int32_t month, UEr
     int32_t era = internalGetEra();
     int32_t day = 1;
 
+    if (era <= 1) {
+        return day;
+    }
+
     int32_t eraStart[3] = { 0,0,0 };
     gJapaneseEraRules->getStartDate(era, eraStart, status);
     if (U_FAILURE(status)) {
@@ -194,14 +202,16 @@ int32_t JapaneseCalendar::handleGetExtendedYear(UErrorCode& status)
     if (U_FAILURE(status)) {
         return 0;
     }
+
+    int32_t era = internalGet(UCAL_ERA, gCurrentEra);
     // EXTENDED_YEAR in JapaneseCalendar is a Gregorian year
     // The default value of EXTENDED_YEAR is 1970 (Showa 45)
 
-    if (newerField(UCAL_EXTENDED_YEAR, UCAL_YEAR) == UCAL_EXTENDED_YEAR &&
-        newerField(UCAL_EXTENDED_YEAR, UCAL_ERA) == UCAL_EXTENDED_YEAR) {
+    if ((newerField(UCAL_EXTENDED_YEAR, UCAL_YEAR) == UCAL_EXTENDED_YEAR &&
+        newerField(UCAL_EXTENDED_YEAR, UCAL_ERA) == UCAL_EXTENDED_YEAR) || era <= 1) {
         return internalGet(UCAL_EXTENDED_YEAR, kGregorianEpoch);
     }
-    int32_t eraStartYear = gJapaneseEraRules->getStartYear(internalGet(UCAL_ERA, gCurrentEra), status);
+    int32_t eraStartYear = gJapaneseEraRules->getStartYear(era, status);
     if (U_FAILURE(status)) {
         return 0;
     }
@@ -224,13 +234,15 @@ void JapaneseCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status
     int32_t year = internalGet(UCAL_EXTENDED_YEAR); // Gregorian year
     int32_t eraCode = gJapaneseEraRules->getEraCode(year, internalGetMonth(status) + 1, internalGet(UCAL_DAY_OF_MONTH), status);
 
-    int32_t startYear = gJapaneseEraRules->getStartYear(eraCode, status) - 1;
-    if (U_FAILURE(status)) {
-        return;
-    }
-    if (uprv_add32_overflow(year, -startYear,  &year)) {
-        status = U_ILLEGAL_ARGUMENT_ERROR;
-        return;
+    if (year > 0) {
+        int32_t startYear = gJapaneseEraRules->getStartYear(eraCode, status) - 1;
+        if (U_FAILURE(status)) {
+            return;
+        }
+        if (uprv_add32_overflow(year, -startYear,  &year)) {
+            status = U_ILLEGAL_ARGUMENT_ERROR;
+            return;
+        }
     }
     internalSet(UCAL_ERA, eraCode);
     internalSet(UCAL_YEAR, year);

icu4c/source/i18n/japancal.h

@@ -45,13 +45,12 @@ U_NAMESPACE_BEGIN
  * handles this distinction correctly when computing dates.  However, in lenient
  * mode either form of date is acceptable as input. 
  * <p>
- * In modern times, eras have started on January 8, 1868 AD, Gregorian (Meiji),
- * July 30, 1912 (Taisho), December 25, 1926 (Showa), and January 7, 1989 (Heisei).  Constants
- * for these eras, suitable for use in the <code>UCAL_ERA</code> field, are provided
- * in this class.  Note that the <em>number</em> used for each era is more or
- * less arbitrary.  Currently, the era starting in 645 AD is era #0; however this
- * may change in the future.  Use the predefined constants rather than using actual,
- * absolute numbers.
+ * In modern times, eras have started on October 23, 1868 AD, Gregorian (Meiji),
+ * July 30, 1912 (Taisho), December 25, 1926 (Showa), January 8, 1989 (Heisei), and
+ * May 1, 2019 (Reiwa).  Constants for these eras, suitable for use in the
+ * <code>UCAL_ERA</code> field, are provided in this class.  Note that the 
+ * <em>number</em> used for each era is more or less arbitrary. Use the predefined
+ * constants rather than using actual, absolute numbers.
  * <p>
  * Since ICU4C 63, start date of each era is imported from CLDR. CLDR era data
  * may contain tentative era in near future with placeholder names. By default,
@@ -204,7 +203,7 @@ class JapaneseCalendar : public GregorianCalendar {
      */
     virtual int32_t getDefaultDayInMonth(int32_t eyear, int32_t month, UErrorCode& status) override;
 
-    virtual bool isEra0CountingBackward() const override { return false; }
+    virtual bool isEra0CountingBackward() const override { return true; }
 };
 
 U_NAMESPACE_END

icu4c/source/test/cintltst/ccaltst.c

@@ -2146,8 +2146,9 @@ static const EraTestItem eraTestItems[] = {
     { "en@calendar=gregorian", true },
     { "en@calendar=roc", true },
     { "en@calendar=coptic", true },
+    /* calendars with non-modern era 0 that goes backwards, max era > 1 */
+    { "en@calendar=japanese", true },
     /* calendars with non-modern era 0 that goes forwards, max era > 1 */
-    { "en@calendar=japanese", false },
     { "en@calendar=chinese", false },
     /* calendars with non-modern era 0 that goes forwards, max era == 1 */
     { "en@calendar=ethiopic", false },
@@ -2167,10 +2168,6 @@ static const UChar zoneGMT[] = { 0x47,0x4D,0x54,0 };
 void TestAddRollEra0AndEraBounds(void) {
     const EraTestItem * eraTestItemPtr;
     for (eraTestItemPtr = eraTestItems; eraTestItemPtr->locale != NULL; eraTestItemPtr++) {
-        if (uprv_strstr(eraTestItemPtr->locale, "calendar=japanese") != NULL &&
-                log_knownIssue("ICU-23108", "ICU needs to implement era inheritance")) {
-            continue;
-        }
         UErrorCode status = U_ZERO_ERROR;
         UCalendar *ucalTest = ucal_open(zoneGMT, -1, eraTestItemPtr->locale, UCAL_DEFAULT, &status);
         if ( U_SUCCESS(status) ) {

icu4c/source/test/intltest/incaltst.cpp

@@ -594,7 +594,7 @@ void IntlCalendarTest::TestJapaneseFormat() {
         status = U_ZERO_ERROR;
         simpleTest(loc, expect, expectDate, status);
     }
-    if (!logKnownIssue("ICU-23108", "ICU needs to implement era inheritance")) {
+    {
         UnicodeString expect = u"西暦1776年7月4日木曜日";
         UDate         expectDate = -6106032422000.0; // 1776-07-04T00:00:00Z-075258
         Locale        loc("ja_JP@calendar=japanese");
@@ -621,7 +621,7 @@ void IntlCalendarTest::TestJapaneseFormat() {
         simpleTest(loc, expect, expectDate, status);    
 
     }
-    if (!logKnownIssue("ICU-23108", "ICU needs to implement era inheritance")) {
+    {
         UnicodeString expect = u"西暦1456年2月29日日曜日";
         UDate         expectDate =  -16214400422000.0;  // 1456-03-09T00:00Z-075258
         Locale        loc("ja_JP@calendar=japanese");