ICU-5566 Fix some test failures due to CLDR update.

X-SVN-Rev: 21157
This commit is contained in:
George Rhoten 2007-03-05 18:26:53 +00:00
parent 074afce0a7
commit 36fc5d2137
5 changed files with 934 additions and 10 deletions

View file

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 1997-2006, International Business Machines
// * Copyright (C) 1997-2007, International Business Machines
// * Corporation and others. All Rights Reserved.
// *
// ***************************************************************************
@ -248,6 +248,7 @@ CurrencyData:table(nofallback){
QA { "QAR" } // QATAR: Qatari Rial
RE { "EUR" } // REUNION: Euro
RO { "RON" } // ROMANIA: Leu
RA { "RSD" } // SERBIA: Dinar
RU { "RUB" } // RUSSIAN FEDERATION: Russian Ruble
RW { "RWF" } // RWANDA: Rwanda Franc
SA { "SAR" } // SAUDI ARABIA: Saudi Riyal

View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2002-2006, International Business Machines
* Copyright (c) 2002-2007, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -799,7 +799,7 @@ static const struct CurrencyList {
{"COP", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"COU", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"CRC", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"CSD", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"CSD", UCURR_COMMON|UCURR_DEPRECATED},
{"CSK", UCURR_COMMON|UCURR_DEPRECATED},
{"CUP", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"CVE", UCURR_COMMON|UCURR_NON_DEPRECATED},
@ -928,6 +928,7 @@ static const struct CurrencyList {
{"RHD", UCURR_COMMON|UCURR_DEPRECATED},
{"ROL", UCURR_COMMON|UCURR_DEPRECATED},
{"RON", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"RSD", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"RUB", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"RUR", UCURR_COMMON|UCURR_DEPRECATED},
{"RWF", UCURR_COMMON|UCURR_NON_DEPRECATED},

View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation
* Copyright (c) 1997-2007, International Business Machines Corporation
* and others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -531,17 +531,17 @@ static void TestCurrencyObject(void)
const char* locale[]={
"fr_FR",
"fr_FR",
"fr_FR",
};
const char* currency[]={
"",
"JPY",
"JPY",
};
const char* result[]={
"1\\u00A0234,56 \\u20AC",
"1\\u00A0235 \\u00A5",
"1\\u00A0235 JP\\u00A5",
};
log_verbose("\nTesting the number format with different currency codes\n");

View file

@ -1362,7 +1362,7 @@ static void TestErrorConditions(){
static void TestGetVersion(){
UVersionInfo minVersionArray = {0x01, 0x00, 0x00, 0x00};
UVersionInfo maxVersionArray = {0x50, 0x80, 0xcf, 0xcf};
UVersionInfo maxVersionArray = {0x50, 0xc0, 0xcf, 0xcf};
UVersionInfo versionArray;
UErrorCode status= U_ZERO_ERROR;
UResourceBundle* resB = NULL;
@ -2055,7 +2055,7 @@ static void TestFallback()
UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err);
UResourceBundle* tResB;
const UChar* version = NULL;
static const UChar versionStr[] = { 0x0031, 0x002E, 0x0033, 0x0037, 0x0000};
static const UChar versionStr[] = { 0x0031, 0x002E, 0x0034, 0x0032, 0x0000};
if(err != U_ZERO_ERROR){
log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err));

View file

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2004-2006 International Business Machines
// * Copyright (C) 2004-2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// *
// ***************************************************************************
@ -1055,6 +1055,10 @@ structLocale:table(nofallback){
"",
"",
}
RSD{
"",
"",
}
RUB{
"",
"",
@ -5897,6 +5901,15 @@ structLocale:table(nofallback){
ss{""}
ec{""}
}
"Australia:Eucla"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
ec{""}
}
"Australia:Hobart"{
ld{""}
lg{""}
@ -7067,6 +7080,15 @@ structLocale:table(nofallback){
ss{""}
ec{""}
}
"Europe:Volgograd"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
ec{""}
}
"Europe:Warsaw"{
ld{""}
lg{""}
@ -8291,6 +8313,906 @@ structLocale:table(nofallback){
ss{""}
ec{""}
}
"meta:Acre"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Africa_Central"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Africa_Eastern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Africa_Southern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Africa_Western"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Aktyubinsk"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Alaska"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Alaska_Hawaii"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Amazon"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:America_Central"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:America_Eastern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:America_Mountain"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:America_Pacific"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Aqtau"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Aqtobe"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Arabian"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Argentina"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Argentina_Western"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Armenia"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Ashkhabad"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Atlantic"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Australia_Central"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Australia_Eastern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Australia_Western"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Azores"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Baku"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Bangladesh"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Bering"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Bhutan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Borneo"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Brasilia"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Chamorro"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Changbai"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Chile"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:China"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Choibalsan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Dacca"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Dushanbe"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Dutch_Guiana"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:East_Timor"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Ecuador"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Europe_Central"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Europe_Eastern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Europe_Western"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Frunze"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:GMT"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Galapagos"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Georgia"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Greenland_Central"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Greenland_Eastern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Greenland_Western"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Guam"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Gulf"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Hawaii"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Hawaii_Aleutian"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:India"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Indonesia_Central"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Indonesia_Eastern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Indonesia_Western"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Israel"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Karachi"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Kashgar"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Kazakhstan_Eastern"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Kazakhstan_Western"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Kizilorda"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Korea"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Kuybyshev"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Kwajalein"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Kyrgystan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Lanka"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Long_Shu"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Lord_Howe"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Macau"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Malaya"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Malaysia"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Marshall_Islands"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Mongolia"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:New_Zealand"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Newfoundland"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:North_Mariana"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Pakistan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Pierre_Miquelon"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Qyzylorda"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Samara"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Samarkand"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Samoa"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Shevchenko"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Suriname"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Sverdlovsk"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Tajikistan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Tashkent"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Tbilisi"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Turkey"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Turkmenistan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Uralsk"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Urumqi"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Uzbekistan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Yekaterinburg"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Yerevan"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
"meta:Yukon"{
ld{""}
lg{""}
ls{""}
sd{""}
sg{""}
ss{""}
//ec{""} // Metazones have no exemplar city
}
}
}