AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QLocale: remove QSKIP, wrap Q_OS_MAC/Q_OS_WIN

Browse Source 
Change-Id: I44755379561b98e43dd19c8c01b40349be203e14
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Sergio Ahumada 2012-10-02 16:13:12 +02:00 committed by The Qt Project
parent 122b09c1d0
commit b4bf76fffc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -87,8 +87,12 @@ public:
private slots:
void initTestCase();
#ifdef Q_OS_WIN
void windowsDefaultLocale();
#endif
#ifdef Q_OS_MAC
void macDefaultLocale();
#endif
void ctor();
void emptyCtor();
@ -1109,11 +1113,9 @@ void tst_QLocale::toDateTime()
QCOMPARE(l.toDateTime(string, QLocale::LongFormat), result);
}
#ifdef Q_OS_MAC
void tst_QLocale::macDefaultLocale()
{
#ifndef Q_OS_MAC
QSKIP("This is a Mac OS X-only test");
#endif
QLocale locale = QLocale::system();
if (locale.name() != QLatin1String("en_US"))
@ -1192,6 +1194,7 @@ void tst_QLocale::macDefaultLocale()
QCOMPARE(locale.weekdays(), days);
}
#endif // Q_OS_MAC
#ifdef Q_OS_WIN
#include <qt_windows.h>
@ -1247,9 +1250,9 @@ public:
#endif // Q_OS_WIN
#ifdef Q_OS_WIN
void tst_QLocale::windowsDefaultLocale()
{
#ifdef Q_OS_WIN
RestoreLocaleHelper systemLocale;
// set weird system defaults and make sure we're using them
setWinLocaleInfo(LOCALE_SDECIMAL, QLatin1String("@"));
@ -1283,8 +1286,8 @@ void tst_QLocale::windowsDefaultLocale()
QCOMPARE(locale.toString(QDateTime(QDate(1974, 12, 1), QTime(1,2,3)), QLocale::LongFormat),
QString("1@12@1974 1^2^3"));
QCOMPARE(locale.toString(QTime(1,2,3), QLocale::LongFormat), QString("1^2^3"));
#endif // #ifdef Q_OS_WIN
}
#endif // #ifdef Q_OS_WIN
void tst_QLocale::numberOptions()
{