adjust expected tests data in tst_QLocale::ctor()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp
index 3cdecc6..2d7eea0 100644 (file)
--- a/tests/auto/qlocale/tst_qlocale.cpp
+++ b/tests/auto/qlocale/tst_qlocale.cpp
@@ -191,7 +191,7 @@ void tst_QLocale::ctor()
 
     TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::World)
     TEST_CTOR(English, UnitedStates, QLocale::English, QLocale::UnitedStates)
-    TEST_CTOR(English, France, QLocale::English, QLocale::UnitedStates)
+    TEST_CTOR(English, France, QLocale::English, QLocale::World)
     TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
 
     TEST_CTOR(French, France, QLocale::French, QLocale::France)
@@ -203,7 +203,7 @@ void tst_QLocale::ctor()
     {
         QLocale l;
         QVERIFY(l.language() == QLocale::English);
-        QVERIFY(l.country() == QLocale::UnitedStates);
+        QVERIFY(l.country() == QLocale::World);
     }
 
     TEST_CTOR(French, France, QLocale::French, QLocale::France)
@@ -212,7 +212,7 @@ void tst_QLocale::ctor()
     TEST_CTOR(French, France, QLocale::French, QLocale::France)
     TEST_CTOR(C, AnyCountry, QLocale::C, QLocale::AnyCountry)
     TEST_CTOR(C, France, QLocale::C, QLocale::AnyCountry)
-    TEST_CTOR(Aymara, AnyCountry, QLocale::English, QLocale::UnitedStates)
+    TEST_CTOR(Aymara, AnyCountry, QLocale::English, QLocale::World)
 
     QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedKingdom));
 
@@ -239,9 +239,9 @@ void tst_QLocale::ctor()
     TEST_CTOR(Aymara, AnyCountry, QLocale::English, QLocale::UnitedKingdom)
     TEST_CTOR(Aymara, France, QLocale::English, QLocale::UnitedKingdom)
 
-    TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::UnitedStates)
+    TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::World)
     TEST_CTOR(English, UnitedStates, QLocale::English, QLocale::UnitedStates)
-    TEST_CTOR(English, France, QLocale::English, QLocale::UnitedStates)
+    TEST_CTOR(English, France, QLocale::English, QLocale::World)
     TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
 
     TEST_CTOR(French, France, QLocale::French, QLocale::France)
@@ -260,27 +260,27 @@ void tst_QLocale::ctor()
     TEST_CTOR(Aymara, AnyCountry, QLocale::English, QLocale::UnitedKingdom)
     TEST_CTOR(Aymara, France, QLocale::English, QLocale::UnitedKingdom)
 
-    TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::UnitedStates)
+    TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::World)
     TEST_CTOR(English, UnitedStates, QLocale::English, QLocale::UnitedStates)
-    TEST_CTOR(English, France, QLocale::English, QLocale::UnitedStates)
+    TEST_CTOR(English, France, QLocale::English, QLocale::World)
     TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
 
     TEST_CTOR(French, France, QLocale::French, QLocale::France)
     TEST_CTOR(C, AnyCountry, QLocale::C, QLocale::AnyCountry)
     TEST_CTOR(C, France, QLocale::C, QLocale::AnyCountry)
 
-    TEST_CTOR(Arabic, AnyCountry, QLocale::Arabic, QLocale::SaudiArabia)
-    TEST_CTOR(Dutch, AnyCountry, QLocale::Dutch, QLocale::Netherlands)
-    TEST_CTOR(German, AnyCountry, QLocale::German, QLocale::Germany)
-    TEST_CTOR(Greek, AnyCountry, QLocale::Greek, QLocale::Greece)
-    TEST_CTOR(Malay, AnyCountry, QLocale::Malay, QLocale::Malaysia)
-    TEST_CTOR(Persian, AnyCountry, QLocale::Persian, QLocale::Iran)
-    TEST_CTOR(Portuguese, AnyCountry, QLocale::Portuguese, QLocale::Portugal)
-    TEST_CTOR(Serbian, AnyCountry, QLocale::Serbian, QLocale::Serbia)
-    TEST_CTOR(Somali, AnyCountry, QLocale::Somali, QLocale::Somalia)
-    TEST_CTOR(Spanish, AnyCountry, QLocale::Spanish, QLocale::Spain)
-    TEST_CTOR(Swedish, AnyCountry, QLocale::Swedish, QLocale::Sweden)
-    TEST_CTOR(Uzbek, AnyCountry, QLocale::Uzbek, QLocale::Uzbekistan)
+    TEST_CTOR(Arabic, AnyCountry, QLocale::Arabic, QLocale::World)
+    TEST_CTOR(Dutch, AnyCountry, QLocale::Dutch, QLocale::Aruba)
+    TEST_CTOR(German, AnyCountry, QLocale::German, QLocale::Austria)
+    TEST_CTOR(Greek, AnyCountry, QLocale::Greek, QLocale::Cyprus)
+    TEST_CTOR(Malay, AnyCountry, QLocale::Malay, QLocale::Brunei)
+    TEST_CTOR(Persian, AnyCountry, QLocale::Persian, QLocale::Afghanistan)
+    TEST_CTOR(Portuguese, AnyCountry, QLocale::Portuguese, QLocale::Angola)
+    TEST_CTOR(Serbian, AnyCountry, QLocale::Serbian, QLocale::BosniaAndHerzegovina)
+    TEST_CTOR(Somali, AnyCountry, QLocale::Somali, QLocale::Djibouti)
+    TEST_CTOR(Spanish, AnyCountry, QLocale::Spanish, QLocale::LatinAmerica)
+    TEST_CTOR(Swedish, AnyCountry, QLocale::Swedish, QLocale::AlandIslands)
+    TEST_CTOR(Uzbek, AnyCountry, QLocale::Uzbek, QLocale::Afghanistan)
 
 #undef TEST_CTOR
 
@@ -305,19 +305,25 @@ void tst_QLocale::ctor()
     TEST_CTOR("", C, AnyCountry)
     TEST_CTOR("en/", C, AnyCountry)
     TEST_CTOR(c, C, AnyCountry)
-    TEST_CTOR("en", English, UnitedStates)
-    TEST_CTOR("en", English, UnitedStates)
-    TEST_CTOR("en.", English, UnitedStates)
-    TEST_CTOR("en@", English, UnitedStates)
-    TEST_CTOR("en.@", English, UnitedStates)
-    TEST_CTOR("en_", English, UnitedStates)
-    TEST_CTOR("en_U", English, UnitedStates)
-    TEST_CTOR("en_.", English, UnitedStates)
-    TEST_CTOR("en_.@", English, UnitedStates)
-    TEST_CTOR("en.bla", English, UnitedStates)
-    TEST_CTOR("en@bla", English, UnitedStates)
-    TEST_CTOR("en_blaaa", English, UnitedStates)
-    TEST_CTOR("en_zz", English, UnitedStates)
+    TEST_CTOR("en", English, World)
+    TEST_CTOR("en", English, World)
+    TEST_CTOR("en.", English, World)
+    TEST_CTOR("en@", English, World)
+    TEST_CTOR("en.@", English, World)
+    TEST_CTOR("en_", English, World)
+    TEST_CTOR("en_U", English, World)
+    TEST_CTOR("en_.", English, World)
+    TEST_CTOR("en_.@", English, World)
+    TEST_CTOR("en.bla", English, World)
+    TEST_CTOR("en@bla", English, World)
+    TEST_CTOR("en_blaaa", English, World)
+    TEST_CTOR("en_zz", English, World)
+    TEST_CTOR("en_US", English, UnitedStates)
+    TEST_CTOR("en_US.bla", English, UnitedStates)
+    TEST_CTOR("en_US@.bla", English, UnitedStates)
+    TEST_CTOR("en_US@bla", English, UnitedStates)
+    TEST_CTOR("en-US", English, UnitedStates)
+    TEST_CTOR("en-US@bla", English, UnitedStates)
     TEST_CTOR("en_GB", English, UnitedKingdom)
     TEST_CTOR("en_GB.bla", English, UnitedKingdom)
     TEST_CTOR("en_GB@.bla", English, UnitedKingdom)
@@ -325,10 +331,9 @@ void tst_QLocale::ctor()
     TEST_CTOR("en-GB", English, UnitedKingdom)
     TEST_CTOR("en-GB@bla", English, UnitedKingdom)
 
-    QVERIFY(QLocale::Norwegian == QLocale::NorwegianBokmal);
-    TEST_CTOR("nb", Norwegian, Norway)
+    TEST_CTOR("nb", NorwegianBokmal, Norway)
     TEST_CTOR("nn", NorwegianNynorsk, Norway)
-    TEST_CTOR("nb_NO", Norwegian, Norway)
+    TEST_CTOR("nb_NO", NorwegianBokmal, Norway)
     TEST_CTOR("nn_NO", NorwegianNynorsk, Norway)
     TEST_CTOR("es_ES", Spanish, Spain)
     TEST_CTOR("es_419", Spanish, LatinAmerica)
@@ -339,7 +344,8 @@ void tst_QLocale::ctor()
     TEST_CTOR("zh", Chinese, China)
     TEST_CTOR("zh-Hans", Chinese, China)
     TEST_CTOR("mn", Mongolian, Mongolia)
-    TEST_CTOR("ne", Nepali, Nepal)
+    TEST_CTOR("ne", Nepali, India)
+    TEST_CTOR("ne_NP", Nepali, Nepal)
 
 #undef TEST_CTOR
 #define TEST_CTOR(req_lc, exp_lang, exp_script, exp_country) \