AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3699 fix tests to conform to CLDR 1.1 data

Browse Source 
X-SVN-Rev: 15679
This commit is contained in:
Deborah Goldsmith 2004-06-02 22:38:57 +00:00
parent 407e75f56c
commit b501ed1a54
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/test/cintltst/cdattst.c
View File

@ -170,17 +170,17 @@ static void TestDateFormat()
log_err("FAIL: Date Format for US locale failed using udat_format()\n");
/*format using fr */
u_uastrcpy(temp, "10 juil. 96 16 h 05 GMT-07:00");
u_uastrcpy(temp, "10 juil. 96 16 h 05 PDT");
if(result != NULL) {
free(result);
result = NULL;
}
result=myDateFormat(fr, d);
if(u_strcmp(result, temp)==0)
log_verbose("PASS: Date Format for french locale successful uisng udat_format()\n");
log_verbose("PASS: Date Format for french locale successful using udat_format()\n");
else
log_data_err("FAIL: Date Format for french locale failed using udat_format()\n");
/*foramt using it */
/*format using it */
u_uastrcpy(temp, "10/lug/96 16:05:28");
if(u_strcmp(myDateFormat(it,d), temp)==0)

6
icu4c/source/test/cintltst/cloctst.c
View File

@ -96,7 +96,7 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
/* display name (French) */
{ "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)",
"grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "chinois (han simplifi\\u00E9, Chine)",
"allemand (Allemagne, Ordonnancement=Ordre de l'annuaire)", "espagnol (Ordonnancement=Ordre traditionnel)", "japonais (Japon, Calendrier=Calendrier japonais)" },
"allemand (Allemagne, Ordonnancement=Ordre de l\\u2019annuaire)", "espagnol (Ordonnancement=Ordre traditionnel)", "japonais (Japon, Calendrier=Calendrier japonais)" },
/* display language (Catalan) */
{ "angl\\u00E8s", "franc\\u00E8s", "catal\\u00E0", "grec", "noruec", "xin\\u00E9s", "alemany", "espanyol", "japon\\u00E8s" },
@ -2673,11 +2673,11 @@ static void TestDisplayKeywordValues(void){
{0x0050, 0x0065, 0x0073, 0x0065, 0x0074, 0x0061, 0x0020, 0x0053, 0x0070, 0x0061, 0x0067, 0x006e, 0x006f, 0x006c, 0x0061, 0x0000}
},
{ "de@collation=phonebook", "es",
{0x006F, 0x0072, 0x0064, 0x0065, 0x006E, 0x0020, 0x0067, 0x0075, 0x00ED, 0x0061, 0x0020, 0x0064, 0x0065, 0x0020, 0x0074, 0x0065, 0x006C, 0x0065, 0x0066, 0x00F3, 0x006E, 0x006F, 0x0073}
{0x006F, 0x0072, 0x0064, 0x0065, 0x006E, 0x0020, 0x0064, 0x0065, 0x0020, 0x006C, 0x0069, 0x0073, 0x0074, 0x00ED, 0x006E, 0x0020, 0x0074, 0x0065, 0x006C, 0x0065, 0x0066, 0x00F3, 0x006E, 0x0069, 0x0063, 0x006F, 0x0000}
},
{ "de_DE@collation=phonebook", "es",
{0x006F, 0x0072, 0x0064, 0x0065, 0x006E, 0x0020, 0x0067, 0x0075, 0x00ED, 0x0061, 0x0020, 0x0064, 0x0065, 0x0020, 0x0074, 0x0065, 0x006C, 0x0065, 0x0066, 0x00F3, 0x006E, 0x006F, 0x0073, 0x0000}
{0x006F, 0x0072, 0x0064, 0x0065, 0x006E, 0x0020, 0x0064, 0x0065, 0x0020, 0x006C, 0x0069, 0x0073, 0x0074, 0x00ED, 0x006E, 0x0020, 0x0074, 0x0065, 0x006C, 0x0065, 0x0066, 0x00F3, 0x006E, 0x0069, 0x0063, 0x006F, 0x0000}
},
{ "es_ES@collation=traditional","de",
{0x0054, 0x0072, 0x0061, 0x0064, 0x0069, 0x0074, 0x0069, 0x006f, 0x006e, 0x0065, 0x006c, 0x006c, 0x0065, 0x0020, 0x0053, 0x006f, 0x0072, 0x0074, 0x0069, 0x0065, 0x0072, 0x0072, 0x0065, 0x0067, 0x0065, 0x006c, 0x006e, 0x0000}

4
icu4c/source/test/intltest/dtfmttst.cpp
View File

@ -303,7 +303,7 @@ void DateFormatTest::TestFieldPosition() {
"Wednesday", "", "", "", "", "PM", "2", "", "PDT", "", "", "", "", "", "",
"", "1997", "ao\\u00FBt", "13", "", "14", "34", "", "",
"mercredi", "", "", "", "", "", "", "", "GMT-07:00", "", "", "", "", "", "",
"mercredi", "", "", "", "", "", "", "", "PDT", "", "", "", "", "", "",
"AD", "1997", "8", "13", "14", "14", "34", "12", "5",
"Wed", "225", "2", "33", "3", "PM", "2", "2", "PDT", "1997", "4", "1997", "2450674", "52452513", "-0700",
@ -952,7 +952,7 @@ DateFormatTest::TestLocaleDateFormat() // Bug 495
DateFormat::FULL, Locale::getFrench());
DateFormat *dfUS = DateFormat::createDateTimeInstance(DateFormat::FULL,
DateFormat::FULL, Locale::getUS());
UnicodeString expectedFRENCH ( "lundi 15 septembre 1997 00 h 00 GMT-07:00" );
UnicodeString expectedFRENCH ( "lundi 15 septembre 1997 00 h 00 PDT" );
//UnicodeString expectedUS ( "Monday, September 15, 1997 12:00:00 o'clock AM PDT" );
UnicodeString expectedUS ( "Monday, September 15, 1997 12:00:00 AM PDT" );
logln((UnicodeString)"Date set to : " + dateToString(testDate));

16
icu4c/source/test/intltest/miscdtfm.cpp
View File

@ -338,23 +338,23 @@ DateFormatMiscTests::test4117335()
int32_t rowCount, colCount;
const UnicodeString **zones = symbols->getZoneStrings(rowCount, colCount);
logln(UnicodeString("Long zone name = ") + zones[0][1]);
if (zones[0][1] != jstLong) {
logln(UnicodeString("Long zone name = ") + zones[24][1]);
if (zones[24][1] != jstLong) {
errln("*** Should have been " + jstLong);
//throw new Exception("Error in long TZ name");
}
logln(UnicodeString("Short zone name = ") + zones[0][2]);
if (zones[0][2] != jstShort) {
logln(UnicodeString("Short zone name = ") + zones[24][2]);
if (zones[24][2] != jstShort) {
errln("*** Should have been " + jstShort);
//throw new Exception("Error in short TZ name");
}
logln(UnicodeString("Long zone name = ") + zones[0][3]);
if (zones[0][3] != jstLong) {
logln(UnicodeString("Long zone name = ") + zones[24][3]);
if (zones[24][3] != jstLong) {
errln("*** Should have been " + jstLong);
//throw new Exception("Error in long TZ name");
}
logln(UnicodeString("SHORT zone name = ") + zones[0][4]);
if (zones[0][4] != jstShort) {
logln(UnicodeString("SHORT zone name = ") + zones[24][4]);
if (zones[24][4] != jstShort) {
errln("*** Should have been " + jstShort);
//throw new Exception("Error in short TZ name");
}