From 75b66dc8b036c4f4ef3ff8ea109efd698b72732d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 29 Nov 2011 16:37:01 +1000 Subject: Cleanup corelib autotests Remove references to the old bug tracker. The data from the old bug tracker is no longer accessible, so these markers are meaningless. Change-Id: Ib9d029d52b70fd0a512b9532d65f03763eabfe57 Reviewed-by: Rohan McGovern --- .../corelib/tools/qbytearray/tst_qbytearray.cpp | 2 - .../auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 53 +++++++++++----------- tests/auto/corelib/tools/qhash/tst_qhash.cpp | 2 - tests/auto/corelib/tools/qline/tst_qline.cpp | 16 +++---- tests/auto/corelib/tools/qmap/tst_qmap.cpp | 2 - tests/auto/corelib/tools/qrect/tst_qrect.cpp | 11 ++--- tests/auto/corelib/tools/qset/tst_qset.cpp | 1 - tests/auto/corelib/tools/qstring/tst_qstring.cpp | 38 ++++++++-------- 8 files changed, 57 insertions(+), 68 deletions(-) (limited to 'tests/auto/corelib/tools') diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index 18a3db7b06..fdd9cb8aef 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -849,7 +849,6 @@ void tst_QByteArray::indexOf_data() QTest::newRow( "17" ) << QByteArray("aBc") << QByteArray("bC") << 0 << -1; QTest::newRow( "18" ) << QByteArray("aBc") << QByteArray("BC") << 0 << -1; - // task 203692 static const char h19[] = {'x', 0x00, (char)0xe7, 0x25, 0x1c, 0x0a}; static const char n19[] = {0x00, 0x00, 0x01, 0x00}; QTest::newRow( "19" ) << QByteArray(h19, sizeof(h19)) @@ -929,7 +928,6 @@ void tst_QByteArray::lastIndexOf_data() QTest::newRow( "23" ) << QByteArray("aBc") << QByteArray("bC") << 0 << -1; QTest::newRow( "24" ) << QByteArray("aBc") << QByteArray("BC") << 0 << -1; - // task 203692 static const char h25[] = {0x00, (char)0xbc, 0x03, 0x10, 0x0a }; static const char n25[] = {0x00, 0x00, 0x01, 0x00}; QTest::newRow( "25" ) << QByteArray(h25, sizeof(h25)) diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index b536b88fa3..2616988871 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -871,7 +871,6 @@ void tst_QDateTime::toUTC() QSKIP("Not tested with timezone other than Central European (CET/CST)"); } - // To make sure bug 72713 never happens again QDateTime dt = QDateTime::currentDateTime(); if(dt.time().msec() == 0){ dt.setTime(dt.time().addMSecs(1)); @@ -1246,39 +1245,39 @@ void tst_QDateTime::fromStringTextDate_data() QTest::addColumn("msec"); QTest::addColumn("timeSpec"); - QTest::newRow("task27910") << QString("Tue Jun 17 08:00:10 2003") + QTest::newRow("text date") << QString("Tue Jun 17 08:00:10 2003") << int(Qt::TextDate) << 17 << 6 << 2003 << 8 << 0 << 10 << 0 << int(Qt::LocalTime); - QTest::newRow("task77042") << QString("2005-06-28T07:57:30.0010000000Z") + QTest::newRow("ISO date") << QString("2005-06-28T07:57:30.0010000000Z") << int(Qt::ISODate) << 28 << 6 << 2005 << 7 << 57 << 30 << 1 << int(Qt::UTC); - QTest::newRow("task77042-2") << QString("2005-06-28T07:57:30,0040000000Z") - << int(Qt::ISODate) - << 28 << 6 << 2005 << 7 << 57 << 30 << 4 - << int(Qt::UTC); - - QTest::newRow("task77042-3") << QString("2005-06-28T07:57:30,0015Z") - << int(Qt::ISODate) - << 28 << 6 << 2005 << 7 << 57 << 30 << 2 - << int(Qt::UTC); - - QTest::newRow("task77042-4") << QString("2005-06-28T07:57:30,0014Z") - << int(Qt::ISODate) - << 28 << 6 << 2005 << 7 << 57 << 30 << 1 - << int(Qt::UTC); - - QTest::newRow("task77042-5") << QString("2005-06-28T07:57:30,1Z") - << int(Qt::ISODate) - << 28 << 6 << 2005 << 7 << 57 << 30 << 100 - << int(Qt::UTC); - - QTest::newRow("task77042-6") << QString("2005-06-28T07:57:30,11") - << int(Qt::ISODate) - << 28 << 6 << 2005 << 7 << 57 << 30 << 110 - << int(Qt::LocalTime); + QTest::newRow("ISO date with comma 1") << QString("2005-06-28T07:57:30,0040000000Z") + << int(Qt::ISODate) + << 28 << 6 << 2005 << 7 << 57 << 30 << 4 + << int(Qt::UTC); + + QTest::newRow("ISO date with comma 2") << QString("2005-06-28T07:57:30,0015Z") + << int(Qt::ISODate) + << 28 << 6 << 2005 << 7 << 57 << 30 << 2 + << int(Qt::UTC); + + QTest::newRow("ISO date with comma 3") << QString("2005-06-28T07:57:30,0014Z") + << int(Qt::ISODate) + << 28 << 6 << 2005 << 7 << 57 << 30 << 1 + << int(Qt::UTC); + + QTest::newRow("ISO date with comma 4") << QString("2005-06-28T07:57:30,1Z") + << int(Qt::ISODate) + << 28 << 6 << 2005 << 7 << 57 << 30 << 100 + << int(Qt::UTC); + + QTest::newRow("ISO date with comma 5") << QString("2005-06-28T07:57:30,11") + << int(Qt::ISODate) + << 28 << 6 << 2005 << 7 << 57 << 30 << 110 + << int(Qt::LocalTime); QTest::newRow("Year 0999") << QString("Tue Jun 17 08:00:10 0999") << int(Qt::TextDate) diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp index 249924aecb..18fd087d59 100644 --- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp +++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp @@ -751,8 +751,6 @@ void tst_QHash::operator_eq() } { - // task 102658 - QHash a; QHash b; diff --git a/tests/auto/corelib/tools/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp index 8451cc631a..1d318304a9 100644 --- a/tests/auto/corelib/tools/qline/tst_qline.cpp +++ b/tests/auto/corelib/tools/qline/tst_qline.cpp @@ -167,14 +167,14 @@ void tst_QLine::testIntersection_data() << 10.0000000000001 << 0.0 << 10.0 << 20.0 << int(QLineF::BoundedIntersection) << 10.0 << 10.0; - QTest::newRow("task 241464") << 100.1599256468623 - << 100.7861905065196 - << 100.1599256468604 - << -9999.78619050651 - << 10.0 << 50.0 << 190.0 << 50.0 - << int(QLineF::BoundedIntersection) - << 100.1599256468622 - << 50.0; + QTest::newRow("long vertical") << 100.1599256468623 + << 100.7861905065196 + << 100.1599256468604 + << -9999.78619050651 + << 10.0 << 50.0 << 190.0 << 50.0 + << int(QLineF::BoundedIntersection) + << 100.1599256468622 + << 50.0; QLineF baseA(0, -50, 0, 50); QLineF baseB(-50, 0, 50, 0); diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp index 4a3b5b490e..2c04faa132 100644 --- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp +++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp @@ -460,8 +460,6 @@ void tst_QMap::operator_eq() } { - // task 102658 - QMap a; QMap b; diff --git a/tests/auto/corelib/tools/qrect/tst_qrect.cpp b/tests/auto/corelib/tools/qrect/tst_qrect.cpp index 81a8bf28a1..1696327289 100644 --- a/tests/auto/corelib/tools/qrect/tst_qrect.cpp +++ b/tests/auto/corelib/tools/qrect/tst_qrect.cpp @@ -389,13 +389,13 @@ void tst_QRect::normalized_data() QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << QRect( -10, -10, 5, 5 ); QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << getQRectCase( NullQRect ); QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << getQRectCase( EmptyQRect ); - QTest::newRow( "Task80908") << QRect(100, 200, 100, 0) << QRect(100, 200, 100, 0); + QTest::newRow( "ZeroWidth" ) << QRect(100, 200, 100, 0) << QRect(100, 200, 100, 0); // Since "NegativeSizeQRect passes, I expect both of these to pass too. // This passes, since height() returns -1 before normalization - QTest::newRow( "Task85023") << QRect(QPoint(100,201), QPoint(199,199)) << QRect(QPoint(100,199), QPoint(199,201)); + QTest::newRow( "NegativeHeight") << QRect(QPoint(100,201), QPoint(199,199)) << QRect(QPoint(100,199), QPoint(199,201)); // This, on the other hand height() returns 0 before normalization. - QTest::newRow( "Task85023.1") << QRect(QPoint(100,200), QPoint(199,199)) << QRect(QPoint(100,199), QPoint(199,200)); - QTest::newRow( "Task188109" ) << QRect(QPoint(263, 113), QPoint(136, 112)) << QRect(QPoint(136, 113), QPoint(263, 112)); + QTest::newRow( "ZeroHeight1" ) << QRect(QPoint(100,200), QPoint(199,199)) << QRect(QPoint(100,199), QPoint(199,200)); + QTest::newRow( "ZeroHeight2" ) << QRect(QPoint(263,113), QPoint(136,112)) << QRect(QPoint(136,113), QPoint(263,112)); } void tst_QRect::normalized() @@ -403,8 +403,7 @@ void tst_QRect::normalized() QFETCH(QRect, r); QFETCH(QRect, nr); - if (QTest::currentDataTag() == QString("Task85023.1")) - QEXPECT_FAIL("", "due to broken QRect definition (not possible to change)", Continue); + QEXPECT_FAIL("ZeroHeight1", "due to broken QRect definition (not possible to change, see QTBUG-22934)", Continue); QCOMPARE(r.normalized(), nr); } diff --git a/tests/auto/corelib/tools/qset/tst_qset.cpp b/tests/auto/corelib/tools/qset/tst_qset.cpp index 5611709075..98f48d0bc7 100644 --- a/tests/auto/corelib/tools/qset/tst_qset.cpp +++ b/tests/auto/corelib/tools/qset/tst_qset.cpp @@ -135,7 +135,6 @@ void tst_QSet::operator_eq() } { - // Task 102658 QSet a; QSet b; diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp index cb61dea924..3011c6c9bc 100644 --- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp @@ -3186,8 +3186,8 @@ void tst_QString::fromUtf8_data() str += QChar::ReplacementCharacter; str += " Netscape"; - QTest::newRow("task28417") << QByteArray("Prohl\355\276e\350 plugin\371 Netscape") << str << -1; - QTest::newRow("task28417-len") << QByteArray("Prohl\355\276e\350 plugin\371 Netscape") << QString("") << 0; + QTest::newRow("invalid utf8 2") << QByteArray("Prohl\355\276e\350 plugin\371 Netscape") << str << -1; + QTest::newRow("invalid utf8-len 2") << QByteArray("Prohl\355\276e\350 plugin\371 Netscape") << QString("") << 0; QTest::newRow("null-1") << QByteArray() << QString() << -1; QTest::newRow("null0") << QByteArray() << QString() << 0; @@ -3621,7 +3621,6 @@ void tst_QString::arg() str2 = str2.arg("A", "B", "C", "D", "E", "F"); QCOMPARE(str2, QString("A B C D E F %1000 %1230")); - // task 201185 QCOMPARE(QString("%1").arg(-1, 3, 10, QChar('0')), QString("-01")); QCOMPARE(QString("%1").arg(-100, 3, 10, QChar('0')), QString("-100")); QCOMPARE(QString("%1").arg(-1, 3, 10, QChar(' ')), QString(" -1")); @@ -3694,15 +3693,15 @@ void tst_QString::section_data() QTest::newRow( "data2" ) << QString("/usr/local/bin/myapp") << QString("/") << 3 << 3 << int(QString::SectionSkipEmpty) << QString("myapp") << false; QTest::newRow( "data3" ) << QString("forename**middlename**surname**phone") << QString("**") << 2 << 2 << int(QString::SectionDefault) << QString("surname") << false; QTest::newRow( "data4" ) << QString("forename**middlename**surname**phone") << QString("**") << -3 << -2 << int(QString::SectionDefault) << QString("middlename**surname") << false; - QTest::newRow( "task-21749-1" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 0 << 0 << int(QString::SectionSkipEmpty) << QString("Datt") << false; - QTest::newRow( "task-21749-2" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 1 << 1 << int(QString::SectionSkipEmpty) << QString("wollen") << false; - QTest::newRow( "task-21749-3" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 2 << 2 << int(QString::SectionSkipEmpty) << QString("wir") << false; - QTest::newRow( "task-21749-4" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 3 << 3 << int(QString::SectionSkipEmpty) << QString("mal") << false; - QTest::newRow( "task-21749-5" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 4 << 4 << int(QString::SectionSkipEmpty) << QString("sehen") << false; + QTest::newRow( "data5" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 0 << 0 << int(QString::SectionSkipEmpty) << QString("Datt") << false; + QTest::newRow( "data6" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 1 << 1 << int(QString::SectionSkipEmpty) << QString("wollen") << false; + QTest::newRow( "data7" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 2 << 2 << int(QString::SectionSkipEmpty) << QString("wir") << false; + QTest::newRow( "data8" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 3 << 3 << int(QString::SectionSkipEmpty) << QString("mal") << false; + QTest::newRow( "data9" ) << QString("##Datt######wollen######wir######mal######sehen##") << QString("#") << 4 << 4 << int(QString::SectionSkipEmpty) << QString("sehen") << false; // not fixed for 3.1 - QTest::newRow( "task-27269" ) << QString("a/b/c/d") << QString("/") << 1 << -1 << int(QString::SectionIncludeLeadingSep | QString::SectionIncludeTrailingSep) << QString("/b/c/d") << false; - QTest::newRow( "task-43641" ) << QString("aoLoboLocolod") << QString("olo") << -1 << -1 << int(QString::SectionCaseInsensitiveSeps) << QString("d") << false; - QTest::newRow( "task-27593" ) << QString("F0") << QString("F") << 0 << 0 << int(QString::SectionSkipEmpty) << QString("0") << false; + QTest::newRow( "data10" ) << QString("a/b/c/d") << QString("/") << 1 << -1 << int(QString::SectionIncludeLeadingSep | QString::SectionIncludeTrailingSep) << QString("/b/c/d") << false; + QTest::newRow( "data11" ) << QString("aoLoboLocolod") << QString("olo") << -1 << -1 << int(QString::SectionCaseInsensitiveSeps) << QString("d") << false; + QTest::newRow( "data12" ) << QString("F0") << QString("F") << 0 << 0 << int(QString::SectionSkipEmpty) << QString("0") << false; QTest::newRow( "foo1" ) << QString("foo;foo;") << QString(";") << 0 << 0 << int(QString::SectionIncludeLeadingSep) << QString("foo") << false; QTest::newRow( "foo2" ) << QString("foo;foo;") << QString(";") << 1 << 1 @@ -3722,19 +3721,18 @@ void tst_QString::section_data() QTest::newRow( "qmake_pathrx" ) << QString("/Users/sam/troll/qt4.0/src/corelib/QtCore_debug.xcode/") << QString("/") << 0 << -2 << int(QString::SectionDefault) << QString("/Users/sam/troll/qt4.0/src/corelib/QtCore_debug.xcode") << true; - QTest::newRow( "task72972" ) << QString("||2|3|||") + QTest::newRow( "data13" ) << QString("||2|3|||") << QString("|") << 0 << 1 << int(QString::SectionIncludeLeadingSep|QString::SectionIncludeTrailingSep) << QString("||") << false; - QTest::newRow( "task72972rx" ) << QString("||2|3|||") + QTest::newRow( "data14" ) << QString("||2|3|||") << QString("\\|") << 0 << 1 << int(QString::SectionIncludeLeadingSep|QString::SectionIncludeTrailingSep) << QString("||") << true; - QTest::newRow( "task72972-2" ) << QString("|1|2|") + QTest::newRow( "data15" ) << QString("|1|2|") << QString("|") << 0 << 1 << int(QString::SectionIncludeLeadingSep|QString::SectionIncludeTrailingSep) << QString("|1|") << false; - QTest::newRow( "task72972-2rx" ) << QString("|1|2|") - << QString("\\|") << 0 << 1 - << int(QString::SectionIncludeLeadingSep|QString::SectionIncludeTrailingSep) - << QString("|1|") << true; + QTest::newRow( "data16" ) << QString("|1|2|") + << QString("\\|") << 0 << 1 << int(QString::SectionIncludeLeadingSep|QString::SectionIncludeTrailingSep) + << QString("|1|") << true; QTest::newRow( "normal1" ) << QString("o1o2o") << QString("o") << 0 << 0 << int(QString::SectionIncludeLeadingSep|QString::SectionIncludeTrailingSep) @@ -3775,11 +3773,11 @@ void tst_QString::section_data() << QString("[a-z]") << 1 << 2 << int(QString::SectionIncludeLeadingSep|QString::SectionIncludeTrailingSep) << QString("o1o2o") << true; - QTest::newRow( "task45855-rx" ) << QString("This is a story, a small story") + QTest::newRow( "data17" ) << QString("This is a story, a small story") << QString("\\b") << 3 << 3 << int(QString::SectionDefault) << QString("is") << true; - QTest::newRow( "task257941-rx" ) << QString("99.0 42.3") + QTest::newRow( "data18" ) << QString("99.0 42.3") << QString("\\s*[AaBb]\\s*") << 1 << 1 << int(QString::SectionIncludeLeadingSep) << QString() << true; -- cgit v1.2.3