From 33bb8fcae9125b25020ea373ee9c0fca6ca8e8a4 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 1 Dec 2022 19:04:30 +0100 Subject: [PATCH] Add to test-cases for tst_QDateTime::fromStringStringFormat() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test a few more cases are correctly handled. Change-Id: I7f286ba93f59bf0168cac789cd30590f40e98cee Reviewed-by: Mårten Nordheim Reviewed-by: Thiago Macieira --- tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 7c34f025dc..c61fe7e90c 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -2766,6 +2766,9 @@ void tst_QDateTime::fromStringStringFormat_data() 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("zulu-time-with-z-millisec") + << 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("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); @@ -2817,6 +2820,9 @@ void tst_QDateTime::fromStringStringFormat_data() QTest::newRow("offset-from-utc:3-digit-with-colon") << QString("2008-10-13 -4:30 11.50") << QString("yyyy-MM-dd t hh.mm") << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, -16200); + QTest::newRow("offset-from-utc:merged-with-time") + << QString("2008-10-13 UTC+010011.50") << QString("yyyy-MM-dd thh.mm") + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 3600); QTest::newRow("offset-from-utc:with-colon-merged-with-time") << QString("2008-10-13 UTC+01:0011.50") << QString("yyyy-MM-dd thh.mm") << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 3600);