ICU 56 update step 1

source/test/intltest/dtfmtrtts.cpp

 /***********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2014, International Business Machines Corporation
+ * Copyright (c) 1997-2015, International Business Machines Corporation
  * and others. All Rights Reserved.
  ***********************************************************************/
  
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/datefmt.h"
 #include "unicode/smpdtfmt.h"
 #include "unicode/gregocal.h"
@@ skipping 415 matching lines @@
                             || getField(d[0], UCAL_MONTH) == UCAL_OCTOBER))
                          || !hasZoneDisplayName)
                          )
                 {
                     maxSmatch = 2;
                 }
                 // If zone display name is used, fallback format might be used before 1970
                 else if (hasZoneDisplayName && d[0] < 0) {
                     maxSmatch = 2;
                 }
+                else if (timeOnly && !isGregorian && hasZoneDisplayName && maxSmatch == 1) {
+                    int32_t startRaw, startDst;
+                    fmt->getTimeZone().getOffset(d[1], FALSE, startRaw, startDst, status);
+                    failure(status, "TimeZone::getOffset");
+                    // If the calendar type is not Gregorian and the pattern is time only,
+                    // the calendar implementation may use a date before 1970 as day 0.
+                    // In this case, time zone offset of the default year might be
+                    // different from the one at 1970-01-01 in PST and string match requires
+                    // one more iteration.
+                    if (startRaw + startDst != -28800000) {
+                        maxSmatch = 2;
+                    }
+                }
             }
 
             /*
              * 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();
               if(!strcmp(type,"japanese") || (!strcmp(type,"buddhist"))) {
                 maxSmatch = 4;
@@ skipping 125 matching lines @@
     // Now scale up to ms
     a *= 365.25 * 24 * 60 * 60 * 1000;
 
     //return new Date((long)a);
     return a;
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof