+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/***********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation
+ * Copyright (c) 1997-2016, International Business Machines Corporation
* and others. All Rights Reserved.
***********************************************************************/
#include "cstring.h"
#include "olsontz.h"
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
#define CASE(id,test) case id: \
name = #test; \
if (exec) { \
TESTCASE_AUTO(TestGetRegion);
TESTCASE_AUTO(TestGetAvailableIDsNew);
TESTCASE_AUTO(TestGetUnknown);
+ TESTCASE_AUTO(TestGetGMT);
TESTCASE_AUTO(TestGetWindowsID);
TESTCASE_AUTO(TestGetIDForWindowsID);
TESTCASE_AUTO_END;
infoln("WARNING: t_timezone may be incorrect. It is not a multiple of 15min.", tzoffset);
}
+ TimeZone* hostZone = TimeZone::detectHostTimeZone();
+ int32_t hostZoneRawOffset = hostZone->getRawOffset();
+ logln("hostZone->getRawOffset() = %d , tzoffset = %d", hostZoneRawOffset, tzoffset * (-1000));
+
+ /* Host time zone's offset should match the offset returned by uprv_timezone() */
+ if (hostZoneRawOffset != tzoffset * (-1000)) {
+ errln("FAIL: detectHostTimeZone()'s raw offset != host timezone's offset");
+ }
+ delete hostZone;
+
UErrorCode status = U_ZERO_ERROR;
const char* tzver = TimeZone::getTZDataVersion(status);
if (U_FAILURE(status)) {
errcheckln(status, "FAIL: getTZDataVersion failed - %s", u_errorName(status));
- } else if (uprv_strlen(tzver) != 5 /* 4 digits + 1 letter */) {
+ } else if (uprv_strlen(tzver) < 5 || uprv_strlen(tzver) > 7 /*4 digits + 1-3 letters*/) {
errln((UnicodeString)"FAIL: getTZDataVersion returned " + tzver);
} else {
logln((UnicodeString)"tzdata version: " + tzver);
{"UTC", 0, FALSE}, // Olson etcetera 0
{"ECT", 60, TRUE}, // ICU Link - Europe/Paris
{"MET", 60, TRUE}, // Olson europe 1:00 C-Eur
- {"CAT", 120, FALSE}, // ICU Link - Africa/Harare
- {"ART", 120, TRUE}, // ICU Link - Africa/Cairo
+ {"CAT", 120, FALSE}, // ICU Link - Africa/Maputo
+ {"ART", 120, FALSE}, // ICU Link - Africa/Cairo
{"EET", 120, TRUE}, // Olson europe 2:00 EU
{"EAT", 180, FALSE}, // ICU Link - Africa/Addis_Ababa
{"NET", 240, FALSE}, // ICU Link - Asia/Yerevan
"AST", "America/Anchorage",
"BET", "America/Sao_Paulo",
"BST", "Asia/Dhaka", // # spelling changed in 2000h; was Asia/Dacca
- "CAT", "Africa/Harare",
+ "CAT", "Africa/Maputo",
"CNT", "America/St_Johns",
"CST", "America/Chicago",
"CTT", "Asia/Shanghai",
/* Generated by org.unicode.cldr.tool.CountItems */
/* zoneID, canonical zoneID */
- {"Africa/Timbuktu", "Africa/Bamako"},
+ {"Africa/Asmara", "Africa/Addis_Ababa"},
+ {"Africa/Timbuktu", "Africa/Abidjan"},
{"America/Argentina/Buenos_Aires", "America/Buenos_Aires"},
{"America/Argentina/Catamarca", "America/Catamarca"},
{"America/Argentina/ComodRivadavia", "America/Catamarca"},
{"America/Argentina/Cordoba", "America/Cordoba"},
{"America/Argentina/Jujuy", "America/Jujuy"},
{"America/Argentina/Mendoza", "America/Mendoza"},
+ {"America/Atikokan", "America/Coral_Harbour"},
{"America/Atka", "America/Adak"},
{"America/Ensenada", "America/Tijuana"},
- {"America/Fort_Wayne", "America/Indiana/Indianapolis"},
- {"America/Indianapolis", "America/Indiana/Indianapolis"},
+ {"America/Fort_Wayne", "America/Indianapolis"},
+ {"America/Indiana/Indianapolis", "America/Indianapolis"},
+ {"America/Kentucky/Louisville", "America/Louisville"},
{"America/Knox_IN", "America/Indiana/Knox"},
- {"America/Louisville", "America/Kentucky/Louisville"},
{"America/Porto_Acre", "America/Rio_Branco"},
{"America/Rosario", "America/Cordoba"},
- {"America/Virgin", "America/St_Thomas"},
+ {"America/Shiprock", "America/Denver"},
+ {"America/Virgin", "America/Anguilla"},
+ {"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Asia/Ashkhabad", "Asia/Ashgabat"},
- {"Asia/Chungking", "Asia/Chongqing"},
+ {"Asia/Chongqing", "Asia/Shanghai"},
+ {"Asia/Chungking", "Asia/Shanghai"},
{"Asia/Dacca", "Asia/Dhaka"},
+ {"Asia/Harbin", "Asia/Shanghai"},
+ {"Asia/Ho_Chi_Minh", "Asia/Saigon"},
{"Asia/Istanbul", "Europe/Istanbul"},
+ {"Asia/Kashgar", "Asia/Urumqi"},
+ {"Asia/Kathmandu", "Asia/Katmandu"},
+ {"Asia/Kolkata", "Asia/Calcutta"},
{"Asia/Macao", "Asia/Macau"},
{"Asia/Tel_Aviv", "Asia/Jerusalem"},
{"Asia/Thimbu", "Asia/Thimphu"},
{"Asia/Ujung_Pandang", "Asia/Makassar"},
{"Asia/Ulan_Bator", "Asia/Ulaanbaatar"},
+ {"Atlantic/Faroe", "Atlantic/Faeroe"},
+ {"Atlantic/Jan_Mayen", "Arctic/Longyearbyen"},
{"Australia/ACT", "Australia/Sydney"},
{"Australia/Canberra", "Australia/Sydney"},
{"Australia/LHI", "Australia/Lord_Howe"},
{"Chile/Continental", "America/Santiago"},
{"Chile/EasterIsland", "Pacific/Easter"},
{"Cuba", "America/Havana"},
+ {"EST", "Etc/GMT+5"},
{"Egypt", "Africa/Cairo"},
{"Eire", "Europe/Dublin"},
{"Etc/GMT+0", "Etc/GMT"},
{"Etc/GMT-0", "Etc/GMT"},
{"Etc/GMT0", "Etc/GMT"},
{"Etc/Greenwich", "Etc/GMT"},
- {"Etc/UCT", "Etc/GMT"},
- {"Etc/UTC", "Etc/GMT"},
- {"Etc/Universal", "Etc/GMT"},
- {"Etc/Zulu", "Etc/GMT"},
+ {"Etc/UCT", "Etc/UTC"},
+ {"Etc/Universal", "Etc/UTC"},
+ {"Etc/Zulu", "Etc/UTC"},
{"Europe/Belfast", "Europe/London"},
{"Europe/Nicosia", "Asia/Nicosia"},
{"Europe/Tiraspol", "Europe/Chisinau"},
{"GMT-0", "Etc/GMT"},
{"GMT0", "Etc/GMT"},
{"Greenwich", "Etc/GMT"},
+ {"HST", "Etc/GMT+10"},
{"Hongkong", "Asia/Hong_Kong"},
{"Iceland", "Atlantic/Reykjavik"},
{"Iran", "Asia/Tehran"},
{"Japan", "Asia/Tokyo"},
{"Kwajalein", "Pacific/Kwajalein"},
{"Libya", "Africa/Tripoli"},
+ {"MST", "Etc/GMT+7"},
{"Mexico/BajaNorte", "America/Tijuana"},
{"Mexico/BajaSur", "America/Mazatlan"},
{"Mexico/General", "America/Mexico_City"},
- {"NZ", "Pacific/Auckland"},
+ {"NZ", "Antarctica/McMurdo"},
{"NZ-CHAT", "Pacific/Chatham"},
- {"Navajo", "America/Shiprock"},
+ {"Navajo", "America/Denver"},
{"PRC", "Asia/Shanghai"},
- {"Pacific/Samoa", "Pacific/Pago_Pago"},
+ {"Pacific/Chuuk", "Pacific/Truk"},
+ {"Pacific/Pohnpei", "Pacific/Ponape"},
+ {"Pacific/Samoa", "Pacific/Midway"},
{"Pacific/Yap", "Pacific/Truk"},
{"Poland", "Europe/Warsaw"},
{"Portugal", "Europe/Lisbon"},
{"ROC", "Asia/Taipei"},
{"ROK", "Asia/Seoul"},
{"Singapore", "Asia/Singapore"},
+ {"SystemV/AST4", "Etc/GMT+4"},
+ {"SystemV/CST6", "Etc/GMT+6"},
+ {"SystemV/EST5", "Etc/GMT+5"},
+ {"SystemV/HST10", "Etc/GMT+10"},
+ {"SystemV/MST7", "Etc/GMT+7"},
+ {"SystemV/PST8", "Etc/GMT+8"},
+ {"SystemV/YST9", "Etc/GMT+9"},
{"Turkey", "Europe/Istanbul"},
- {"UCT", "Etc/GMT"},
+ {"UCT", "Etc/UTC"},
{"US/Alaska", "America/Anchorage"},
{"US/Aleutian", "America/Adak"},
{"US/Arizona", "America/Phoenix"},
{"US/Central", "America/Chicago"},
- {"US/East-Indiana", "America/Indiana/Indianapolis"},
+ {"US/East-Indiana", "America/Indianapolis"},
{"US/Eastern", "America/New_York"},
{"US/Hawaii", "Pacific/Honolulu"},
{"US/Indiana-Starke", "America/Indiana/Knox"},
{"US/Mountain", "America/Denver"},
{"US/Pacific", "America/Los_Angeles"},
{"US/Pacific-New", "America/Los_Angeles"},
- {"US/Samoa", "Pacific/Pago_Pago"},
- {"UTC", "Etc/GMT"},
- {"Universal", "Etc/GMT"},
+ {"US/Samoa", "Pacific/Midway"},
+ {"UTC", "Etc/UTC"},
+ {"Universal", "Etc/UTC"},
{"W-SU", "Europe/Moscow"},
- {"Zulu", "Etc/GMT"},
- /* Total: 113 */
-
+ {"Zulu", "Etc/UTC"},
+ /* Total: 136 */
};
TimeZone::EDisplayType styles[] = { TimeZone::SHORT, TimeZone::LONG };
int32_t i, j, k, loc;
UnicodeString fromName, toName;
TimeZone *from = NULL, *to = NULL;
- for(i = 0; i < (int32_t)(sizeof(kData)/sizeof(kData[0])); i++) {
+ for(i = 0; i < UPRV_LENGTHOF(kData); i++) {
from = TimeZone::createTimeZone(kData[i].from);
to = TimeZone::createTimeZone(kData[i].to);
if(!from->hasSameRules(*to)) {
if(!quick) {
for(loc = 0; loc < noLoc; loc++) {
const char* locale = uloc_getAvailable(loc);
- for(j = 0; j < (int32_t)(sizeof(styles)/sizeof(styles[0])); j++) {
- for(k = 0; k < (int32_t)(sizeof(useDst)/sizeof(useDst[0])); k++) {
+ for(j = 0; j < UPRV_LENGTHOF(styles); j++) {
+ for(k = 0; k < UPRV_LENGTHOF(useDst); k++) {
fromName.remove();
toName.remove();
from->getDisplayName(useDst[k], styles[j],locale, fromName);
TimeZone *tz;
UDate dt;
int32_t t, i, raw, dst;
- for (t = 0; t < LENGTHOF(timezones); ++t) {
+ for (t = 0; t < UPRV_LENGTHOF(timezones); ++t) {
tz = timezones[t];
- for (i = 0; i < LENGTHOF(data); ++i) {
+ for (i = 0; i < UPRV_LENGTHOF(data); ++i) {
gc.set(data[i].year, data[i].month, data[i].day,
data[i].hour, data[i].minute, data[i].second);
dt = gc.getTime(status);
UnicodeString canonicalID;
UErrorCode ec = U_ZERO_ERROR;
UnicodeString *pResult = &TimeZone::getCanonicalID(bogus, canonicalID, ec);
- assertEquals("TimeZone::getCanonicalID(bogus) should fail", U_ILLEGAL_ARGUMENT_ERROR, ec);
+ assertEquals("TimeZone::getCanonicalID(bogus) should fail", (int32_t)U_ILLEGAL_ARGUMENT_ERROR, ec);
assertTrue("TimeZone::getCanonicalID(bogus) should return the dest string", pResult == &canonicalID);
// U_FAILURE on input.
UnicodeString berlin("Europe/Berlin");
ec = U_MEMORY_ALLOCATION_ERROR;
pResult = &TimeZone::getCanonicalID(berlin, canonicalID, ec);
- assertEquals("TimeZone::getCanonicalID(failure) should fail", U_MEMORY_ALLOCATION_ERROR, ec);
+ assertEquals("TimeZone::getCanonicalID(failure) should fail", (int32_t)U_MEMORY_ALLOCATION_ERROR, ec);
assertTrue("TimeZone::getCanonicalID(failure) should return the dest string", pResult == &canonicalID);
// Valid input should un-bogus the dest string.
const char *alias;
const char *zone;
} excluded1[] = {
+ {"Africa/Addis_Ababa", "Africa/Nairobi"},
+ {"Africa/Asmera", "Africa/Nairobi"},
{"Africa/Bamako", "Africa/Abidjan"},
+ {"Africa/Bangui", "Africa/Lagos"},
{"Africa/Banjul", "Africa/Abidjan"},
- {"Africa/Brazzaville", "Africa/Bangui"},
+ {"Africa/Blantyre", "Africa/Maputo"},
+ {"Africa/Brazzaville", "Africa/Lagos"},
+ {"Africa/Bujumbura", "Africa/Maputo"},
{"Africa/Conakry", "Africa/Abidjan"},
{"Africa/Dakar", "Africa/Abidjan"},
- {"Africa/Douala", "Africa/Bangui"},
+ {"Africa/Dar_es_Salaam", "Africa/Nairobi"},
+ {"Africa/Djibouti", "Africa/Nairobi"},
+ {"Africa/Douala", "Africa/Lagos"},
{"Africa/Freetown", "Africa/Abidjan"},
+ {"Africa/Gaborone", "Africa/Maputo"},
+ {"Africa/Harare", "Africa/Maputo"},
+ {"Africa/Kampala", "Africa/Nairobi"},
{"Africa/Khartoum", "Africa/Juba"},
- {"Africa/Kinshasa", "Africa/Bangui"},
- {"Africa/Lagos", "Africa/Bangui"},
- {"Africa/Libreville", "Africa/Bangui"},
+ {"Africa/Kigali", "Africa/Maputo"},
+ {"Africa/Kinshasa", "Africa/Lagos"},
+ {"Africa/Libreville", "Africa/Lagos"},
{"Africa/Lome", "Africa/Abidjan"},
- {"Africa/Luanda", "Africa/Bangui"},
- {"Africa/Malabo", "Africa/Bangui"},
- {"Africa/Niamey", "Africa/Bangui"},
+ {"Africa/Luanda", "Africa/Lagos"},
+ {"Africa/Lubumbashi", "Africa/Maputo"},
+ {"Africa/Lusaka", "Africa/Maputo"},
+ {"Africa/Maseru", "Africa/Johannesburg"},
+ {"Africa/Malabo", "Africa/Lagos"},
+ {"Africa/Mbabane", "Africa/Johannesburg"},
+ {"Africa/Mogadishu", "Africa/Nairobi"},
+ {"Africa/Niamey", "Africa/Lagos"},
{"Africa/Nouakchott", "Africa/Abidjan"},
{"Africa/Ouagadougou", "Africa/Abidjan"},
- {"Africa/Porto-Novo", "Africa/Bangui"},
+ {"Africa/Porto-Novo", "Africa/Lagos"},
{"Africa/Sao_Tome", "Africa/Abidjan"},
+ {"America/Antigua", "America/Port_of_Spain"},
+ {"America/Anguilla", "America/Port_of_Spain"},
{"America/Curacao", "America/Aruba"},
- {"America/Dominica", "America/Anguilla"},
- {"America/Grenada", "America/Anguilla"},
- {"America/Guadeloupe", "America/Anguilla"},
+ {"America/Dominica", "America/Port_of_Spain"},
+ {"America/Grenada", "America/Port_of_Spain"},
+ {"America/Guadeloupe", "America/Port_of_Spain"},
{"America/Kralendijk", "America/Aruba"},
{"America/Lower_Princes", "America/Aruba"},
- {"America/Marigot", "America/Anguilla"},
- {"America/Montserrat", "America/Anguilla"},
- {"America/Port_of_Spain", "America/Anguilla"},
- {"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
- {"America/St_Barthelemy", "America/Anguilla"},
- {"America/St_Kitts", "America/Anguilla"},
- {"America/St_Lucia", "America/Anguilla"},
- {"America/St_Thomas", "America/Anguilla"},
- {"America/St_Vincent", "America/Anguilla"},
- {"America/Tortola", "America/Anguilla"},
- {"America/Virgin", "America/Anguilla"},
+ {"America/Marigot", "America/Port_of_Spain"},
+ {"America/Montserrat", "America/Port_of_Spain"},
+ {"America/Panama", "America/Cayman"},
+ {"America/Santa_Isabel", "America/Tijuana"},
+ {"America/Shiprock", "America/Denver"},
+ {"America/St_Barthelemy", "America/Port_of_Spain"},
+ {"America/St_Kitts", "America/Port_of_Spain"},
+ {"America/St_Lucia", "America/Port_of_Spain"},
+ {"America/St_Thomas", "America/Port_of_Spain"},
+ {"America/St_Vincent", "America/Port_of_Spain"},
+ {"America/Toronto", "America/Montreal"},
+ {"America/Tortola", "America/Port_of_Spain"},
+ {"America/Virgin", "America/Port_of_Spain"},
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Arctic/Longyearbyen", "Europe/Oslo"},
+ {"Asia/Kuwait", "Asia/Aden"},
+ {"Asia/Muscat", "Asia/Dubai"},
+ {"Asia/Phnom_Penh", "Asia/Bangkok"},
+ {"Asia/Qatar", "Asia/Bahrain"},
+ {"Asia/Riyadh", "Asia/Aden"},
+ {"Asia/Vientiane", "Asia/Bangkok"},
{"Atlantic/Jan_Mayen", "Europe/Oslo"},
{"Atlantic/St_Helena", "Africa/Abidjan"},
{"Europe/Bratislava", "Europe/Prague"},
{"Europe/Vaduz", "Europe/Zurich"},
{"Europe/Vatican", "Europe/Rome"},
{"Europe/Zagreb", "Europe/Belgrade"},
+ {"Indian/Antananarivo", "Africa/Nairobi"},
+ {"Indian/Comoro", "Africa/Nairobi"},
+ {"Indian/Mayotte", "Africa/Nairobi"},
{"Pacific/Auckland", "Antarctica/McMurdo"},
{"Pacific/Johnston", "Pacific/Honolulu"},
+ {"Pacific/Midway", "Pacific/Pago_Pago"},
+ {"Pacific/Saipan", "Pacific/Guam"},
{0, 0}
};
assertFalse("getUnknown() uses DST", unknown.useDaylightTime());
}
+void TimeZoneTest::TestGetGMT() {
+ const TimeZone *gmt = TimeZone::getGMT();
+ UnicodeString expectedID = UNICODE_STRING_SIMPLE("GMT");
+ UnicodeString id;
+ assertEquals("getGMT() wrong ID", expectedID, gmt->getID(id));
+ assertTrue("getGMT() wrong offset", 0 == gmt->getRawOffset());
+ assertFalse("getGMT() uses DST", gmt->useDaylightTime());
+}
+
void TimeZoneTest::TestGetWindowsID(void) {
static const struct {
const char *id;
{"America/Indianapolis", "US Eastern Standard Time"}, // CLDR canonical name
{"America/Indiana/Indianapolis", "US Eastern Standard Time"}, // tzdb canonical name
{"Asia/Khandyga", "Yakutsk Standard Time"},
- {"Australia/Eucla", ""}, // No Windows ID mapping
+ {"Australia/Eucla", "Aus Central W. Standard Time"}, // formerly no Windows ID mapping, now has one
{"Bogus", ""},
{0, 0},
};
projects / apple / icu.git / blobdiff