From 168c583a783196181b7aa601d644459d7e0de92d Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 5 Jun 2012 16:18:59 +0200 Subject: Allow ISODate string without seconds in QTime::fromString(). According to ISO 8601 (section 4.2.2.3), seconds can be omitted from a string representing time. Task-number: QTBUG-2813 Change-Id: I2578f290845e46a8f49be489f1d7427984ae7f08 Reviewed-by: Thiago Macieira --- .../auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'tests') diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index e4cdb1a5c8..49fada6c0b 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -115,6 +115,8 @@ private slots: void dateFromStringFormat(); void timeFromStringFormat_data(); void timeFromStringFormat(); + void timeFromStringDateFormat_data(); + void timeFromStringDateFormat(); void dateTimeFromStringFormat_data(); void dateTimeFromStringFormat(); @@ -1435,6 +1437,32 @@ void tst_QDateTime::timeFromStringFormat() QCOMPARE(dt, expected); } +void tst_QDateTime::timeFromStringDateFormat_data() +{ + QTest::addColumn("string"); + QTest::addColumn("format"); + QTest::addColumn("expected"); + + QTest::newRow("valid, start of day, omit seconds") << QString::fromLatin1("00:00") << Qt::ISODate << QTime(0, 0, 0); + QTest::newRow("valid, omit seconds") << QString::fromLatin1("22:21") << Qt::ISODate << QTime(22, 21, 0); + QTest::newRow("valid, omit seconds (2)") << QString::fromLatin1("23:59") << Qt::ISODate << QTime(23, 59, 0); + QTest::newRow("valid, end of day") << QString::fromLatin1("23:59:59") << Qt::ISODate << QTime(23, 59, 59); + + QTest::newRow("invalid, empty string") << QString::fromLatin1("") << Qt::ISODate << invalidTime(); + QTest::newRow("invalid, too many hours") << QString::fromLatin1("25:00") << Qt::ISODate << invalidTime(); + QTest::newRow("invalid, too many minutes") << QString::fromLatin1("10:70") << Qt::ISODate << invalidTime(); + QTest::newRow("invalid, too many seconds") << QString::fromLatin1("23:59:60") << Qt::ISODate << invalidTime(); +} + +void tst_QDateTime::timeFromStringDateFormat() +{ + QFETCH(QString, string); + QFETCH(Qt::DateFormat, format); + QFETCH(QTime, expected); + + QTime dt = QTime::fromString(string, format); + QCOMPARE(dt, expected); +} void tst_QDateTime::dateTimeFromStringFormat_data() { -- cgit v1.2.3