diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2022-07-29 15:50:09 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2022-09-13 17:10:04 +0200 |
| commit | 411b17150eae7abb9b9db1040e1797c9806e5269 (patch) | |
| tree | c6dfd0857e0b331f0619ebf6bc0760b28dd9cd14 /tests/auto/corelib | |
| parent | 5832087859c72c1e6566b0fceeaf334dba61de3d (diff) | |
Make time parsing accept zz as equivalent to z
Expand a test to cover millsecond format variants more thoroughly,
including a test for the new usage of zz. This applies to parsing the
complement to commit 0a36a7c1db173089c25ea09029505a589a1c59e5's change
to serialization. Fixed minor glitch in the serialization's doc, too.
[ChangeLog][QtCore][QDateTime] When parsing a datetime, the 'zz'
format specifier is now equivalent to 'z', as for serialization.
Change-Id: I1c5700064738d9c92d5e8ce10bff8050131e190f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 17e59a2c18..a527b328e9 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -2752,9 +2752,15 @@ void tst_QDateTime::fromStringStringFormat_data() QTest::newRow("data15") << QString("Thu January 2004") << QString("ddd MMMM yyyy") << QDate(2004, 1, 1).startOfDay(); - QTest::newRow("data16") << QString("2005-06-28T07:57:30.001Z") - << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 1), Qt::UTC); + QTest::newRow("zulu-time-with-z-centisec") + << QString("2005-06-28T07:57:30.01Z") << QString("yyyy-MM-ddThh:mm:ss.zt") + << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 10), Qt::UTC); + QTest::newRow("zulu-time-with-zz-decisec") + << QString("2005-06-28T07:57:30.1Z") << QString("yyyy-MM-ddThh:mm:ss.zzt") + << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 100), Qt::UTC); + QTest::newRow("zulu-time-with-zzz-centisec") + << QString("2005-06-28T07:57:30.01Z") << QString("yyyy-MM-ddThh:mm:ss.zzzt") + << QDateTime(); // Invalid because too few digits for zzz QTest::newRow("utc-time-spec-as:UTC+0") << QString("2005-06-28T07:57:30.001UTC+0") << QString("yyyy-MM-ddThh:mm:ss.zt") << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), Qt::UTC); |