diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qdate/tst_qdate.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qtime/tst_qtime.cpp | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp index 728a4244a1..b91de092e8 100644 --- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp @@ -1137,10 +1137,14 @@ void tst_QDate::toStringDateFormat() QFETCH(QString, expectedStr); QCOMPARE(date.toString(Qt::SystemLocaleShortDate), QLocale::system().toString(date, QLocale::ShortFormat)); - QCOMPARE(date.toString(Qt::LocaleDate), QLocale().toString(date, QLocale::ShortFormat)); + QCOMPARE(date.toString(Qt::DefaultLocaleShortDate), QLocale().toString(date, QLocale::ShortFormat)); + QCOMPARE(date.toString(Qt::SystemLocaleLongDate), QLocale::system().toString(date, QLocale::LongFormat)); + QCOMPARE(date.toString(Qt::DefaultLocaleLongDate), QLocale().toString(date, QLocale::LongFormat)); QLocale::setDefault(QLocale::German); QCOMPARE(date.toString(Qt::SystemLocaleShortDate), QLocale::system().toString(date, QLocale::ShortFormat)); - QCOMPARE(date.toString(Qt::LocaleDate), QLocale().toString(date, QLocale::ShortFormat)); + QCOMPARE(date.toString(Qt::DefaultLocaleShortDate), QLocale().toString(date, QLocale::ShortFormat)); + QCOMPARE(date.toString(Qt::SystemLocaleLongDate), QLocale::system().toString(date, QLocale::LongFormat)); + QCOMPARE(date.toString(Qt::DefaultLocaleLongDate), QLocale().toString(date, QLocale::LongFormat)); QCOMPARE(date.toString(format), expectedStr); } diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp index 0563111abb..4bd29da056 100644 --- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp +++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp @@ -723,15 +723,23 @@ void tst_QTime::toStringFormat() void tst_QTime::toStringLocale() { QTime time(18, 30); - QCOMPARE(time.toString(Qt::SystemLocaleDate), + QCOMPARE(time.toString(Qt::SystemLocaleShortDate), QLocale::system().toString(time, QLocale::ShortFormat)); - QCOMPARE(time.toString(Qt::LocaleDate), + QCOMPARE(time.toString(Qt::DefaultLocaleShortDate), QLocale().toString(time, QLocale::ShortFormat)); + QCOMPARE(time.toString(Qt::SystemLocaleLongDate), + QLocale::system().toString(time, QLocale::LongFormat)); + QCOMPARE(time.toString(Qt::DefaultLocaleLongDate), + QLocale().toString(time, QLocale::LongFormat)); QLocale::setDefault(QLocale::German); - QCOMPARE(time.toString(Qt::SystemLocaleDate), + QCOMPARE(time.toString(Qt::SystemLocaleShortDate), QLocale::system().toString(time, QLocale::ShortFormat)); - QCOMPARE(time.toString(Qt::LocaleDate), + QCOMPARE(time.toString(Qt::DefaultLocaleShortDate), QLocale().toString(time, QLocale::ShortFormat)); + QCOMPARE(time.toString(Qt::SystemLocaleLongDate), + QLocale::system().toString(time, QLocale::LongFormat)); + QCOMPARE(time.toString(Qt::DefaultLocaleLongDate), + QLocale().toString(time, QLocale::LongFormat)); } void tst_QTime::msecsSinceStartOfDay_data() |