ICU-511.27.tar.gz

[apple/icu.git] / icuSources / test / intltest / dtfmtrtts.cpp

diff --git a/icuSources/test/intltest/dtfmtrtts.cpp b/icuSources/test/intltest/dtfmtrtts.cpp
index 693949730b051cb5cbdd3f8cd86558e6c2f55650..b0ee96a6405331a42e39147f255825d649249f79 100644 (file)
--- a/icuSources/test/intltest/dtfmtrtts.cpp
+++ b/icuSources/test/intltest/dtfmtrtts.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
  * COPYRIGHT: 
 /***********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2006, International Business Machines Corporation
+ * Copyright (c) 1997-2012, International Business Machines Corporation

  * and others. All Rights Reserved.
  ***********************************************************************/
  
  * and others. All Rights Reserved.
  ***********************************************************************/
  


@@ -28,6 +28,8 @@
 #define INFINITE 0
 #endif
 
 #define INFINITE 0
 #endif
 

+static const UVersionInfo ICU_452 = {4,5,2,0};
+

 // Define this to test just a single locale
 //#define TEST_ONE_LOC  "cs_CZ"
 
 // Define this to test just a single locale
 //#define TEST_ONE_LOC  "cs_CZ"
 


@@ -89,7 +91,10 @@ void DateFormatRoundTripTest::TestCentury()
     Locale locale("es_PA");
     UnicodeString pattern = "MM/dd/yy hh:mm:ss a z";
     SimpleDateFormat fmt(pattern, locale, status);
     Locale locale("es_PA");
     UnicodeString pattern = "MM/dd/yy hh:mm:ss a z";
     SimpleDateFormat fmt(pattern, locale, status);

-    if(!assertSuccess("trying to construct", status))return;
+    if (U_FAILURE(status)) {
+        dataerrln("Fail: construct SimpleDateFormat: %s", u_errorName(status));
+        return;
+    }

     UDate date[] = {-55018555891590.05, 0, 0};
     UnicodeString result[2];
 
     UDate date[] = {-55018555891590.05, 0, 0};
     UnicodeString result[2];
 


@@ -98,17 +103,17 @@ void DateFormatRoundTripTest::TestCentury()
     fmt.format(date[1], result[1]);
     date[2] = fmt.parse(result[1], status);
 
     fmt.format(date[1], result[1]);
     date[2] = fmt.parse(result[1], status);
 

-    /* This test case worked OK by accident before.Ê date[1] != date[0],
+    /* This test case worked OK by accident before.  date[1] != date[0],

      * because we use -80/+20 year window for 2-digit year parsing.
      * because we use -80/+20 year window for 2-digit year parsing.

-     * (date[0] is in year 1926, date[1] is in year 2026.)Ê result[1] set
+     * (date[0] is in year 1926, date[1] is in year 2026.)  result[1] set

      * by the first format call returns "07/13/26 07:48:28 p.m. PST",
      * which is correct, because DST was not used in year 1926 in zone
      * by the first format call returns "07/13/26 07:48:28 p.m. PST",
      * which is correct, because DST was not used in year 1926 in zone

-     * America/Los_Angeles.Ê When this is parsed, date[1] becomes a time
-     * in 2026, which is "07/13/26 08:48:28 p.m. PDT".Ê There was a zone
+     * America/Los_Angeles.  When this is parsed, date[1] becomes a time
+     * in 2026, which is "07/13/26 08:48:28 p.m. PDT".  There was a zone

      * offset calculation bug that observed DST in 1926, which was resolved.
      * Before the bug was resolved, result[0] == result[1] was true,
      * but after the bug fix, the expected result is actually
      * offset calculation bug that observed DST in 1926, which was resolved.
      * Before the bug was resolved, result[0] == result[1] was true,
      * but after the bug fix, the expected result is actually

-     * result[0] != result[1]. -Yoshit
+     * result[0] != result[1]. -Yoshito

      */
     /* TODO: We need to review this code and clarify what we really
      * want to test here.
      */
     /* TODO: We need to review this code and clarify what we really
      * want to test here.


@@ -126,8 +131,10 @@ void DateFormatRoundTripTest::TestDateFormatRoundTrip()
     UErrorCode status = U_ZERO_ERROR;
 
     getFieldCal = Calendar::createInstance(status);
     UErrorCode status = U_ZERO_ERROR;
 
     getFieldCal = Calendar::createInstance(status);

-    failure(status, "Calendar::createInstance");
-    if(!assertSuccess("trying to construct", status))return;
+    if (U_FAILURE(status)) {
+        dataerrln("Fail: Calendar::createInstance: %s", u_errorName(status));
+        return;
+    }

 
 
     int32_t locCount = 0;
 
 
     int32_t locCount = 0;


@@ -164,7 +171,7 @@ void DateFormatRoundTripTest::TestDateFormatRoundTrip()
 #if 1
     // installed locales
     for (int i=0; i < locCount; ++i) {
 #if 1
     // installed locales
     for (int i=0; i < locCount; ++i) {

-        test(avail[i]);
+            test(avail[i]);

     }
 #endif
 
     }
 #endif
 


@@ -258,7 +265,7 @@ void DateFormatRoundTripTest::test(const Locale& loc)
                 logln("Testing dstyle" + UnicodeString(styleName((DateFormat::EStyle)dstyle)) + ", tstyle" + UnicodeString(styleName((DateFormat::EStyle)tstyle)) );
                 DateFormat *df = DateFormat::createDateTimeInstance((DateFormat::EStyle)dstyle, (DateFormat::EStyle)tstyle, loc);
                 if(df == NULL) {
                 logln("Testing dstyle" + UnicodeString(styleName((DateFormat::EStyle)dstyle)) + ", tstyle" + UnicodeString(styleName((DateFormat::EStyle)tstyle)) );
                 DateFormat *df = DateFormat::createDateTimeInstance((DateFormat::EStyle)dstyle, (DateFormat::EStyle)tstyle, loc);
                 if(df == NULL) {

-                    errln(UnicodeString("Could not DF::createDateTimeInstance ") + UnicodeString(styleName((DateFormat::EStyle)dstyle)) + ", tstyle" + UnicodeString(styleName((DateFormat::EStyle)tstyle))    + "Locale: " + loc.getDisplayName(temp));
+                    dataerrln(UnicodeString("Could not DF::createDateTimeInstance ") + UnicodeString(styleName((DateFormat::EStyle)dstyle)) + ", tstyle" + UnicodeString(styleName((DateFormat::EStyle)tstyle))    + "Locale: " + loc.getDisplayName(temp));

                 } else {
                     test(df, loc);
                     delete df;
                 } else {
                     test(df, loc);
                     delete df;


@@ -293,7 +300,8 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, const Locale &origLocale, UB
     // patterns we have, but it may be a problem later.
 
     UBool hasEra = (pat.indexOf(UnicodeString("G")) != -1);
     // patterns we have, but it may be a problem later.
 
     UBool hasEra = (pat.indexOf(UnicodeString("G")) != -1);

-    UBool hasZone = (pat.indexOf(UnicodeString("Z")) != -1) || (pat.indexOf(UnicodeString("z")) != -1) || (pat.indexOf(UnicodeString("v")) != -1);
+    UBool hasZoneDisplayName = (pat.indexOf(UnicodeString("z")) != -1) || (pat.indexOf(UnicodeString("v")) != -1) 
+        || (pat.indexOf(UnicodeString("V")) != -1);

 
     // Because patterns contain incomplete data representing the Date,
     // we must be careful of how we do the roundtrip.  We start with
 
     // Because patterns contain incomplete data representing the Date,
     // we must be careful of how we do the roundtrip.  We start with


@@ -375,9 +383,18 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, const Locale &origLocale, UB
             int maxSmatch = 1;
             if (dmatch > maxDmatch) {
                 // Time-only pattern with zone information and a starting date in PST.
             int maxSmatch = 1;
             if (dmatch > maxDmatch) {
                 // Time-only pattern with zone information and a starting date in PST.

-                if(timeOnly && hasZone && fmt->getTimeZone().inDaylightTime(d[0], status) && ! failure(status, "TimeZone::inDST()")) {
-                    maxDmatch = 3;
-                    maxSmatch = 2;
+                if(timeOnly && hasZoneDisplayName) {
+                    int32_t startRaw, startDst;
+                    fmt->getTimeZone().getOffset(d[0], FALSE, startRaw, startDst, status);
+                    failure(status, "TimeZone::getOffset");
+                    // if the start offset is greater than the offset on Jan 1, 1970
+                    // in PST, then need one more round trip.  There are two cases
+                    // fall into this category.  The start date is 1) DST or
+                    // 2) LMT (GMT-07:52:58).
+                    if (startRaw + startDst > -28800000) {
+                        maxDmatch = 3;
+                        maxSmatch = 2;
+                    }

                 }
             }
 
                 }
             }
 


@@ -402,24 +419,35 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, const Locale &origLocale, UB
                         && getField(d[0], UCAL_YEAR)
                             != getField(d[dmatch], UCAL_YEAR)
                         && !failure(status, "error status [smatch>maxSmatch]")
                         && getField(d[0], UCAL_YEAR)
                             != getField(d[dmatch], UCAL_YEAR)
                         && !failure(status, "error status [smatch>maxSmatch]")

-                        && ((hasZone
+                        && ((hasZoneDisplayName

                          && (fmt->getTimeZone().inDaylightTime(d[0], status)
                                 == fmt->getTimeZone().inDaylightTime(d[dmatch], status)
                             || getField(d[0], UCAL_MONTH) == UCAL_APRIL
                             || getField(d[0], UCAL_MONTH) == UCAL_OCTOBER))
                          && (fmt->getTimeZone().inDaylightTime(d[0], status)
                                 == fmt->getTimeZone().inDaylightTime(d[dmatch], status)
                             || getField(d[0], UCAL_MONTH) == UCAL_APRIL
                             || getField(d[0], UCAL_MONTH) == UCAL_OCTOBER))

-                         || !hasZone)
+                         || !hasZoneDisplayName)

                          )
                 {
                     maxSmatch = 2;
                          )
                 {
                     maxSmatch = 2;

-                }                
+                }
+                // If zone display name is used, fallback format might be used before 1970
+                else if (hasZoneDisplayName && d[0] < 0) {
+                    maxSmatch = 2;
+                }

             }
 
             }
 

-            if(dmatch > maxDmatch || smatch > maxSmatch) { // Special case for Japanese and Islamic (could have large negative years)
+            /*
+             * Special case for Japanese and Buddhist (could have large negative years)
+             * Also, Hebrew calendar need help handling leap month.
+             */
+            if(dmatch > maxDmatch || smatch > maxSmatch) {

               const char *type = fmt->getCalendar()->getType();
               const char *type = fmt->getCalendar()->getType();

-              if(!strcmp(type,"japanese")) {
+              if(!strcmp(type,"japanese") || (!strcmp(type,"buddhist"))) {

                 maxSmatch = 4;
                 maxDmatch = 4;
                 maxSmatch = 4;
                 maxDmatch = 4;

-              }
+              } else if(!strcmp(type,"hebrew")) {
+                  maxSmatch = 3;
+                  maxDmatch = 3;
+                }

             }
 
             // Use @v to see verbose results on successful cases
             }
 
             // Use @v to see verbose results on successful cases