QDateTime - Clean up Qt::DateFormat formatting and parsing

Clean-up the implementation of toString() and fromString() methods in
QDate, QTime and QDateTime code to be more consistent in ISODate and
TextDate behavior, especially when handling TimeSpec.

Reformat some code so all methods are consistent in appearance and
function to make maintenance easier.

This changes some corner-case behavior in TextDate and ISODate, but
this either fixes bugs or makes the behavior match the documentation.

Change-Id: I457aa1d7cd4f448cd9f8a2e80ec635f3cb98e58c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

2 files changed, 70 insertions, 6 deletions

diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 3a5c69d822..bc489f6206 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -85,6 +85,8 @@ private slots:
     void fromMSecsSinceEpoch();
     void toString_isoDate_data();
     void toString_isoDate();
+    void toString_textDate_data();
+    void toString_textDate();
     void toString_rfcDate_data();
     void toString_rfcDate();
     void toString_enumformat();
@@ -622,8 +624,8 @@ void tst_QDateTime::fromMSecsSinceEpoch()
 
 void tst_QDateTime::toString_isoDate_data()
 {
-    QTest::addColumn<QDateTime>("dt");
-    QTest::addColumn<QString>("formatted");
+    QTest::addColumn<QDateTime>("datetime");
+    QTest::addColumn<QString>("expected");
 
     QTest::newRow("localtime")
             << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34))
@@ -650,10 +652,68 @@ void tst_QDateTime::toString_isoDate_data()
 
 void tst_QDateTime::toString_isoDate()
 {
-    QFETCH(QDateTime, dt);
-    QFETCH(QString, formatted);
+    QFETCH(QDateTime, datetime);
+    QFETCH(QString, expected);
+
+    QLocale oldLocale;
+    QLocale::setDefault(QLocale("en_US"));
+
+    QString result = datetime.toString(Qt::ISODate);
+    QCOMPARE(result, expected);
 
-    QCOMPARE(dt.toString(Qt::ISODate), formatted);
+    QDateTime resultDatetime = QDateTime::fromString(result, Qt::ISODate);
+    // If expecting invalid result the datetime may still be valid, i.e. year < 0 or > 9999
+    if (!expected.isEmpty()) {
+        QCOMPARE(resultDatetime, datetime);
+        QCOMPARE(resultDatetime.date(), datetime.date());
+        QCOMPARE(resultDatetime.time(), datetime.time());
+        QCOMPARE(resultDatetime.timeSpec(), datetime.timeSpec());
+        QCOMPARE(resultDatetime.utcOffset(), datetime.utcOffset());
+    } else {
+        QCOMPARE(resultDatetime, QDateTime());
+    }
+
+    QLocale::setDefault(oldLocale);
+}
+
+void tst_QDateTime::toString_textDate_data()
+{
+    QTest::addColumn<QDateTime>("datetime");
+    QTest::addColumn<QString>("expected");
+
+    QTest::newRow("localtime")  << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::LocalTime)
+                                << QString("Wed Jan 2 01:02:03.000 2013");
+    QTest::newRow("utc")        << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::UTC)
+                                << QString("Wed Jan 2 01:02:03.000 2013 GMT");
+    QTest::newRow("offset+")    << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::OffsetFromUTC,
+                                             10 * 60 * 60)
+                                << QString("Wed Jan 2 01:02:03.000 2013 GMT+1000");
+    QTest::newRow("offset-")    << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::OffsetFromUTC,
+                                             -10 * 60 * 60)
+                                << QString("Wed Jan 2 01:02:03.000 2013 GMT-1000");
+    QTest::newRow("invalid")    << QDateTime()
+                                << QString("");
+}
+
+void tst_QDateTime::toString_textDate()
+{
+    QFETCH(QDateTime, datetime);
+    QFETCH(QString, expected);
+
+    QLocale oldLocale;
+    QLocale::setDefault(QLocale("en_US"));
+
+    QString result = datetime.toString(Qt::TextDate);
+    QCOMPARE(result, expected);
+
+    QDateTime resultDatetime = QDateTime::fromString(result, Qt::TextDate);
+    QCOMPARE(resultDatetime, datetime);
+    QCOMPARE(resultDatetime.date(), datetime.date());
+    QCOMPARE(resultDatetime.time(), datetime.time());
+    QCOMPARE(resultDatetime.timeSpec(), datetime.timeSpec());
+    QCOMPARE(resultDatetime.utcOffset(), datetime.utcOffset());
+
+    QLocale::setDefault(oldLocale);
 }
 
 void tst_QDateTime::toString_rfcDate_data()
@@ -1762,7 +1822,7 @@ void tst_QDateTime::fromStringDateFormat_data()
     QTest::newRow("text invalid month name") << QString::fromLatin1("Thu Jaz 1 1970 00:12:34")
         << Qt::TextDate << invalidDateTime();
     QTest::newRow("text invalid date") << QString::fromLatin1("Thu Jan 32 1970 00:12:34")
-        << Qt::TextDate << QDateTime(invalidDate(), QTime(0, 12, 34), Qt::LocalTime);
+        << Qt::TextDate << invalidDateTime();
     QTest::newRow("text invalid day #1") << QString::fromLatin1("Thu Jan XX 1970 00:12:34")
         << Qt::TextDate << invalidDateTime();
     QTest::newRow("text invalid day #2") << QString::fromLatin1("Thu X. Jan 00:00:00 1970")
diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
index 675aeafc06..864f90b380 100644
--- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
@@ -575,9 +575,12 @@ void tst_QTime::fromStringDateFormat_data()
     QTest::newRow("TextDate - data1") << QString("10:12:34") << Qt::TextDate << QTime(10,12,34,0);
     QTest::newRow("TextDate - data2") << QString("19:03:54.998601") << Qt::TextDate << QTime(19, 3, 54, 999);
     QTest::newRow("TextDate - data3") << QString("19:03:54.999601") << Qt::TextDate << QTime(19, 3, 54, 999);
+    QTest::newRow("TextDate - data4") << QString("10:12") << Qt::TextDate << QTime(10, 12, 0, 0);
     QTest::newRow("TextDate - invalid, minutes") << QString::fromLatin1("23:XX:00") << Qt::TextDate << invalidTime();
+    QTest::newRow("TextDate - invalid, minute fraction") << QString::fromLatin1("23:00.123456") << Qt::TextDate << invalidTime();
     QTest::newRow("TextDate - invalid, seconds") << QString::fromLatin1("23:00:XX") << Qt::TextDate << invalidTime();
     QTest::newRow("TextDate - invalid, milliseconds") << QString::fromLatin1("23:01:01:XXXX") << Qt::TextDate << QTime(23, 1, 1, 0);
+    QTest::newRow("TextDate - midnight 24") << QString("24:00:00") << Qt::TextDate << QTime();
 
     QTest::newRow("IsoDate - valid, start of day, omit seconds") << QString::fromLatin1("00:00") << Qt::ISODate << QTime(0, 0, 0);
     QTest::newRow("IsoDate - valid, omit seconds") << QString::fromLatin1("22:21") << Qt::ISODate << QTime(22, 21, 0);
@@ -599,6 +602,7 @@ void tst_QTime::fromStringDateFormat_data()
     QTest::newRow("IsoDate - data1") << QString("10:12:34") << Qt::ISODate << QTime(10,12,34,0);
     QTest::newRow("IsoDate - data2") << QString("19:03:54.998601") << Qt::ISODate << QTime(19, 3, 54, 999);
     QTest::newRow("IsoDate - data3") << QString("19:03:54.999601") << Qt::ISODate << QTime(19, 3, 54, 999);
+    QTest::newRow("IsoDate - midnight 24") << QString("24:00:00") << Qt::ISODate << QTime(0, 0, 0, 0);
     QTest::newRow("IsoDate - minute fraction midnight") << QString("24:00,0") << Qt::ISODate << QTime(0, 0, 0, 0);
 
     // Test Qt::RFC2822Date format (RFC 2822).