diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-22 15:35:18 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-05-08 09:50:16 +0200 |
commit | 1f13a0fbec627ea445cfad4a2863b51e31c1989d (patch) | |
tree | 5e39553504d1137ff305053d9e3816ca7be5e330 | |
parent | 4fa94440902d87b41f6cda7e5fd057dc8e79f08d (diff) |
Condition some date-time tests on feature textdate
They use the Qt::TextDate format, so do depend on the feature.
Rename one in the process; nothing in its test has anything to do with
de_DE locale.
Pick-to: 5.15
Change-Id: I2adae5c46e6009c13b433993ed2c3c761a500bfb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 65e12c1171..e3192e1dd1 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -120,7 +120,7 @@ private slots: void fromStringStringFormat(); void fromStringStringFormatLocale_data(); void fromStringStringFormatLocale(); -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_CONFIG(textdate) void fromString_LOCALE_ILDATE(); #endif #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) @@ -140,7 +140,9 @@ private slots: void fewDigitsInYear() const; void printNegativeYear() const; - void roundtripGermanLocale() const; +#if QT_CONFIG(textdate) + void roundtripTextDate() const; +#endif void utcOffsetLessThan() const; void isDaylightTime() const; @@ -881,7 +883,7 @@ void tst_QDateTime::toString_isoDate_extra() #endif // timezone } -#if QT_CONFIG(datestring) +#if QT_CONFIG(datestring) // depends on textdate void tst_QDateTime::toString_textDate_data() { QTest::addColumn<QDateTime>("datetime"); @@ -1015,8 +1017,10 @@ void tst_QDateTime::toString_enumformat() { QDateTime dt1(QDate(1995, 5, 20), QTime(12, 34, 56)); +#if QT_CONFIG(textdate) QString str1 = dt1.toString(Qt::TextDate); - QVERIFY(!str1.isEmpty()); // It's locale dependent everywhere + QVERIFY(!str1.isEmpty()); // It's locale-dependent everywhere +#endif QString str2 = dt1.toString(Qt::ISODate); QCOMPARE(str2, QString("1995-05-20T12:34:56")); @@ -2104,6 +2108,7 @@ void tst_QDateTime::fromStringDateFormat_data() QTest::addColumn<Qt::DateFormat>("dateFormat"); QTest::addColumn<QDateTime>("expected"); +#if QT_CONFIG(textdate) // Test Qt::TextDate format. QTest::newRow("text date") << QString::fromLatin1("Tue Jun 17 08:00:10 2003") << Qt::TextDate << QDateTime(QDate(2003, 6, 17), QTime(8, 0, 10, 0), Qt::LocalTime); @@ -2177,6 +2182,7 @@ void tst_QDateTime::fromStringDateFormat_data() << Qt::TextDate << invalidDateTime(); QTest::newRow("text second fraction") << QString::fromLatin1("Mon 6. May 2013 01:02:03.456") << Qt::TextDate << QDateTime(QDate(2013, 5, 6), QTime(1, 2, 3, 456)); +#endif // textdate // Test Qt::ISODate format. QTest::newRow("trailing space") // QTBUG-80445 @@ -2570,7 +2576,7 @@ void tst_QDateTime::fromStringStringFormatLocale() QCOMPARE(parsed, expected); } -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_CONFIG(textdate) // Windows only void tst_QDateTime::fromString_LOCALE_ILDATE() { @@ -2935,12 +2941,16 @@ void tst_QDateTime::printNegativeYear() const } } -void tst_QDateTime::roundtripGermanLocale() const +#if QT_CONFIG(textdate) +void tst_QDateTime::roundtripTextDate() const { /* This code path should not result in warnings. */ - const QDateTime theDateTime(QDateTime::currentDateTime()); - theDateTime.fromString(theDateTime.toString(Qt::TextDate), Qt::TextDate); + const QDateTime now(QDateTime::currentDateTime()); + // TextDate drops millis: + const QDateTime theDateTime(now.addMSecs(-now.time().msec())); + QCOMPARE(QDateTime::fromString(theDateTime.toString(Qt::TextDate), Qt::TextDate), theDateTime); } +#endif void tst_QDateTime::utcOffsetLessThan() const { |