From 7dceb227485e4ebd240b9820b599faa4d2a24e93 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 7 Jan 2016 09:53:58 -0800 Subject: Autotest: make tst_QDateTime pass when LC_TIME != en_US QDateTime::toString for Qt::TextDate unconditionally uses the system locale (because QDate::shortDayName and QDate::shortMonthName do). Setting the default QLocale has no effect. If you ask me, those two QDate methods are buggy, but they are documented that way. Change-Id: I408dcb81ba654c929f25ffff1427366b04da5a43 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index 6d88b24eda..d880d907d1 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -802,16 +802,18 @@ void tst_QDateTime::toString_textDate_data() QTest::addColumn("datetime"); QTest::addColumn("expected"); + QString wednesdayJanuary = QDate::shortDayName(3) + ' ' + QDate::shortMonthName(1); + QTest::newRow("localtime") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::LocalTime) - << QString("Wed Jan 2 01:02:03 2013"); + << wednesdayJanuary + QString(" 2 01:02:03 2013"); QTest::newRow("utc") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::UTC) - << QString("Wed Jan 2 01:02:03 2013 GMT"); + << wednesdayJanuary + QString(" 2 01:02:03 2013 GMT"); QTest::newRow("offset+") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::OffsetFromUTC, 10 * 60 * 60) - << QString("Wed Jan 2 01:02:03 2013 GMT+1000"); + << wednesdayJanuary + QString(" 2 01:02:03 2013 GMT+1000"); QTest::newRow("offset-") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::OffsetFromUTC, -10 * 60 * 60) - << QString("Wed Jan 2 01:02:03 2013 GMT-1000"); + << wednesdayJanuary + QString(" 2 01:02:03 2013 GMT-1000"); QTest::newRow("invalid") << QDateTime() << QString(""); } @@ -821,9 +823,6 @@ void tst_QDateTime::toString_textDate() QFETCH(QDateTime, datetime); QFETCH(QString, expected); - QLocale oldLocale; - QLocale::setDefault(QLocale("en_US")); - QString result = datetime.toString(Qt::TextDate); QCOMPARE(result, expected); @@ -833,8 +832,6 @@ void tst_QDateTime::toString_textDate() QCOMPARE(resultDatetime.time(), datetime.time()); QCOMPARE(resultDatetime.timeSpec(), datetime.timeSpec()); QCOMPARE(resultDatetime.utcOffset(), datetime.utcOffset()); - - QLocale::setDefault(oldLocale); } void tst_QDateTime::toString_rfcDate_data() -- cgit v1.2.3