Remove code applicable to ancient ICU

sailfishos · Oct 2, 2019 · df8f3ad · df8f3ad
1 parent 83f306f
commit df8f3ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 57 deletions.
diff --git a/tests/ft_locales/ft_locales.cpp b/tests/ft_locales/ft_locales.cpp
@@ -591,12 +591,7 @@ void Ft_Locales::testMLocaleLanguageEndonym_data()
     QTest::addColumn<QString>("endonym_result");
 
 #if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
-    QTest::newRow("en_GB")
-            << QString("en_GB")
-            << QString("English (United Kingdom)");
-    QTest::newRow("en_US")
-            << QString("en_US")
-            << QString("English (United States)");
+    QSKIP("Locale endonyms really testing only ICU data, skipping");
     return;
 #endif
 
@@ -1784,14 +1779,6 @@ void Ft_Locales::testMLocaleIndexBucket_data()
         <<"fr_CA"
         << frenchStringsSorted
         << frenchExpectedBuckets;
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
-#else
-    QTest::newRow("fr_FR")
-        <<"ja_JP"
-        <<"fr_FR"
-        << frenchStringsSorted
-        << frenchExpectedBuckets;
-#endif
     QStringList spanishStringsSorted =
         (QStringList()
          <<"aaa"
@@ -3398,10 +3385,6 @@ void Ft_Locales::testMLocaleIndexBucket_data()
          <<"⼜" // 29
          <<"⼝" // 30
          <<"叫" // kRSUnicode 30.2
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
-#else
-         <<"𠮩" // kRSUnicode 30.2
-#endif
          <<"君" // kRSUnicode 30.4
          <<"咚" // kRSUnicode 30.5
          <<"⼞" // 31
@@ -3618,12 +3601,8 @@ void Ft_Locales::testMLocaleIndexBucket_data()
          <<"⿔" // 213
          <<"⿕" // 214
          <<"龢" // kRSUnicode 214.5
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
          <<"𠮩" // kRSUnicode 30.2
          <<"𪛖" // kRSUnicode 214.20
-#else
-         <<"𪛖" // kRSUnicode 214.20
-#endif
             );
     QStringList unihanExpectedBuckets =
         (QStringList()
@@ -3685,10 +3664,6 @@ void Ft_Locales::testMLocaleIndexBucket_data()
          <<"⼝" // 30
          <<"⼝" // 30
          <<"⼝" // 30
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
-#else
-         <<"⼝" // 30
-#endif
          <<"⼞" // 31
          <<"⼟" // 32
          <<"⼠" // 33
@@ -3904,10 +3879,7 @@ void Ft_Locales::testMLocaleIndexBucket_data()
          <<"⿕" // 214
          <<"⿕" // 214
          <<"⿕" // 214
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
          <<"⿕" // 214
-#else
-#endif
             );
     QTest::newRow("zh_TW@collation=stroke")
         <<"ja_JP"

diff --git a/tests/ft_numbers/ft_numbers.cpp b/tests/ft_numbers/ft_numbers.cpp
@@ -133,29 +133,17 @@ void Ft_Numbers::testQLongLongs_data()
             << QString("ar_EG@numbers=arab")
             << QString("ar_EG@numbers=latn")
             << qlonglong(-1542678073)
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
             << QString("‪-1,542,678,073‬");
-#else
-            << QString("‪-1,542,678,073‬");
-#endif
     QTest::newRow("ar_EG")
             << QString("fa")
             << QString("ar_EG@numbers=latn")
             << qlonglong(-1542678073)
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
             << QString("‪-1,542,678,073‬");
-#else
-            << QString("‪-1,542,678,073‬");
-#endif
     QTest::newRow("ar_EG")
             << QString("en_US")
             << QString("ar_EG@numbers=latn")
             << qlonglong(-1542678073)
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
             << QString("-1,542,678,073");
-#else
-            << QString("-1,542,678,073");
-#endif
     QTest::newRow("ar_TN")
             << QString("ar_TN@numbers=arab")
             << QString("ar_TN@numbers=latn")
@@ -2595,20 +2583,12 @@ void Ft_Numbers::testDoublesWithFormatting_data()
             << QString("ar_EG@numbers=latn")
             << 1234567.123450
             << 6 << 0
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
-            << QString("‪1,234,567.12345‬");
-#else
             << QString("‪1,234,567.12345‬");
-#endif
     QTest::newRow("ar_EG@numbers=latn 6")
             << QString("ar_EG@numbers=latn")
             << 1234567.123450
             << 6 << 6
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
-            << QString("‪1,234,567.123450‬");
-#else
             << QString("‪1,234,567.123450‬");
-#endif
     QTest::newRow("ar_EG@numbers=arab 6")
             << QString("ar_EG@numbers=arab")
             << 1234567.123450
@@ -2847,11 +2827,7 @@ void Ft_Numbers::testCurrencies_data()
         << QString("en_US") // lc_numeric
         << 1234.56
         << "USD"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
-        << QString("1,234.56 US$");
-#else
         << QString("1,234.56 US$");
-#endif
     QTest::newRow("ar_SA")
         << QString("de_DE")
         << QString("ar_SA")
@@ -2865,11 +2841,7 @@ void Ft_Numbers::testCurrencies_data()
         << QString("en_US")
         << 1234.56
         << "USD"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=6)
-        << QString("1,234.56 US$");
-#else
         << QString("1,234.56 US$");
-#endif
     QTest::newRow("fa_IR")
         << QString("de_DE")
         << QString("fa_IR")