diff options
author | Andreas Buhr <andreas.buhr@qt.io> | 2020-09-08 12:25:14 +0200 |
---|---|---|
committer | Andreas Buhr <andreas.buhr@qt.io> | 2020-09-10 17:29:38 +0200 |
commit | 1b02cfd38de113ff7c68a28b72622b26c4cd8250 (patch) | |
tree | 532eaa33fa8854204008c45ff37328cb84a735d5 /tests | |
parent | 8bc739fcc2f89fd5bc12f3a5bdfc56226637fb01 (diff) |
Adapt QDate unit tests to not take into account system locale
QDate was changed to consistently use the C local in
serialization and parsing in git commit
5ba66c5622e9e0da87a5037399b375d7e8cee554.
This commit reflects this change in the unit tests.
Task-number: QTBUG-80441
Change-Id: Ib21a215ef0e36c9eaa2c161b92c6877a50ae6f06
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/time/qdate/tst_qdate.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp index 6c7283709c..30917c8cfd 100644 --- a/tests/auto/corelib/time/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp @@ -1223,20 +1223,19 @@ void tst_QDate::fromStringFormat_data() QTest::addColumn<QString>("format"); QTest::addColumn<QDate>("expected"); - // Undo this (inline the C-locale versions) for ### Qt 6 - // Get localized names: - QString january = QLocale::system().monthName(1, QLocale::LongFormat); - QString february = QLocale::system().monthName(2, QLocale::LongFormat); - QString march = QLocale::system().monthName(3, QLocale::LongFormat); - QString august = QLocale::system().monthName(8, QLocale::LongFormat); - QString mon = QLocale::system().dayName(1, QLocale::ShortFormat); - QString monday = QLocale::system().dayName(1, QLocale::LongFormat); - QString tuesday = QLocale::system().dayName(2, QLocale::LongFormat); - QString wednesday = QLocale::system().dayName(3, QLocale::LongFormat); - QString thursday = QLocale::system().dayName(4, QLocale::LongFormat); - QString friday = QLocale::system().dayName(5, QLocale::LongFormat); - QString saturday = QLocale::system().dayName(6, QLocale::LongFormat); - QString sunday = QLocale::system().dayName(7, QLocale::LongFormat); + // Get names: + const QString january = QStringLiteral("January"); + const QString february = QStringLiteral("February"); + const QString march = QStringLiteral("March"); + const QString august = QStringLiteral("August"); + const QString mon = QStringLiteral("Mon"); + const QString monday = QStringLiteral("Monday"); + const QString tuesday = QStringLiteral("Tuesday"); + const QString wednesday = QStringLiteral("Wednesday"); + const QString thursday = QStringLiteral("Thursday"); + const QString friday = QStringLiteral("Friday"); + const QString saturday = QStringLiteral("Saturday"); + const QString sunday = QStringLiteral("Sunday"); QTest::newRow("data0") << QString("") << QString("") << defDate(); QTest::newRow("data1") << QString(" ") << QString("") << invalidDate(); |