FCL/sf/mw/qt: comparison tests/auto/qlocale/tst

equal deleted inserted replaced

-:e24348a560a6
+:b72c6db6890b
 { \
 	QLocale l(QLocale::req_lang, QLocale::req_country); \
 	QCOMPARE(l.language(), exp_lang); \
 	QCOMPARE(l.country(), exp_country); \
 }
+{
+QLocale l(QLocale::C, QLocale::AnyCountry);
+QCOMPARE(l.language(), QLocale::C);
+QCOMPARE(l.country(), QLocale::AnyCountry);
+}
 TEST_CTOR(C, AnyCountry, QLocale::C, QLocale::AnyCountry)
 TEST_CTOR(Aymara, AnyCountry, default_lang, default_country)
 TEST_CTOR(Aymara, France, default_lang, default_country)
 TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::UnitedStates)
 TEST_CTOR(English, France, QLocale::English, QLocale::UnitedStates)
 TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
 TEST_CTOR(French, France, QLocale::French, QLocale::France)
 TEST_CTOR(C, France, QLocale::C, QLocale::AnyCountry)
+TEST_CTOR(Spanish, LatinAmericaAndTheCaribbean, QLocale::Spanish, QLocale::LatinAmericaAndTheCaribbean)
 QLocale::setDefault(QLocale(QLocale::English, QLocale::France));
 {
 	QLocale l;
 TEST_CTOR("nb", Norwegian, Norway)
 TEST_CTOR("nn", NorwegianNynorsk, Norway)
 TEST_CTOR("no_NO", Norwegian, Norway)
 TEST_CTOR("nb_NO", Norwegian, Norway)
 TEST_CTOR("nn_NO", NorwegianNynorsk, Norway)
+TEST_CTOR("es_ES", Spanish, Spain)
+TEST_CTOR("es_419", Spanish, LatinAmericaAndTheCaribbean)
+// test default countries for languages
+TEST_CTOR("mn", Mongolian, Mongolia)
+TEST_CTOR("ne", Nepali, Nepal)
 #undef TEST_CTOR
 }
 QTest::newRow("12no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 1), QTime(15, 0, 0))
 << "d'd'dd/M/yyh" << "1d01/12/7415";
 QTest::newRow("RFC-1123") << "C" << QDateTime(QDate(2007, 11, 1), QTime(18, 8, 30))
 << "ddd, dd MMM yyyy hh:mm:ss 'GMT'" << "Thu, 01 Nov 2007 18:08:30 GMT";
+QTest::newRow("longFormat") << "en_US" << QDateTime(QDate(2009, 1, 5), QTime(11, 48, 32))
+<< "dddd, MMMM d, yyyy h:mm:ss AP " << "Monday, January 5, 2009 11:48:32 AM ";
 }
 void tst_QLocale::toDateTime()
 {
 QFETCH(QString, localeName);
 QFETCH(QString, format);
 QFETCH(QString, string);
 QLocale l(localeName);
 QCOMPARE(l.toDateTime(string, format), result);
+if (l.dateTimeFormat(QLocale::LongFormat) == format)
+QCOMPARE(l.toDateTime(string, QLocale::LongFormat), result);
 }
 void tst_QLocale::macDefaultLocale()
 {
 #ifndef Q_OS_MAC
 {      8,   223}, // Arabic/UnitedArabEmirates
 {      8,   237}, // Arabic/Yemen
 {      9,    11}, // Armenian/Armenia
 {     10,   100}, // Assamese/India
 {     12,    15}, // Azerbaijani/Azerbaijan
+{     12,   102}, // Azerbaijani/Iran
 {     14,   197}, // Basque/Spain
 {     15,    18}, // Bengali/Bangladesh
 {     15,   100}, // Bengali/India
 {     16,    25}, // Bhutani/Bhutan
+{     19,    74}, // Breton/France
 {     20,    33}, // Bulgarian/Bulgaria
 {     21,   147}, // Burmese/Myanmar
 {     22,    20}, // Byelorussian/Belarus
 {     23,    36}, // Cambodian/Cambodia
 {     24,   197}, // Catalan/Spain
 {     31,   100}, // English/India
 {     31,   104}, // English/Ireland
 {     31,   107}, // English/Jamaica
 {     31,   133}, // English/Malta
 {     31,   134}, // English/MarshallIslands
+{     31,   137}, // English/Mauritius
 {     31,   148}, // English/Namibia
 {     31,   154}, // English/NewZealand
 {     31,   160}, // English/NorthernMarianaIslands
 {     31,   163}, // English/Pakistan
 {     31,   170}, // English/Philippines
 {     33,    68}, // Estonian/Estonia
 {     34,    71}, // Faroese/FaroeIslands
 {     36,    73}, // Finnish/Finland
 {     37,    74}, // French/France
 {     37,    21}, // French/Belgium
+{     37,    37}, // French/Cameroon
 {     37,    38}, // French/Canada
+{     37,    41}, // French/CentralAfricanRepublic
+{     37,    53}, // French/IvoryCoast
+{     37,    88}, // French/Guadeloupe
+{     37,    91}, // French/Guinea
 {     37,   125}, // French/Luxembourg
+{     37,   128}, // French/Madagascar
+{     37,   132}, // French/Mali
+{     37,   135}, // French/Martinique
 {     37,   142}, // French/Monaco
+{     37,   156}, // French/Niger
+{     37,   176}, // French/Reunion
 {     37,   187}, // French/Senegal
 {     37,   206}, // French/Switzerland
+{     37,   244}, // French/Saint Barthelemy
+{     37,   245}, // French/Saint Martin
 {     40,   197}, // Galician/Spain
 {     41,    81}, // Georgian/Georgia
 {     42,    82}, // German/Germany
 {     42,    14}, // German/Austria
 {     42,    21}, // German/Belgium
 {     61,   100}, // Kannada/India
 {     63,   110}, // Kazakh/Kazakhstan
 {     64,   179}, // Kinyarwanda/Rwanda
 {     65,   116}, // Kirghiz/Kyrgyzstan
 {     66,   114}, // Korean/RepublicOfKorea
+{     67,   102}, // Kurdish/Iran
+{     67,   103}, // Kurdish/Iraq
+{     67,   207}, // Kurdish/SyrianArabRepublic
 {     67,   217}, // Kurdish/Turkey
 {     69,   117}, // Laothian/Lao
 {     71,   118}, // Latvian/Latvia
 {     72,    49}, // Lingala/DemocraticRepublicOfCongo
 {     72,    50}, // Lingala/PeoplesRepublicOfCongo
 {     73,   124}, // Lithuanian/Lithuania
 {     74,   127}, // Macedonian/Macedonia
+{     75,   128}, // Malagasy/Madagascar
 {     76,   130}, // Malay/Malaysia
 {     76,    32}, // Malay/BruneiDarussalam
 {     77,   100}, // Malayalam/India
 {     78,   133}, // Maltese/Malta
+{     79,   154}, // Maori/NewZealand
 {     80,   100}, // Marathi/India
 {     82,    44}, // Mongolian/China
 {     82,   143}, // Mongolian/Mongolia
 {     84,   100}, // Nepali/India
 {     84,   150}, // Nepali/Nepal
 {     85,   161}, // Norwegian/Norway
+{     86,    74}, // Occitan/France
 {     87,   100}, // Oriya/India
 {     88,     1}, // Pashto/Afghanistan
 {     89,   102}, // Persian/Iran
 {     89,     1}, // Persian/Afghanistan
 {     90,   172}, // Polish/Poland
 {     91,   173}, // Portuguese/Portugal
 {     91,    30}, // Portuguese/Brazil
+{     91,    92}, // Portuguese/GuineaBissau
+{     91,   146}, // Portuguese/Mozambique
 {     92,   100}, // Punjabi/India
 {     92,   163}, // Punjabi/Pakistan
+{     94,   206}, // RhaetoRomance/Switzerland
 {     95,   141}, // Romanian/Moldova
 {     95,   177}, // Romanian/Romania
 {     96,   178}, // Russian/RussianFederation
+{     96,   141}, // Russian/Moldova
 {     96,   222}, // Russian/Ukraine
+{     98,    41}, // Sangho/CentralAfricanRepublic
 {     99,   100}, // Sanskrit/India
 {    100,   241}, // Serbian/SerbiaAndMontenegro
 {    100,    27}, // Serbian/BosniaAndHerzegowina
 {    100,   238}, // Serbian/Yugoslavia
+{    100,   242}, // Serbian/Montenegro
+{    100,   243}, // Serbian/Serbia
 {    101,   241}, // SerboCroatian/SerbiaAndMontenegro
 {    101,    27}, // SerboCroatian/BosniaAndHerzegowina
 {    101,   238}, // SerboCroatian/Yugoslavia
 {    102,   120}, // Sesotho/Lesotho
 {    102,   195}, // Sesotho/SouthAfrica
 {    103,   195}, // Setswana/SouthAfrica
+{    104,   240}, // Shona/Zimbabwe
 {    106,   198}, // Singhalese/SriLanka
 {    107,   195}, // Siswati/SouthAfrica
 {    107,   204}, // Siswati/Swaziland
 {    108,   191}, // Slovak/Slovakia
 {    109,   192}, // Slovenian/Slovenia
 {    111,    47}, // Spanish/Colombia
 {    111,    52}, // Spanish/CostaRica
 {    111,    61}, // Spanish/DominicanRepublic
 {    111,    63}, // Spanish/Ecuador
 {    111,    65}, // Spanish/ElSalvador
+{    111,    66}, // Spanish/EquatorialGuinea
 {    111,    90}, // Spanish/Guatemala
 {    111,    96}, // Spanish/Honduras
 {    111,   139}, // Spanish/Mexico
 {    111,   155}, // Spanish/Nicaragua
 {    111,   166}, // Spanish/Panama
 {    113,   210}, // Swahili/Tanzania
 {    114,   205}, // Swedish/Sweden
 {    114,    73}, // Swedish/Finland
 {    116,   209}, // Tajik/Tajikistan
 {    117,   100}, // Tamil/India
+{    117,   198}, // Tamil/SriLanka
 {    118,   178}, // Tatar/RussianFederation
 {    119,   100}, // Telugu/India
 {    120,   211}, // Thai/Thailand
+{    121,    44}, // Tibetan/China
+{    121,   100}, // Tibetan/India
 {    122,    67}, // Tigrinya/Eritrea
 {    122,    69}, // Tigrinya/Ethiopia
 {    123,   214}, // Tonga/Tonga
 {    124,   195}, // Tsonga/SouthAfrica
 {    125,   217}, // Turkish/Turkey
 {    158,   157}, // Jju/Nigeria
 {    159,   106}, // Friulian/Italy
 {    160,   195}, // Venda/SouthAfrica
 {    161,    83}, // Ewe/Ghana
 {    161,   212}, // Ewe/Togo
+{    162,    69}, // Walamo/Ethiopia
 {    163,   225}, // Hawaiian/UnitedStates
 {    164,   157}, // Tyap/Nigeria
-{    165,   129}  // Chewa/Malawi
+{    165,   129}, // Chewa/Malawi
+{    166,   170}, // Filipino/Philippines
+{    167,   206}, // Swiss German/Switzerland
+{    168,    44}, // Sichuan Yi/China
+{    169,    91}, // Kpelle/Guinea
+{    169,   121}, // Kpelle/Liberia
+{    170,    82}, // Low German/Germany
+{    171,   195}, // South Ndebele/SouthAfrica
+{    172,   195}, // Northern Sotho/SouthAfrica
+{    173,    73}, // Northern Sami/Finland
+{    173,   161}, // Northern Sami/Norway
+{    174,   208}, // Taroko/Taiwan
+{    175,   111}, // Gusii/Kenya
+{    176,   111}, // Taita/Kenya
+{    177,   187}, // Fulah/Senegal
+{    178,   111}, // Kikuyu/Kenya
+{    179,   111}, // Samburu/Kenya
+{    180,   146}, // Sena/Mozambique
+{    181,   240}, // North Ndebele/Zimbabwe
+{    182,   210}, // Rombo/Tanzania
+{    183,   145}, // Tachelhit/Morocco
+{    184,     3}, // Kabyle/Algeria
+{    185,   221}, // Nyankole/Uganda
+{    186,   210}, // Bena/Tanzania
+{    187,   210}, // Vunjo/Tanzania
+{    188,   132}, // Bambara/Mali
+{    189,   111}, // Embu/Kenya
+{    190,   225}, // Cherokee/UnitedStates
+{    191,   137}, // Morisyen/Mauritius
+{    192,   210}, // Makonde/Tanzania
+{    193,   210}, // Langi/Tanzania
+{    194,   221}, // Ganda/Uganda
+{    195,   239}, // Bemba/Zambia
+{    196,    39}, // Kabuverdianu/CapeVerde
+{    197,   111}, // Meru/Kenya
+{    198,   111}, // Kalenjin/Kenya
+{    199,   148}, // Nama/Namibia
+{    200,   210}, // Machame/Tanzania
+{    201,    82}, // Colognian/Germany
+{    202,   111}, // Masai/Kenya
+{    202,   210}, // Masai/Tanzania
+{    203,   221}, // Soga/Uganda
+{    204,   111}, // Luyia/Kenya
+{    205,   210}, // Asu/Tanzania
+{    206,   111}, // Teso/Kenya
+{    206,   221}, // Teso/Uganda
+{    207,    67}, // Saho/Eritrea
+{    208,   132}, // Koyra Chiini/Mali
+{    209,   210}, // Rwa/Tanzania
+{    210,   111}, // Luo/Kenya
+{    211,   221}, // Chiga/Uganda
+{    212,   145}, // Central Morocco Tamazight/Morocco
+{    213,   132}, // Koyraboro Senni/Mali
+{    214,   210}  // Shambala/Tanzania
 };
 static const int g_locale_list_count = sizeof(g_locale_list)/sizeof(g_locale_list[0]);
 void tst_QLocale::testNames()
 QTest::newRow("C short")  << QString("C") << QString("Sun") << 7 << QLocale::ShortFormat;
 QTest::newRow("C narrow")  << QString("C") << QString("7") << 7 << QLocale::NarrowFormat;
 QTest::newRow("ru_RU long")  << QString("ru_RU") << QString::fromUtf8("\320\262\320\276\321\201\320\272\321\200\320\265\321\201\320\265\320\275\321\214\320\265") << 7 << QLocale::LongFormat;
 QTest::newRow("ru_RU short")  << QString("ru_RU") << QString::fromUtf8("\320\222\321\201") << 7 << QLocale::ShortFormat;
-QTest::newRow("ru_RU narrow")  << QString("ru_RU") << QString::fromUtf8("") << 7 << QLocale::NarrowFormat;
+QTest::newRow("ru_RU narrow")  << QString("ru_RU") << QString::fromUtf8("\320\222") << 7 << QLocale::NarrowFormat;
 }
 void tst_QLocale::dayName()
 {
 QFETCH(QString, locale_name);
 QLocale sv("sv_SE");
 QCOMPARE(sv.amText(), QLatin1String("fm"));
 QCOMPARE(sv.pmText(), QLatin1String("em"));
 QLocale nn("nl_NL");
-QCOMPARE(nn.amText(), QLatin1String(""));
+QCOMPARE(nn.amText(), QLatin1String("AM"));
-QCOMPARE(nn.pmText(), QLatin1String(""));
+QCOMPARE(nn.pmText(), QLatin1String("PM"));
 QLocale ua("uk_UA");
 QCOMPARE(ua.amText(), QString::fromUtf8("\320\264\320\277"));
 QCOMPARE(ua.pmText(), QString::fromUtf8("\320\277\320\277"));
 }
 const QLocale c(QLocale::C);
 // check that the NarrowFormat is the same as ShortFormat.
 QCOMPARE(c.timeFormat(QLocale::NarrowFormat), c.timeFormat(QLocale::ShortFormat));
 const QLocale no("no_NO");
-QCOMPARE(no.timeFormat(QLocale::NarrowFormat), QLatin1String("HH.mm"));
+QCOMPARE(no.timeFormat(QLocale::NarrowFormat), QLatin1String("HH:mm"));
-QCOMPARE(no.timeFormat(QLocale::ShortFormat), QLatin1String("HH.mm"));
+QCOMPARE(no.timeFormat(QLocale::ShortFormat), QLatin1String("HH:mm"));
-QCOMPARE(no.timeFormat(QLocale::LongFormat), QLatin1String("'kl'. HH.mm.ss "));
+QCOMPARE(no.timeFormat(QLocale::LongFormat), QLatin1String("'kl'. HH:mm:ss t"));
 }
 void tst_QLocale::dateTimeFormat()
 {
 const QLocale c(QLocale::C);
 // check that the NarrowFormat is the same as ShortFormat.
 QCOMPARE(c.dateTimeFormat(QLocale::NarrowFormat), c.dateTimeFormat(QLocale::ShortFormat));
 const QLocale no("no_NO");
-QCOMPARE(no.dateTimeFormat(QLocale::NarrowFormat), QLatin1String("dd.MM.yy HH.mm"));
+QCOMPARE(no.dateTimeFormat(QLocale::NarrowFormat), QLatin1String("dd.MM.yy HH:mm"));
-QCOMPARE(no.dateTimeFormat(QLocale::ShortFormat), QLatin1String("dd.MM.yy HH.mm"));
+QCOMPARE(no.dateTimeFormat(QLocale::ShortFormat), QLatin1String("dd.MM.yy HH:mm"));
-QCOMPARE(no.dateTimeFormat(QLocale::LongFormat), QLatin1String("dddd d. MMMM yyyy 'kl'. HH.mm.ss "));
+QCOMPARE(no.dateTimeFormat(QLocale::LongFormat), QLatin1String("dddd d. MMMM yyyy 'kl'. HH:mm:ss t"));
 }
 void tst_QLocale::monthName()
 {
 const QLocale c(QLocale::C);
 const QLocale de("de_DE");
 QCOMPARE(de.monthName(12, QLocale::LongFormat), QLatin1String("Dezember"));
 QCOMPARE(de.monthName(12, QLocale::ShortFormat), QLatin1String("Dez"));
 // 'de' locale doesn't have narrow month name
-QCOMPARE(de.monthName(12, QLocale::NarrowFormat), QLatin1String(""));
+QCOMPARE(de.monthName(12, QLocale::NarrowFormat), QLatin1String("D"));
 QLocale ru("ru_RU");
 QCOMPARE(ru.monthName(1, QLocale::LongFormat), QString::fromUtf8("\321\217\320\275\320\262\320\260\321\200\321\217"));
 QCOMPARE(ru.monthName(1, QLocale::ShortFormat), QString::fromUtf8("\321\217\320\275\320\262\56"));
-QCOMPARE(ru.monthName(1, QLocale::NarrowFormat), QString::fromUtf8("")); // empty in CLDR 1.6.1
+QCOMPARE(ru.monthName(1, QLocale::NarrowFormat), QString::fromUtf8("\320\257"));
 }
 void tst_QLocale::standaloneMonthName()
 {
 const QLocale c(QLocale::C);

changeset 29	b72c6db6890b
parent 18	2f34d5167611