From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: Remove SkipMode parameter from QSKIP calls. The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern --- tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 10 +++++----- tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 5 ++--- tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp | 4 ++-- tests/auto/corelib/tools/qstring/tst_qstring.cpp | 6 ++---- .../auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp | 2 +- tests/auto/corelib/tools/qvector/tst_qvector.cpp | 2 +- 6 files changed, 13 insertions(+), 16 deletions(-) (limited to 'tests/auto/corelib/tools') diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index c6a71a303b..13b2938027 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -840,7 +840,7 @@ void tst_QDateTime::toTimeSpec() QCOMPARE(utc.toTimeSpec(Qt::UTC), local.toTimeSpec(Qt::UTC)); QCOMPARE(utc.toTimeSpec(Qt::LocalTime), local.toTimeSpec(Qt::LocalTime)); } else { - QSKIP("Not tested with timezone other than Central European (CET/CST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CST)"); } } @@ -862,7 +862,7 @@ void tst_QDateTime::toLocalTime() QCOMPARE(utc.toLocalTime(), local); QCOMPARE(utc.toLocalTime(), local.toLocalTime()); } else { - QSKIP("Not tested with timezone other than Central European (CET/CST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CST)"); } } @@ -884,7 +884,7 @@ void tst_QDateTime::toUTC() QCOMPARE(local.toUTC(), utc); QCOMPARE(utc.toUTC(), local.toUTC()); } else { - QSKIP("Not tested with timezone other than Central European (CET/CST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CST)"); } // To make sure bug 72713 never happens again @@ -1093,7 +1093,7 @@ void tst_QDateTime::currentDateTimeUtc2() } while (--i && !ok); if (!i) - QSKIP("Failed to get the dates within 1 ms of each other", SkipAll); + QSKIP("Failed to get the dates within 1 ms of each other"); // seconds and milliseconds should be the same: QCOMPARE(utc.time().second(), local.time().second()); @@ -1162,7 +1162,7 @@ void tst_QDateTime::task_137698() // This is true for Central European Time if (!europeanTimeZone) - QSKIP("Not tested with timezone other than Central European (CET/CEST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CEST)"); QDateTime dt = QDateTime(QDate(2006, 11, 6), QTime(0, 0, 0), Qt::LocalTime); dt.setDate(QDate(2006, 10, 16)); diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index cc7404deef..366ee25222 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1074,9 +1074,8 @@ void tst_QLocale::toDateTime() void tst_QLocale::macDefaultLocale() { QLocale locale = QLocale::system(); - if (locale.name() != QLatin1String("en_US")) { - QSKIP("This test only tests for en_US", SkipAll); - } + if (locale.name() != QLatin1String("en_US")) + QSKIP("This test only tests for en_US"); QTime invalidTime; QDate invalidDate; diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp index ff776b9752..7d7a81232c 100644 --- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp @@ -819,7 +819,7 @@ void tst_QSharedPointer::differentPointers() if (*reinterpret_cast(&aData) == *reinterpret_cast(&aBase)) QFAIL("Something went very wrong -- we couldn't create two different pointers to the same object"); if (aData != aBase || aBase != aData) - QSKIP("Broken compiler", SkipAll); + QSKIP("Broken compiler"); QSharedPointer ptr = QSharedPointer(aData); QSharedPointer baseptr = qSharedPointerCast(ptr); @@ -1803,7 +1803,7 @@ void tst_QSharedPointer::invalidConstructs_data() void tst_QSharedPointer::invalidConstructs() { #ifdef Q_CC_MINGW - QSKIP("The maintainer of QSharedPointer: 'We don't know what the problem is so skip the tests.'", SkipAll); + QSKIP("The maintainer of QSharedPointer: 'We don't know what the problem is so skip the tests.'"); #endif QTest::QExternalTest test; diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp index fc791ec74a..8ca9489390 100644 --- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp @@ -4217,8 +4217,7 @@ void tst_QString::tortureSprintfDouble() s.sprintf(data->fmt, d); #ifdef QT_NO_FPU // reduced precision when running with hardfloats in qemu if (d - 0.1 < 1e12) - QSKIP("clib sprintf doesn't fill with 0's on this platform", - SkipSingle); + QSKIP("clib sprintf doesn't fill with 0's on this platform"); QCOMPARE(s.left(16), QString(data->expected).left(16)); #else QCOMPARE(s, QString(data->expected)); @@ -4360,8 +4359,7 @@ void tst_QString::localeAwareCompare() const char *newLocale = setlocale(LC_ALL, locale.toLatin1()); if (!newLocale) { setlocale(LC_ALL, ""); - QSKIP("Please install the proper locale on this machine to test properly", SkipSingle); - return; + QSKIP("Please install the proper locale on this machine to test properly"); } } #endif diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp index fd67758cb6..73ff971945 100644 --- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp +++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp @@ -205,7 +205,7 @@ void tst_QVarLengthArray::oldTests() QCOMPARE(sa3[5], 5); } - QSKIP("This test causes the machine to crash when allocating too much memory.", SkipSingle); + QSKIP("This test causes the machine to crash when allocating too much memory."); { QVarLengthArray a; const int N = 0x7fffffff / sizeof(Foo); diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp index 2b615bc28c..59ff332a1e 100644 --- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp +++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp @@ -701,7 +701,7 @@ void tst_QVector::outOfMemory() { QVector a; - QSKIP("This test crashes on many of our machines.", SkipSingle); + QSKIP("This test crashes on many of our machines."); a.resize(N); if (a.size() == N) { QVERIFY(a.capacity() >= N); -- cgit v1.2.3