From 079031d99c705aba9d1ce6f0babd26fc233c6148 Mon Sep 17 00:00:00 2001 From: Vladimir Weinstein Date: Tue, 25 Nov 2003 00:05:06 +0000 Subject: [PATCH] ICU-2438 test keyword support for uloc_getDisplayName X-SVN-Rev: 13867 --- icu4c/source/test/cintltst/cloctst.c | 75 +++++++++++++++++----------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index bfdf33a8b0..4a1ca703ba 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -39,59 +39,67 @@ void PrintDataTable(); /*--------------------------------------------------- table of valid data --------------------------------------------------- */ -#define LOCALE_SIZE 6 +#define LOCALE_SIZE 9 #define LOCALE_INFO_SIZE 28 static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { /* language code */ - { "en", "fr", "ca", "el", "no", "zh" }, + { "en", "fr", "ca", "el", "no", "zh", "de", "es", "ja" }, /* script code */ - { "", "", "", "", "", "Hans" }, + { "", "", "", "", "", "Hans", "", "", "" }, /* country code */ - { "US", "FR", "ES", "GR", "NO", "CN" }, + { "US", "FR", "ES", "GR", "NO", "CN", "DE", "", "JA" }, /* variant code */ - { "", "", "", "", "NY", "" }, + { "", "", "", "", "NY", "", "", "", "" }, /* full name */ - { "en_US", "fr_FR", "ca_ES", "el_GR", "no_NO_NY", "zh_Hans_CN" }, + { "en_US", "fr_FR", "ca_ES", + "el_GR", "no_NO_NY", "zh_Hans_CN", + "de_DE@collation=phonebook", "es@collation=traditional", "ja_JP@calendar=japanese" }, /* ISO-3 language */ - { "eng", "fra", "cat", "ell", "nor", "zho" }, + { "eng", "fra", "cat", "ell", "nor", "zho", "deu", "esp", "jap" }, /* ISO-3 country */ - { "USA", "FRA", "ESP", "GRC", "NOR", "CHN" }, + { "USA", "FRA", "ESP", "GRC", "NOR", "CHN", "", "", "" }, /* LCID */ - { "409", "40c", "403", "408", "814", "804" }, + { "409", "40c", "403", "408", "814", "804", "", "", "" }, /* display language (English) */ - { "English", "French", "Catalan", "Greek", "Norwegian", "Chinese" }, + { "English", "French", "Catalan", "Greek", "Norwegian", "Chinese", "German", "Spanish", "Japanese" }, /* display script code (English) */ - { "", "", "", "", "", "Simplified Han" }, + { "", "", "", "", "", "Simplified Han", "", "", "" }, /* display country (English) */ - { "United States", "France", "Spain", "Greece", "Norway", "China" }, + { "United States", "France", "Spain", "Greece", "Norway", "China", "Germany", "", "Japan" }, /* display variant (English) */ - { "", "", "", "", "Nynorsk", "" }, + { "", "", "", "", "Nynorsk", "", "", "", "" }, /* display name (English) */ - { "English (United States)", "French (France)", "Catalan (Spain)", "Greek (Greece)", "Norwegian (Norway, Nynorsk)", "Chinese (Simplified Han, China)" }, + { "English (United States)", "French (France)", "Catalan (Spain)", + "Greek (Greece)", "Norwegian (Norway, Nynorsk)", "Chinese (Simplified Han, China)", + "German (Germany, Collation=Phonebook Order)", "Spanish (Collation=Traditional)", "Japanese (Japan, Calendar=JAPANESE)" }, /* display language (French) */ - { "anglais", "fran\\u00E7ais", "catalan", "grec", "norv\\u00E9gien", "chinois" }, + { "anglais", "fran\\u00E7ais", "catalan", "grec", "norv\\u00E9gien", "chinois", "allemand", "espagnol", "japonais" }, /* display script code (French) */ - { "", "", "", "", "", "Hans" }, + { "", "", "", "", "", "Hans", "", "", "" }, /* display country (French) */ - { "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "Chine" }, + { "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "Chine", "Allemagne", "", "Japon" }, /* display variant (French) */ - { "", "", "", "", "NY", "" }, + { "", "", "", "", "NY", "", "", "", "" }, /* display name (French) */ - { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "chinois (Hans, Chine)" }, + { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", + "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "chinois (Hans, Chine)", + "allemand (Allemagne, Ordonnancement=PHONEBOOK)", "espagnol (Ordonnancement=Traditionnel Ordonnancement)", "japonais (Japon, Calendrier=JAPANESE)" }, /* display language (Catalan) */ - { "angl\\u00E8s", "franc\\u00E8s", "catal\\u00E0", "grec", "noruec", "xin\\u00E9s" }, + { "angl\\u00E8s", "franc\\u00E8s", "catal\\u00E0", "grec", "noruec", "xin\\u00E9s", "alemany", "espanyol", "japon\\u00E8s" }, /* display script code (Catalan) */ - { "", "", "", "", "", "Hans" }, + { "", "", "", "", "", "Hans", "", "", "" }, /* display country (Catalan) */ - { "Estats Units", "Fran\\u00E7a", "Espanya", "Gr\\u00E8cia", "Noruega", "Xina" }, + { "Estats Units", "Fran\\u00E7a", "Espanya", "Gr\\u00E8cia", "Noruega", "Xina", "Alemanya", "", "Jap\\u00F3" }, /* display variant (Catalan) */ - { "", "", "", "", "NY", "" }, + { "", "", "", "", "NY", "", "", "", "" }, /* display name (Catalan) */ - { "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "xin\\u00E9s (Hans, Xina)" }, + { "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", + "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "xin\\u00E9s (Hans, Xina)", + "alemany (Alemanya, COLLATION=PHONEBOOK)", "espanyol (COLLATION=TRADITIONAL)", "japon\\u00E8s (Jap\\u00F3, CALENDAR=JAPANESE)" }, /* display language (Greek) */ { @@ -100,10 +108,13 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { "\\u039a\\u03b1\\u03c4\\u03b1\\u03bb\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac", "\\u0395\\u03bb\\u03bb\\u03b7\\u03bd\\u03b9\\u03ba\\u03ac", "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac", - "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC" + "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC", + "\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC", + "\\u0399\\u03C3\\u03C0\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC", + "\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03B9\\u03BA\\u03AC" }, /* display script code (Greek) */ - { "", "", "", "", "", "Hans" }, + { "", "", "", "", "", "Hans", "", "", "" }, /* display country (Greek) */ { "\\u0397\\u03bd\\u03c9\\u03bc\\u03ad\\u03bd\\u03b5\\u03c2 \\u03a0\\u03bf\\u03bb\\u03b9\\u03c4\\u03b5\\u03af\\u03b5\\u03c2", @@ -111,10 +122,13 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { "\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1", "\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1", "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1", - "\\u039A\\u03AF\\u03BD\\u03B1" + "\\u039A\\u03AF\\u03BD\\u03B1", + "\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03AF\\u03B1", + "", + "\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03AF\\u03B1" }, /* display variant (Greek) */ - { "", "", "", "", "NY", "" }, /* TODO: currently there is no translation for NY in Greek fix this test when we have it */ + { "", "", "", "", "NY", "", "", "", "" }, /* TODO: currently there is no translation for NY in Greek fix this test when we have it */ /* display name (Greek) */ { "\\u0391\\u03b3\\u03b3\\u03bb\\u03b9\\u03ba\\u03ac (\\u0397\\u03bd\\u03c9\\u03bc\\u03ad\\u03bd\\u03b5\\u03c2 \\u03a0\\u03bf\\u03bb\\u03b9\\u03c4\\u03b5\\u03af\\u03b5\\u03c2)", @@ -122,7 +136,10 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { "\\u039a\\u03b1\\u03c4\\u03b1\\u03bb\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1)", "\\u0395\\u03bb\\u03bb\\u03b7\\u03bd\\u03b9\\u03ba\\u03ac (\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1)", "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)", - "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (Hans, \\u039A\\u03AF\\u03BD\\u03B1)" + "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (Hans, \\u039A\\u03AF\\u03BD\\u03B1)", + "\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03AF\\u03B1, COLLATION=PHONEBOOK)", + "\\u0399\\u03C3\\u03C0\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (COLLATION=TRADITIONAL)", + "\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03B9\\u03BA\\u03AC (\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03AF\\u03B1, CALENDAR=JAPANESE)" } };