X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/46f4442e9a5a4f3b98b7c1083586332f6a8a99a4..4388f060552cc537e71e957d32f35e9d75a61233:/icuSources/test/intltest/tzoffloc.cpp diff --git a/icuSources/test/intltest/tzoffloc.cpp b/icuSources/test/intltest/tzoffloc.cpp index 1c4c5848..0981b2f8 100644 --- a/icuSources/test/intltest/tzoffloc.cpp +++ b/icuSources/test/intltest/tzoffloc.cpp @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2007, International Business Machines Corporation and * +* Copyright (C) 2007-2011, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -121,7 +121,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { TimeZone* utc = TimeZone::createTimeZone("UTC"); Calendar* cal = Calendar::createInstance(*utc, status); if (U_FAILURE(status)) { - errln("Calendar::createInstance failed"); + dataerrln("Calendar::createInstance failed: %s", u_errorName(status)); return; } cal->clear(); @@ -193,7 +193,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { SimpleDateFormat df(UnicodeString("yyyy-MM-dd HH:mm:ss"), status); if (U_FAILURE(status)) { - errln("Failed to initialize a SimpleDateFormat"); + dataerrln("Failed to initialize a SimpleDateFormat - %s", u_errorName(status)); } df.setTimeZone(*utc); UnicodeString dateStr; @@ -210,7 +210,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { } else if (offset != OFFSETS1[d]) { dateStr.remove(); df.format(MILLIS[d], dateStr); - errln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dataerrln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dateStr + "(standard) - Got: " + offset + " Expected: " + OFFSETS1[d]); } } @@ -227,7 +227,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { } else if (rawOffset != OFFSETS2[m][0] || dstOffset != OFFSETS2[m][1]) { dateStr.remove(); df.format(MILLIS[m], dateStr); - errln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dataerrln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dateStr + "(wall) - Got: " + rawOffset + "/" + dstOffset + " Expected: " + OFFSETS2[m][0] + "/" + OFFSETS2[m][1]); @@ -248,7 +248,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { } else if (rawOffset != OFFSETS2[m][0] || dstOffset != OFFSETS2[m][1]) { dateStr.remove(); df.format(MILLIS[m], dateStr); - errln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dataerrln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dateStr + "(wall/kStandard/kStandard) - Got: " + rawOffset + "/" + dstOffset + " Expected: " + OFFSETS2[m][0] + "/" + OFFSETS2[m][1]); @@ -269,7 +269,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { } else if (rawOffset != OFFSETS3[m][0] || dstOffset != OFFSETS3[m][1]) { dateStr.remove(); df.format(MILLIS[m], dateStr); - errln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dataerrln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dateStr + "(wall/kDaylight/kDaylight) - Got: " + rawOffset + "/" + dstOffset + " Expected: " + OFFSETS3[m][0] + "/" + OFFSETS3[m][1]); @@ -290,7 +290,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { } else if (rawOffset != OFFSETS2[m][0] || dstOffset != OFFSETS2[m][1]) { dateStr.remove(); df.format(MILLIS[m], dateStr); - errln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dataerrln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dateStr + "(wall/kFormer/kLatter) - Got: " + rawOffset + "/" + dstOffset + " Expected: " + OFFSETS2[m][0] + "/" + OFFSETS2[m][1]); @@ -311,7 +311,7 @@ TimeZoneOffsetLocalTest::TestGetOffsetAroundTransition() { } else if (rawOffset != OFFSETS3[m][0] || dstOffset != OFFSETS3[m][1]) { dateStr.remove(); df.format(MILLIS[m], dateStr); - errln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dataerrln((UnicodeString)"Bad offset returned by TESTZONES[" + i + "] at " + dateStr + "(wall/kLatter/kFormer) - Got: " + rawOffset + "/" + dstOffset + " Expected: " + OFFSETS3[m][0] + "/" + OFFSETS3[m][1]);