Changes: remove test for icu version < 4.4.1 from ut_mcalendar

RevBy: TrustMe

Details:

We have libicu version 4.4.1 everywhere now, so this is not
necessary anymore to make the tests pass everywhere.

1 files changed, 1 insertions, 82 deletions

diff --git a/tests/ut_mcalendar/ut_mcalendar.cpp b/tests/ut_mcalendar/ut_mcalendar.cpp
index 244643a2..02f8977c 100644
--- a/tests/ut_mcalendar/ut_mcalendar.cpp
+++ b/tests/ut_mcalendar/ut_mcalendar.cpp
@@ -274,11 +274,7 @@ void Ut_MCalendar::testIcuFormatString_data()
         << "y年M月d日EEEE"
         << "H:mm"
         << "H:mm:ss"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
         << "H:mm:ss z"
-#else
-        << "HH:mm:ss z"
-#endif
         << "H時mm分ss秒 zzzz";
 
     QTest::newRow("ja_JP, Japanese calendar")
@@ -292,11 +288,7 @@ void Ut_MCalendar::testIcuFormatString_data()
         << "Gy年M月d日EEEE"
         << "H:mm"
         << "H:mm:ss"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
         << "H:mm:ss z"
-#else
-        << "HH:mm:ss z"
-#endif
         << "H時mm分ss秒 zzzz";
 
     QTest::newRow("zh_CN, Gregorian calendar")
@@ -309,11 +301,7 @@ void Ut_MCalendar::testIcuFormatString_data()
         << "y年M月d日"
         << "y年M月d日EEEE"
         << "ah:mm"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
         << "ah:mm:ss"
-#else
-        << "ahh:mm:ss"
-#endif
         << "zah时mm分ss秒"
         << "zzzzah时mm分ss秒";
 
@@ -526,17 +514,10 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromLocaltimeQDateTime_data()
             << QString("21. jul. 2008")
             << QString("21. juli 2008")
             << QString("måndag 21. juli 2008")
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << QString("12:31")
             << QString("12:31:00")
             << QString("12:31:00 GMT+03:00")
             << QString("kl. 12:31:00 austeuropeisk sommartid");
-#else
-            << QString("12.31")
-            << QString("12.31.00")
-            << QString("12.31.00 GMT+03.00")
-            << QString("kl. 12.31.00 austeuropeisk sommartid");
-#endif
     QTest::newRow("21.7.2008_nb_NO_Gregorian")
             << datetime
             << QString("nb_NO")
@@ -545,17 +526,10 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromLocaltimeQDateTime_data()
             << QString("21. juli 2008")
             << QString("21. juli 2008")
             << QString("mandag 21. juli 2008")
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << QString("12:31")
             << QString("12:31:00")
             << QString("12:31:00 GMT+03:00")
             << QString("kl. 12:31:00 østeuropeisk sommertid");
-#else
-            << QString("12.31")
-            << QString("12.31.00")
-            << QString("12.31.00 GMT+03.00")
-            << QString("kl. 12.31.00 østeuropeisk sommertid");
-#endif
     QTest::newRow("21.7.2008_no_NO_Gregorian")
             << datetime
             << QString("no_NO")
@@ -564,17 +538,10 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromLocaltimeQDateTime_data()
             << QString("21. juli 2008")
             << QString("21. juli 2008")
             << QString("mandag 21. juli 2008")
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << QString("12:31")
             << QString("12:31:00")
             << QString("12:31:00 GMT+03:00")
             << QString("kl. 12:31:00 østeuropeisk sommertid");
-#else
-            << QString("12.31")
-            << QString("12.31.00")
-            << QString("12.31.00 GMT+03.00")
-            << QString("kl. 12.31.00 østeuropeisk sommertid");
-#endif
 }
 
 void Ut_MCalendar::testMLocaleCalendarConversionsFromLocaltimeQDateTime()
@@ -660,28 +627,16 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromUTCQDateTime_data()
             << datetime
             << QString("nn_NO")
             << MLocale::GregorianCalendar
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << QString("21.07.08 15:31")
             << QString("21. juli 2008 15:31:00 GMT+03:00")
             << QString("måndag 21. juli 2008 kl. 15:31:00 austeuropeisk sommartid");
-#else
-            << QString("21.07.08 15.31")
-            << QString("21. juli 2008 15.31.00 GMT+03.00")
-            << QString("måndag 21. juli 2008 kl. 15.31.00 austeuropeisk sommartid");
-#endif
     QTest::newRow("21.7.2008_nb_NO_Gregorian")
             << datetime
             << QString("nb_NO")
             << MLocale::GregorianCalendar
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << QString("21.07.08 15:31")
             << QString("21. juli 2008 15:31:00 GMT+03:00")
             << QString("mandag 21. juli 2008 kl. 15:31:00 østeuropeisk sommertid");
-#else
-            << QString("21.07.08 15.31")
-            << QString("21. juli 2008 15.31.00 GMT+03.00")
-            << QString("mandag 21. juli 2008 kl. 15.31.00 østeuropeisk sommertid");
-#endif
 }
 
 void Ut_MCalendar::testMLocaleCalendarConversionsFromUTCQDateTime()
@@ -762,17 +717,10 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromMCalendar_data()
             << "21. jul. 2008"
             << "21. juli 2008"
             << "måndag 21. juli 2008"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << "14:31"
             << "14:31:00"
             << "14:31:00 GMT+03:00"
             << "kl. 14:31:00 austeuropeisk sommartid";
-#else
-            << "14.31"
-            << "14.31.00"
-            << "14.31.00 GMT+03.00"
-            << "kl. 14.31.00 austeuropeisk sommartid";
-#endif
 
     QTest::newRow("21.7.2008_nb_NO_Gregorian")
             << QString("nb_NO")
@@ -784,17 +732,10 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromMCalendar_data()
             << "21. juli 2008"
             << "21. juli 2008"
             << "mandag 21. juli 2008"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << "14:31"
             << "14:31:00"
             << "14:31:00 GMT+03:00"
             << "kl. 14:31:00 østeuropeisk sommertid";
-#else
-            << "14.31"
-            << "14.31.00"
-            << "14.31.00 GMT+03.00"
-            << "kl. 14.31.00 østeuropeisk sommertid";
-#endif
 
     QTest::newRow("21.7.2008_no_NO_Gregorian")
             << QString("no_NO")
@@ -806,17 +747,10 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromMCalendar_data()
             << "21. juli 2008"
             << "21. juli 2008"
             << "mandag 21. juli 2008"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >=4)
             << "14:31"
             << "14:31:00"
             << "14:31:00 GMT+03:00"
             << "kl. 14:31:00 østeuropeisk sommertid";
-#else
-            << "14.31"
-            << "14.31.00"
-            << "14.31.00 GMT+03.00"
-            << "kl. 14.31.00 østeuropeisk sommertid";
-#endif
 }
 
 void Ut_MCalendar::testMLocaleCalendarConversionsFromMCalendar()
@@ -1584,11 +1518,7 @@ void Ut_MCalendar::testPosixFormatPattern_data()
             << 3
             << "fi_FI"
             << "%Z" // Time-zone name, or no characters if no time zone is determinable
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM == 4 && U_ICU_VERSION_PATCHLEVEL_NUM >= 1)
             << "(Suomi)";
-#else
-            << "Suomi";
-#endif
 
     // ************************************************************
     QTest::newRow("en_GB %a")
@@ -2087,11 +2017,7 @@ void Ut_MCalendar::testPosixFormatPattern_data()
             << 3
             << "de_DE"
             << "%Z" // Time-zone name, or no characters if no time zone is determinable
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM == 4 && U_ICU_VERSION_PATCHLEVEL_NUM >= 1)
             << "(Finnland)";
-#else
-            << "Finnland";
-#endif
     // ************************************************************
     QTest::newRow("fi_FI %R %Z")
             << MLocale::GregorianCalendar
@@ -2103,11 +2029,8 @@ void Ut_MCalendar::testPosixFormatPattern_data()
             << 3
             << "fi_FI"
             << "%R %Z"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM == 4 && U_ICU_VERSION_PATCHLEVEL_NUM >= 1)
             << "12.25 (Suomi)";
-#else
-            << "12.25 Suomi";
-#endif
+
     QTest::newRow("en_GB %R %Z")
             << MLocale::GregorianCalendar
             << 2008
@@ -2130,11 +2053,7 @@ void Ut_MCalendar::testPosixFormatPattern_data()
             << 3
             << "de_DE"
             << "%R %Z"
-#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM == 4 && U_ICU_VERSION_PATCHLEVEL_NUM >= 1)
             << "12:25 (Finnland)";
-#else
-            << "12:25 Finnland";
-#endif
 }
 
 void Ut_MCalendar::testPosixFormatPattern()