summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Georg <jensg@openismus.com>2011-04-13 08:14:46 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:24:40 (GMT)
commitcbce03887f8e4025fc65abb49e263bcbad8e3573 (patch)
tree45bd04ce3d6f20a9bb21e395b5c943ec7eda26fc
parentc9ebb7df661405d2d4b34961834190c83d94a93d (diff)
downloadQt-cbce03887f8e4025fc65abb49e263bcbad8e3573.zip
Qt-cbce03887f8e4025fc65abb49e263bcbad8e3573.tar.gz
Qt-cbce03887f8e4025fc65abb49e263bcbad8e3573.tar.bz2
Add test for ISODate change in QDateTime::toString
Merge-request: 1149 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
-rw-r--r--tests/auto/qdatetime/tst_qdatetime.cpp32
1 files changed, 32 insertions, 0 deletions
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp
index a48c22c..d1a1dca 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/qdatetime/tst_qdatetime.cpp
@@ -85,6 +85,8 @@ private slots:
void setTime_t();
void setMSecsSinceEpoch_data();
void setMSecsSinceEpoch();
+ void toString_isoDate_data();
+ void toString_isoDate();
void toString_enumformat();
void toString_strformat_data();
void toString_strformat();
@@ -506,6 +508,36 @@ void tst_QDateTime::setMSecsSinceEpoch()
QCOMPARE(dt, reference.addMSecs(msecs));
}
+void tst_QDateTime::toString_isoDate_data()
+{
+ QTest::addColumn<QDateTime>("dt");
+ QTest::addColumn<QString>("formatted");
+
+ QTest::newRow("localtime")
+ << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34))
+ << QString("1978-11-09T13:28:34");
+ QTest::newRow("UTC")
+ << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34), Qt::UTC)
+ << QString("1978-11-09T13:28:34Z");
+ QDateTime dt(QDate(1978, 11, 9), QTime(13, 28, 34));
+ dt.setUtcOffset(19800);
+ QTest::newRow("positive OffsetFromUTC")
+ << dt
+ << QString("1978-11-09T13:28:34+05:30");
+ dt.setUtcOffset(-7200);
+ QTest::newRow("negative OffsetFromUTC")
+ << dt
+ << QString("1978-11-09T13:28:34-02:00");
+}
+
+void tst_QDateTime::toString_isoDate()
+{
+ QFETCH(QDateTime, dt);
+ QFETCH(QString, formatted);
+
+ QCOMPARE(dt.toString(Qt::ISODate), formatted);
+}
+
void tst_QDateTime::toString_enumformat()
{
QDateTime dt1(QDate(1995, 5, 20), QTime(12, 34, 56));