diff options
Diffstat (limited to 'tests/auto/corelib/time/qdate')
| -rw-r--r-- | tests/auto/corelib/time/qdate/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qdate/tst_qdate.cpp | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt new file mode 100644 index 0000000000..b39828b5df --- /dev/null +++ b/tests/auto/corelib/time/qdate/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qdate.pro. + +##################################################################### +## tst_qdate Test: +##################################################################### + +add_qt_test(tst_qdate + SOURCES + tst_qdate.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate +) diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp index 274bf4f6f0..402c2c74d4 100644 --- a/tests/auto/corelib/time/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp @@ -1159,10 +1159,8 @@ void tst_QDate::fromStringDateFormat_data() << Qt::RFC2822Date << QDate(); QTest::newRow("RFC 2822 invalid year") << QString::fromLatin1("13 Fev 0000 13:24:51 +0100") << Qt::RFC2822Date << QDate(); - // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038). QTest::newRow("RFC 2822 invalid character at end") - << QString::fromLatin1("01 Jan 2012 08:00:00 +0100!") - << Qt::RFC2822Date << QDate(2012, 1, 1); + << QString::fromLatin1("01 Jan 2012 08:00:00 +0100!") << Qt::RFC2822Date << QDate(); QTest::newRow("RFC 2822 invalid character at front") << QString::fromLatin1("!01 Jan 2012 08:00:00 +0100") << Qt::RFC2822Date << QDate(); QTest::newRow("RFC 2822 invalid character both ends") @@ -1189,10 +1187,10 @@ void tst_QDate::fromStringDateFormat_data() // No time specified QTest::newRow("RFC 850 and 1036 date only") << QString::fromLatin1("Fri Nov 01 2002") << Qt::RFC2822Date << QDate(2002, 11, 1); - // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038). + // Test invalid characters. QTest::newRow("RFC 850 and 1036 invalid character at end") << QString::fromLatin1("Sun Jan 01 08:00:00 2012 +0100!") - << Qt::RFC2822Date << QDate(2012, 1, 1); + << Qt::RFC2822Date << QDate(); QTest::newRow("RFC 850 and 1036 invalid character at front") << QString::fromLatin1("!Sun Jan 01 08:00:00 2012 +0100") << Qt::RFC2822Date << QDate(); |