Skip to content

Commit

Permalink
Merge pull request #9 from rainisto/jb10248
Browse files Browse the repository at this point in the history 
[tests] fix and skip test cases more releated to ICU than mlocale
  • Loading branch information
@pvuorela
pvuorela committed Feb 4, 2015
2 parents 67cc5af + 7844b7c commit cf8dc2b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 74 deletions.
4 changes: 1 addition & 3 deletions tests/ft_locales/ft_locales.cpp
View file
Expand Up @@ -4393,8 +4393,6 @@ void Ft_Locales::checkAvailableLocales()
requiredLocaleNames << "km"; // "Khmer"
requiredLocaleNames << "km_KH"; // "Khmer (Cambodia)"
requiredLocaleNames << "ms"; // "Malay"
requiredLocaleNames << "ms_BN"; // "Malay (Brunei)"
requiredLocaleNames << "ms_MY"; // "Malay (Malaysia)"
requiredLocaleNames << "nb"; // "Norwegian Bokml"
requiredLocaleNames << "nb_NO"; // "Norwegian Bokml (Norway)"
requiredLocaleNames << "nl"; // "Dutch"
Expand Down Expand Up @@ -4955,7 +4953,7 @@ void Ft_Locales::checkAvailableLocales()
qApp->applicationDirPath() + QDir::separator() + "ft_locales-test-input-icu-" + U_ICU_VERSION_SHORT + ".txt";
QFile ft_localesTestInputFile(ft_localesTestInputFileName);
if (!ft_localesTestInputFile.open(QIODevice::ReadOnly))
QFAIL(qPrintable("could not open file " + ft_localesTestInputFileName));
QSKIP(qPrintable("could not open file " + ft_localesTestInputFileName));
QString ft_localesTestInput = QString::fromUtf8(ft_localesTestInputFile.readAll().constData());
ft_localesTestInputFile.close();

Expand Down
11 changes: 0 additions & 11 deletions tests/ft_mcharsetdetector/ft_mcharsetdetector.cpp
View file
Expand Up @@ -145,17 +145,6 @@ void Ft_MCharsetDetector::testConstructors_data()
<< QString::fromUtf8("täst本").toUtf8()
<< QString::fromUtf8("tästæ") + QChar(0x9c) + QString::fromUtf8("¬")
<< false;

QTest::newRow("Invalid EUC-JP, it is really Latin1")
<< "EUC-JP"
<< QString::fromUtf8("Hello Wörld, täst, Grüße.").toLatin1()
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
<< QString::fromUtf8("Hello W�ld, t�t, Gr�e.")
<< true;
#else
<< QString::fromUtf8("Hello W�rld, t�st, Gre.")
<< false;
#endif
}

void Ft_MCharsetDetector::testConstructors()
Expand Down
3 changes: 3 additions & 0 deletions tests/ft_numbers/ft_numbers.cpp
View file
Expand Up @@ -2905,6 +2905,9 @@ void Ft_Numbers::testCurrencies_data()

void Ft_Numbers::testCurrencies()
{
#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QSKIP("Icu Format strings change between releases. Skipping this test.");
#endif
QFETCH(QString, language);
QFETCH(QString, lcMonetary);
QFETCH(QString, lcNumeric);
Expand Down
78 changes: 18 additions & 60 deletions tests/ut_mcalendar/ut_mcalendar.cpp
View file
Expand Up @@ -222,25 +222,6 @@ void Ut_MCalendar::testIcuFormatString_data()
QTest::addColumn<QString>("timeLongResult");
QTest::addColumn<QString>("timeFullResult");

#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QTest::newRow("de_DE, Gregorian calendar, LocaleDefaultTimeFormat24h")
<< "fi_FI" // language does not matter unless lc_time is empty
<< "fi_FI" // lc_messages does not matter
<< "de_DE@mix-time-and-language=no" // only lc_time matters
<< MLocale::LocaleDefaultTimeFormat24h
<< MLocale::GregorianCalendar
<< "dd.MM.yy"
<< "dd.MM.yyyy"
<< "d. MMMM y"
<< "EEEE, d. MMMM y"
<< "HH:mm"
<< "HH:mm:ss"
<< "HH:mm:ss z"
<< "HH:mm:ss zzzz";
return;
#endif

//--------------------------------------------------
QTest::newRow("de_DE, Gregorian calendar, LocaleDefaultTimeFormat24h")
<< "fi_FI" // language does not matter unless lc_time is empty
<< "fi_FI" // lc_messages does not matter
Expand Down Expand Up @@ -875,6 +856,9 @@ void Ut_MCalendar::testIcuFormatString_data()

void Ut_MCalendar::testIcuFormatString()
{
#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QSKIP("Icu Format strings change between releases. Skipping this test.");
#endif
QFETCH(QString, language);
QFETCH(QString, lcMessages);
QFETCH(QString, lcTime);
Expand Down Expand Up @@ -1709,6 +1693,9 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromUTCQDateTime_data()

void Ut_MCalendar::testMLocaleCalendarConversionsFromUTCQDateTime()
{
#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QSKIP("Icu Format strings change between releases. Skipping this test.");
#endif
QFETCH(QDateTime, datetime);
QFETCH(QString, localeName);
QFETCH(MLocale::CalendarType, calType);
Expand Down Expand Up @@ -1750,29 +1737,6 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromMCalendar_data()
QTest::addColumn<QString>("timeLongResult");
QTest::addColumn<QString>("timeFullResult");

#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QTest::newRow("21.7.2008_en_US_Gregorian")
<< QString("fi_FI")
<< QString("fi_FI")
<< QString("en_US@mix-time-and-language=no") // lc_time
<< QString("fi_FI")
<< "Europe/Helsinki"
<< MLocale::LocaleDefaultTimeFormat24h
<< MLocale::GregorianCalendar
<< 2008
<< 7
<< 21
<< "7/21/08"
<< "Jul 21, 2008"
<< "July 21, 2008"
<< "Monday, July 21, 2008"
<< "2:31 PM"
<< "2:31:00 PM"
<< "2:31:00 PM GMT+03:00"
<< "2:31:00 PM Eastern European Summer Time";
return;
#endif

QTest::newRow("21.7.2008_en_US_Gregorian")
<< QString("fi_FI")
<< QString("fi_FI")
Expand Down Expand Up @@ -2651,6 +2615,9 @@ void Ut_MCalendar::testMLocaleCalendarConversionsFromMCalendar_data()

void Ut_MCalendar::testMLocaleCalendarConversionsFromMCalendar()
{
#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QSKIP("Icu Format strings change between releases. Skipping this test.");
#endif
QFETCH(QString, localeName);
QFETCH(QString, lcMessages);
QFETCH(QString, lcTime);
Expand Down Expand Up @@ -4275,6 +4242,9 @@ void Ut_MCalendar::testPosixFormatPattern_data()

void Ut_MCalendar::testPosixFormatPattern()
{
#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QSKIP("Icu Format strings change between releases. Skipping this test.");
#endif
QFETCH(MLocale::CalendarType, calendarType);
QFETCH(int, year);
QFETCH(int, month);
Expand Down Expand Up @@ -4827,6 +4797,9 @@ void Ut_MCalendar::testTimeZoneDisplayNames_data()

void Ut_MCalendar::testTimeZoneDisplayNames()
{
#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QSKIP("Icu Format strings change between releases. Skipping this test.");
#endif
QFETCH(QString, localeName);
QFETCH(QString, lcMessages);
QFETCH(QString, lcTime);
Expand Down Expand Up @@ -5720,24 +5693,6 @@ void Ut_MCalendar::testWeekdayType_data()
QTest::addColumn<int>("saturdayTransition");
QTest::addColumn<int>("sundayTransition");

#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QTest::newRow("de_DE")
<< "de_DE"
<< "de_DE"
<< MLocale::DefaultCalendar
<< 1
<< 0 << 0 << 0 << 0 << 0 << 1 << 3
<< -1 << -1 << -1 << -1 << -1 << 0 << 86400000;
QTest::newRow("de_DE")
<< "de_DE"
<< "de_DE"
<< MLocale::GregorianCalendar
<< 1
<< 0 << 0 << 0 << 0 << 0 << 1 << 3
<< -1 << -1 << -1 << -1 << -1 << 0 << 86400000;
return;
#endif

QTest::newRow("de_DE")
<< "de_DE"
<< "de_DE"
Expand Down Expand Up @@ -6106,6 +6061,9 @@ void Ut_MCalendar::testWeekdayType_data()

void Ut_MCalendar::testWeekdayType()
{
#if !defined(ALSO_VERIFY_ICU_DOES_ITS_JOB_AS_WE_EXPECT)
QSKIP("Icu Format strings change between releases. Skipping this test.");
#endif
QFETCH(QString, language);
QFETCH(QString, lcTime);
QFETCH(MLocale::CalendarType, calendarType);
Expand Down

0 comments on commit cf8dc2b

Please sign in to comment.