AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove SkipMode parameter from QSKIP calls.

Browse Source 
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 <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-10-19 12:53:13 +10:00 committed by Qt by Nokia
parent 016cd01846
commit 27f9f136f7
132 changed files with 569 additions and 654 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/3rdparty/harfbuzz/tests/shaping/main.cpp vendored
View File

@ -382,7 +382,7 @@ void tst_QScriptEngine::greek()
}
FT_Done_Face(face);
} else {
QSKIP("couln't find DejaVu Sans", SkipAll);
QSKIP("couln't find DejaVu Sans");
}
@ -419,7 +419,7 @@ void tst_QScriptEngine::greek()
FT_Done_Face(face);
} else {
QSKIP("couln't find DejaVu Sans", SkipAll);
QSKIP("couln't find DejaVu Sans");
}
}
@ -477,7 +477,7 @@ void tst_QScriptEngine::devanagari()
FT_Done_Face(face);
} else {
QSKIP("couln't find raghu.ttf", SkipAll);
QSKIP("couln't find raghu.ttf");
}
}
@ -531,7 +531,7 @@ void tst_QScriptEngine::devanagari()
FT_Done_Face(face);
} else {
QSKIP("couldn't find mangal.ttf", SkipAll);
QSKIP("couldn't find mangal.ttf");
}
}
}
@ -658,7 +658,7 @@ void tst_QScriptEngine::bengali()
FT_Done_Face(face);
} else {
QSKIP("couln't find AkaashNormal.ttf", SkipAll);
QSKIP("couln't find AkaashNormal.ttf");
}
}
{
@ -772,7 +772,7 @@ void tst_QScriptEngine::bengali()
FT_Done_Face(face);
} else {
QSKIP("couln't find MuktiNarrow.ttf", SkipAll);
QSKIP("couln't find MuktiNarrow.ttf");
}
}
{
@ -808,7 +808,7 @@ void tst_QScriptEngine::bengali()
FT_Done_Face(face);
} else {
QSKIP("couln't find LikhanNormal.ttf", SkipAll);
QSKIP("couln't find LikhanNormal.ttf");
}
}
}
@ -833,7 +833,7 @@ void tst_QScriptEngine::gurmukhi()
FT_Done_Face(face);
} else {
QSKIP("couln't find lohit.punjabi.1.1.ttf", SkipAll);
QSKIP("couln't find lohit.punjabi.1.1.ttf");
}
}
}
@ -883,7 +883,7 @@ void tst_QScriptEngine::oriya()
FT_Done_Face(face);
} else {
QSKIP("couln't find utkalm.ttf", SkipAll);
QSKIP("couln't find utkalm.ttf");
}
}
}
@ -952,7 +952,7 @@ void tst_QScriptEngine::tamil()
FT_Done_Face(face);
} else {
QSKIP("couln't find akruti1.ttf", SkipAll);
QSKIP("couln't find akruti1.ttf");
}
}
}
@ -997,7 +997,7 @@ void tst_QScriptEngine::telugu()
FT_Done_Face(face);
} else {
QSKIP("couln't find Pothana2000.ttf", SkipAll);
QSKIP("couln't find Pothana2000.ttf");
}
}
}
@ -1046,7 +1046,7 @@ void tst_QScriptEngine::kannada()
FT_Done_Face(face);
} else {
QSKIP("couln't find Sampige.ttf", SkipAll);
QSKIP("couln't find Sampige.ttf");
}
}
{
@ -1081,7 +1081,7 @@ void tst_QScriptEngine::kannada()
FT_Done_Face(face);
} else {
QSKIP("couln't find tunga.ttf", SkipAll);
QSKIP("couln't find tunga.ttf");
}
}
}
@ -1143,7 +1143,7 @@ void tst_QScriptEngine::malayalam()
FT_Done_Face(face);
} else {
QSKIP("couln't find AkrutiMal2Normal.ttf", SkipAll);
QSKIP("couln't find AkrutiMal2Normal.ttf");
}
}
@ -1174,7 +1174,7 @@ void tst_QScriptEngine::malayalam()
FT_Done_Face(face);
} else {
QSKIP("couln't find Rachana.ttf", SkipAll);
QSKIP("couln't find Rachana.ttf");
}
}
@ -1209,7 +1209,7 @@ void tst_QScriptEngine::sinhala()
FT_Done_Face(face);
} else {
QSKIP("couln't find FM-MalithiUW46.ttf", SkipAll);
QSKIP("couln't find FM-MalithiUW46.ttf");
}
}
}
@ -1251,7 +1251,7 @@ void tst_QScriptEngine::khmer()
FT_Done_Face(face);
} else {
QSKIP("couln't find KhmerOS.ttf", SkipAll);
QSKIP("couln't find KhmerOS.ttf");
}
}
}
@ -1284,7 +1284,7 @@ void tst_QScriptEngine::nko()
FT_Done_Face(face);
} else {
QSKIP("couln't find DejaVuSans.ttf", SkipAll);
QSKIP("couln't find DejaVuSans.ttf");
}
}
}
@ -1310,7 +1310,7 @@ void tst_QScriptEngine::linearB()
FT_Done_Face(face);
} else {
QSKIP("couln't find PENUTURE.TTF", SkipAll);
QSKIP("couln't find PENUTURE.TTF");
}
}
}

2
tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
View File

@ -261,7 +261,7 @@ void tst_QPropertyAnimation::statesAndSignals()
anim->setCurrentTime(101);
if (uncontrolled)
QSKIP("Uncontrolled animations don't handle looping", SkipSingle);
QSKIP("Uncontrolled animations don't handle looping");
QCOMPARE(currentLoopSpy.count(), 1);
QCOMPARE(anim->currentLoop(), 1);

6
tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
View File

@ -341,14 +341,14 @@ void tst_QTextCodec::codecForLocale()
"%A%a%B%b%Z",
localtime(&t));
if (r == 0)
QSKIP("strftime() failed", SkipAll);
QSKIP("strftime() failed");
originalLocaleEncodedTimeString.resize(r);
QString unicodeTimeString = codec->toUnicode(originalLocaleEncodedTimeString);
QByteArray localeEncodedTimeString = codec->fromUnicode(unicodeTimeString);
QCOMPARE(localeEncodedTimeString, originalLocaleEncodedTimeString);
#else
QSKIP("This test is not implemented on Windows", SkipAll);
QSKIP("This test is not implemented on Windows");
#endif
// find a codec that is not the codecForLocale()
@ -361,7 +361,7 @@ void tst_QTextCodec::codecForLocale()
}
}
if (!codec2) {
QSKIP("Could not find a codec that is not already the codecForLocale()", SkipAll);
QSKIP("Could not find a codec that is not already the codecForLocale()");
}
// set it, codecForLocale() should return it now

4
tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
View File

@ -69,7 +69,7 @@ private slots:
#ifdef QT_NO_CONCURRENT_FILTER
void tst_QtConcurrentFilter::initTestCase()
{
QSKIP("This test is skipped for gcc 3.x", SkipAll);
QSKIP("This test is skipped for gcc 3.x");
}
#else
@ -1512,7 +1512,7 @@ void tst_QtConcurrentFilter::noDetatch()
void tst_QtConcurrentFilter::stlContainers()
{
#if defined(_MSC_VER) && _MSC_VER >= 1600
QSKIP("Test does not compile with MSVC 2010 (see QTBUG-18996)", SkipAll);
QSKIP("Test does not compile with MSVC 2010 (see QTBUG-18996)");
#else
std::vector<int> vector;
vector.push_back(1);

2
tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
View File

@ -88,7 +88,7 @@ public slots:
#ifdef QT_NO_CONCURRENT_FILTER
void tst_QtConcurrentFilter::initTestCase()
{
QSKIP("This test is skipped for gcc 3.x", SkipAll);
QSKIP("This test is skipped for gcc 3.x");
}
#else

2
tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
View File

@ -93,7 +93,7 @@ void tst_QNumeric::qNan()
#if defined( __INTEL_COMPILER)
QCOMPARE((0 > nan), false);
QCOMPARE((0 < nan), false);
QSKIP("This fails due to a bug in the Intel Compiler", SkipAll);
QSKIP("This fails due to a bug in the Intel Compiler");
#else
if (0 > nan)
QFAIL("compiler thinks 0 > nan");

2
tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
View File

@ -967,7 +967,7 @@ void tst_QDataStream::stream_QBrush_data()
void tst_QDataStream::stream_QBrush()
{
if (QString(QTest::currentDataTag()).endsWith("6"))
QSKIP("Custom brushes don't seem to be supported with QDataStream", SkipSingle);
QSKIP("Custom brushes don't seem to be supported with QDataStream");
STREAM_IMPL(QBrush);
}

4
tests/auto/corelib/io/qdir/tst_qdir.cpp
View File

@ -786,7 +786,7 @@ void tst_QDir::canonicalPath()
else
srcPath = QDir(".");
if (srcPath.absolutePath() != srcPath.canonicalPath())
QSKIP("This test does not work if this directory path consists of symlinks.", SkipAll);
QSKIP("This test does not work if this directory path consists of symlinks.");
QString oldpwd = QDir::currentPath();
QDir::setCurrent(srcPath.absolutePath());
@ -1435,7 +1435,7 @@ void tst_QDir::longFileName()
QFile file(fileName);
if (!file.open(QFile::WriteOnly))
QSKIP("Cannot create long file names", SkipAll);
QSKIP("Cannot create long file names");
QFile file2(fileName);
QVERIFY(file2.open(QFile::ReadOnly));

2
tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp
View File

@ -438,7 +438,7 @@ void tst_LargeFile::streamPositioning()
#if defined(QT_LARGEFILE_SUPPORT) && defined(Q_CC_MSVC) && _MSC_VER < 1400
if (position >= (qint64)1 << 31)
QSKIP("MSVC 2003 doesn't have 64 bit versions of fseek/ftell.", SkipSingle);
QSKIP("MSVC 2003 doesn't have 64 bit versions of fseek/ftell.");
#endif
stream_ = QT_FOPEN("qt_largefile.tmp", "rb");

12
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -525,7 +525,7 @@ void tst_QFile::open()
#if defined(Q_OS_UNIX)
if (::getuid() == 0)
// root and Chuck Norris don't care for file permissions. Skip.
QSKIP("Running this test as root doesn't make sense", SkipAll);
QSKIP("Running this test as root doesn't make sense");
#endif
#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
@ -1469,7 +1469,7 @@ void tst_QFile::largeUncFileSupport()
{
// 2) stdlib file handling.
#if _MSC_VER <= 1310
QSKIP("platform SDK for MSVC 2003 does not support large files", SkipAll);
QSKIP("platform SDK for MSVC 2003 does not support large files");
#endif
QFile file;
FILE *fh = fopen(QFile::encodeName(largeFile).data(), "rb");
@ -1495,7 +1495,7 @@ void tst_QFile::largeUncFileSupport()
void tst_QFile::tailFile()
{
QSKIP("File change notifications are so far unsupported.", SkipAll);
QSKIP("File change notifications are so far unsupported.");
QFile file("tail.txt");
QVERIFY(file.open(QFile::WriteOnly | QFile::Append));
@ -1838,7 +1838,7 @@ void tst_QFile::largeFileSupport()
QFAIL("Could not open file");
}
} else {
QSKIP("Not enough space to run test", SkipSingle);
QSKIP("Not enough space to run test");
}
} else {
QFAIL("Could not determin disk space");
@ -2134,7 +2134,7 @@ void tst_QFile::fullDisk()
{
QFile file("/dev/full");
if (!file.exists())
QSKIP("/dev/full doesn't exist on this system", SkipAll);
QSKIP("/dev/full doesn't exist on this system");
QVERIFY(file.open(QIODevice::WriteOnly));
file.write("foobar", 6);
@ -2268,7 +2268,7 @@ void tst_QFile::virtualFile()
#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
fname = "/proc/curproc/map";
#else
QSKIP("This platform does not have 0-sized virtual files", SkipAll);
QSKIP("This platform does not have 0-sized virtual files");
#endif
// consistency check

14
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
View File

@ -622,7 +622,7 @@ void tst_QFileInfo::canonicalFilePath()
(PtrCreateSymbolicLink)QLibrary::resolve(QLatin1String("kernel32"), "CreateSymbolicLinkW");
if (!ptrCreateSymbolicLink) {
QSKIP("Symbolic links aren't supported by FS", SkipAll);
QSKIP("Symbolic links aren't supported by FS");
} else {
// CreateSymbolicLink can return TRUE & still fail to create the link,
// the error code in that case is ERROR_PRIVILEGE_NOT_HELD (1314)
@ -630,11 +630,11 @@ void tst_QFileInfo::canonicalFilePath()
BOOL ret = ptrCreateSymbolicLink((wchar_t*)QString("res").utf16(), (wchar_t*)QString("resources").utf16(), 1);
DWORD dwErr = GetLastError();
if (!ret)
QSKIP("Symbolic links aren't supported by FS", SkipAll);
QSKIP("Symbolic links aren't supported by FS");
QString currentPath = QDir::currentPath();
bool is_res_Current = QDir::setCurrent("res");
if (!is_res_Current && dwErr == 1314)
QSKIP("Not enough privilages to create Symbolic links", SkipAll);
QSKIP("Not enough privilages to create Symbolic links");
QCOMPARE(is_res_Current, true);
QCOMPARE(QFileInfo("file1").canonicalFilePath(), currentPath + "/resources/file1");
@ -1001,7 +1001,7 @@ void tst_QFileInfo::fileTimes()
QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
#ifdef Q_OS_UNIX
if (qIsLikelyToBeNfs(file.handle()))
QSKIP("This Test doesn't work on NFS", SkipAll);
QSKIP("This Test doesn't work on NFS");
#endif
QTextStream ts(&file);
ts << fileName << endl;
@ -1313,7 +1313,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data()
//we need at least one data set for the test not to fail when skipping _data function
QDir target("target");
QTest::newRow("dummy") << target.path() << false << "" << target.canonicalPath();
QSKIP("symbolic links not supported by operating system",SkipSingle);
QSKIP("symbolic links not supported by operating system");
}
{
//Directory symlinks
@ -1348,7 +1348,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data()
//we need at least one data set for the test not to assert fail when skipping _data function
QDir target("target");
QTest::newRow("dummy") << target.path() << false << "" << target.canonicalPath();
QSKIP("link not supported by FS or insufficient privilege", SkipSingle);
QSKIP("link not supported by FS or insufficient privilege");
}
QVERIFY(file.exists());
@ -1655,7 +1655,7 @@ void tst_QFileInfo::owner()
qt_ntfs_permission_lookup = 1;
#endif
if (userName.isEmpty())
QSKIP("Can't retrieve the user name", SkipAll);
QSKIP("Can't retrieve the user name");
QString fileName("ownertest.txt");
QVERIFY(!QFile::exists(fileName) || QFile::remove(fileName));
{

4
tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
View File

@ -329,7 +329,7 @@ void tst_QFileSystemWatcher::watchDirectory()
// recreate the file, we should not get any notification
if (!QDir().mkdir("testDir"))
QSKIP("Failed to recreate directory, skipping final test.", SkipSingle);
QSKIP("Failed to recreate directory, skipping final test.");
// qDebug() << "waiting max 5 seconds for notification for dir recreation to trigger";
timer.start(5000);
@ -467,7 +467,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
QVERIFY(dirChangedSpy.count() < 2);
if (backend == "dnotify")
QSKIP("dnotify is broken, skipping the rest of the test.", SkipSingle);
QSKIP("dnotify is broken, skipping the rest of the test.");
fileChangedSpy.clear();
dirChangedSpy.clear();

4
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -194,7 +194,7 @@ private:
#ifdef QT_NO_PROCESS
void tst_QProcess::initTestCase()
{
QSKIP("This test requires QProcess support", SkipAll);
QSKIP("This test requires QProcess support");
}
#else
@ -646,7 +646,7 @@ void tst_QProcess::exitStatus()
#ifdef Q_OS_WIN
if (exitStatus.contains(QProcess::CrashExit))
QSKIP("This test opens a crash dialog on Windows", SkipSingle);
QSKIP("This test opens a crash dialog on Windows");
#endif
QCOMPARE(exitStatus.count(), processList.count());

2
tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
View File

@ -297,7 +297,7 @@ void tst_QProcessEnvironment::putenv()
qputenv(envname, "Hello, World");
QByteArray valAfter = qgetenv(envname);
if (valAfter != "Hello, World")
QSKIP("Could not test: qputenv did not do its job", SkipAll);
QSKIP("Could not test: qputenv did not do its job");
QProcessEnvironment eAfter = QProcessEnvironment::systemEnvironment();

4
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -684,7 +684,7 @@ void tst_QSettings::testErrorHandling()
{
#if defined(Q_OS_UNIX)
if (::getuid() == 0)
QSKIP("Running this test as root doesn't work, since file perms do not bother him", SkipAll);
QSKIP("Running this test as root doesn't work, since file perms do not bother him");
#else
QFETCH(int, filePerms);
QFETCH(int, dirPerms);
@ -2632,7 +2632,7 @@ void tst_QSettings::fileName()
QSettings s21(QSettings::SystemScope, QLatin1String(" ") + QChar(0xbd) + QLatin1String("Foo//:/Bar,,, Baz!()#"), "Console");
QCOMPARE(s21.fileName(), QString("/Library/Preferences/com.foo-bar-baz.Console.plist"));
#else
QSKIP("Please write a fileName() test for the other platforms", SkipAll);
QSKIP("Please write a fileName() test for the other platforms");
#endif
}

3
tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
View File

@ -354,8 +354,7 @@ void tst_QEventLoop::throwInExec()
qPrintable(QString(
"Throwing exceptions in exec() won't work if %1 event dispatcher is used.\n"
"Try running with QT_NO_GLIB=1 in environment."
).arg(QString::fromLatin1(dispatcher))),
SkipAll
).arg(QString::fromLatin1(dispatcher)))
);
}
#endif

2
tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
View File

@ -190,7 +190,7 @@ void tst_QSystemLock::processes_data()
*/
void tst_QSystemLock::processes()
{
QSKIP("This test takes about 15 minutes and needs to be trimmed down before we can re-enable it", SkipAll);
QSKIP("This test takes about 15 minutes and needs to be trimmed down before we can re-enable it");
QFETCH(int, readOnly);
QFETCH(int, readWrite);

4
tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp
View File

@ -503,7 +503,7 @@ void tst_QSharedMemory::useTooMuchMemory()
#if !defined(Q_OS_HPUX) && !defined(Q_OS_WINCE)
void tst_QSharedMemory::attachTooMuch()
{
QSKIP("disabled", SkipAll);
QSKIP("disabled");
QSharedMemory government(rememberKey("government"));
QVERIFY(government.create(1024));
@ -690,7 +690,7 @@ void tst_QSharedMemory::simpleThreadedProducerConsumer()
rememberKey(QLatin1String("market"));
#if defined Q_OS_HPUX && defined __ia64
QSKIP("This test locks up on gravlaks.troll.no", SkipSingle);
QSKIP("This test locks up on gravlaks.troll.no");
#endif
Producer p;

10
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
View File

@ -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));

5
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -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;

4
tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
View File

@ -819,7 +819,7 @@ void tst_QSharedPointer::differentPointers()
if (*reinterpret_cast<quintptr *>(&aData) == *reinterpret_cast<quintptr *>(&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<DiffPtrDerivedData> ptr = QSharedPointer<DiffPtrDerivedData>(aData);
QSharedPointer<Data> baseptr = qSharedPointerCast<Data>(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;

6
tests/auto/corelib/tools/qstring/tst_qstring.cpp
View File

@ -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

2
tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
View File

@ -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<Foo> a;
const int N = 0x7fffffff / sizeof(Foo);

2
tests/auto/corelib/tools/qvector/tst_qvector.cpp
View File

@ -701,7 +701,7 @@ void tst_QVector::outOfMemory()
{
QVector<Foo> 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);

2
tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
View File

@ -257,7 +257,7 @@ void tst_QDBusLocalCalls::asyncReplySignal()
callMsg << "Hello World";
QDBusPendingCall ac = conn.asyncCall(callMsg);
if (ac.isFinished())
QSKIP("Test ignored: the local-loop async call is already finished", SkipAll);
QSKIP("Test ignored: the local-loop async call is already finished");
QDBusPendingCallWatcher watch(ac);
connect(&watch, SIGNAL(finished(QDBusPendingCallWatcher*)),

4
tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
View File

@ -1060,7 +1060,7 @@ public:
void tst_QDBusMarshall::receiveUnknownType()
{
#ifndef DBUS_TYPE_UNIX_FD
QSKIP("Your system's D-Bus library is too old for this test", SkipAll);
QSKIP("Your system's D-Bus library is too old for this test");
#else
QDBusConnection con = QDBusConnection::sessionBus();
QVERIFY(con.isConnected());
@ -1074,7 +1074,7 @@ void tst_QDBusMarshall::receiveUnknownType()
// check if this bus supports passing file descriptors
if (!dbus_connection_can_send_type(rawcon.data(), DBUS_TYPE_UNIX_FD))
QSKIP("Your session bus does not allow sending Unix file descriptors", SkipAll);
QSKIP("Your session bus does not allow sending Unix file descriptors");
// make sure this QDBusConnection won't handle Unix file descriptors
QDBusConnection::ConnectionCapabilities &capabRef = QDBusConnectionPrivate::d(con)->capabilities;

4
tests/auto/gui/image/qicon/tst_qicon.cpp
View File

@ -209,7 +209,7 @@ void tst_QIcon::actualSize2()
void tst_QIcon::svgActualSize()
{
if (!haveImageFormat("svg")) {
QSKIP("SVG support is not available", SkipAll);
QSKIP("SVG support is not available");
}
const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/");
@ -423,7 +423,7 @@ void tst_QIcon::detach()
void tst_QIcon::svg()
{
if (!haveImageFormat("svg")) {
QSKIP("SVG support is not available", SkipAll);
QSKIP("SVG support is not available");
}
QIcon icon1("heart.svg");

2
tests/auto/gui/image/qimage/tst_qimage.cpp
View File

@ -302,7 +302,7 @@ void tst_QImage::formatHandlersInput()
QCOMPARE(testFormat.toLatin1().toLower(), QImageReader::imageFormat(testFile));
} else {
QString msg = "Format not supported : ";
QSKIP(QString(msg + testFormat).toLatin1(), SkipSingle);
QSKIP(QString(msg + testFormat).toLatin1());
}
}

2
tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
View File

@ -187,7 +187,7 @@ static const QLatin1String prefix(SRCDIR "/images/");
// helper to skip an autotest when the given image format is not supported
#define SKIP_IF_UNSUPPORTED(format) do { \
if (!QByteArray(format).isEmpty() && !QImageReader::supportedImageFormats().contains(format)) \
QSKIP("\"" + QByteArray(format) + "\" images are not supported", SkipSingle); \
QSKIP("\"" + QByteArray(format) + "\" images are not supported"); \
} while (0)
// Testing get/set functions

18
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -277,7 +277,7 @@ void tst_QPixmap::fromImage()
const QPixmap pixmap = QPixmap::fromImage(image);
#ifdef Q_WS_X11
if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
QSKIP("Requires XRender support", SkipAll);
QSKIP("Requires XRender support");
#endif
const QImage result = pixmap.toImage();
image = image.convertToFormat(result.format());
@ -505,12 +505,12 @@ void tst_QPixmap::fill()
#if defined(Q_WS_X11)
if (!bitmap && pm.handle()->classId() == QPlatformPixmap::X11Class && !pm.x11PictureHandle())
QSKIP("Requires XRender support", SkipSingle);
QSKIP("Requires XRender support");
#endif
pm.fill(color);
if (syscolor && !bitmap && pm.depth() < 24) {
QSKIP("Test does not work on displays without true color", SkipSingle);
QSKIP("Test does not work on displays without true color");
}
QImage image = pm.toImage();
@ -535,7 +535,7 @@ void tst_QPixmap::fill_transparent()
QPixmap pixmap(10, 10);
#ifdef Q_WS_X11
if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
QSKIP("Requires XRender support", SkipAll);
QSKIP("Requires XRender support");
#endif
pixmap.fill(Qt::transparent);
QVERIFY(pixmap.hasAlphaChannel());
@ -775,7 +775,7 @@ void tst_QPixmap::grabWidget()
void tst_QPixmap::grabWindow()
{
#ifdef Q_WS_QPA
QSKIP("QTBUG-20863 grabWindow is broken on most qpa backends", SkipAll);
QSKIP("QTBUG-20863 grabWindow is broken on most qpa backends");
#endif
#ifdef Q_OS_WINCE
// We get out of memory, if the desktop itself is too big.
@ -839,7 +839,7 @@ void tst_QPixmap::convertFromImageNoDetach()
{
QPixmap randomPixmap(10, 10);
if (randomPixmap.handle()->classId() != QPlatformPixmap::RasterClass)
QSKIP("Test only valid for raster pixmaps", SkipAll);
QSKIP("Test only valid for raster pixmaps");
//first get the screen format
QImage::Format screenFormat = randomPixmap.toImage().format();
@ -1013,7 +1013,7 @@ void tst_QPixmap::toWinHICON_data()
void tst_QPixmap::toWinHICON()
{
#ifdef Q_OS_WINCE
QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll);
QSKIP("Test shall be enabled for Windows CE shortly.");
#endif
QFETCH(int, width);
@ -1057,7 +1057,7 @@ void tst_QPixmap::fromWinHICON_data()
void tst_QPixmap::fromWinHICON()
{
#ifdef Q_OS_WINCE
QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll);
QSKIP("Test shall be enabled for Windows CE shortly.");
#else
QFETCH(int, width);
@ -1084,7 +1084,7 @@ void tst_QPixmap::fromWinHICON()
void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
{
#ifdef Q_WS_QPA
QSKIP("QTBUG-20864 can't determine if threaded pixmaps are available for qpa", SkipAll);
QSKIP("QTBUG-20864 can't determine if threaded pixmaps are available for qpa");
#endif
#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
class Thread : public QThread

10
tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
View File

@ -107,7 +107,7 @@ void tst_QClipboard::modes()
QClipboard * const clipboard = QApplication::clipboard();
if (!nativeClipboardWorking())
QSKIP("Native clipboard not working in this setup", SkipAll);
QSKIP("Native clipboard not working in this setup");
const QString defaultMode = "default mode text;";
clipboard->setText(defaultMode);
@ -137,7 +137,7 @@ void tst_QClipboard::testSignals()
qRegisterMetaType<QClipboard::Mode>("QClipboard::Mode");
if (!nativeClipboardWorking())
QSKIP("Native clipboard not working in this setup", SkipAll);
QSKIP("Native clipboard not working in this setup");
QClipboard * const clipboard = QApplication::clipboard();
@ -195,7 +195,7 @@ void tst_QClipboard::testSignals()
void tst_QClipboard::copy_exit_paste()
{
if (!nativeClipboardWorking())
QSKIP("Native clipboard not working in this setup", SkipAll);
QSKIP("Native clipboard not working in this setup");
const QStringList stringArgument = QStringList() << "Test string.";
QCOMPARE(QProcess::execute("copier/copier", stringArgument), 0);
#ifdef Q_WS_MAC
@ -209,7 +209,7 @@ void tst_QClipboard::copy_exit_paste()
void tst_QClipboard::setMimeData()
{
if (!nativeClipboardWorking())
QSKIP("Native clipboard not working in this setup", SkipAll);
QSKIP("Native clipboard not working in this setup");
QMimeData *mimeData = new QMimeData;
const QString TestName(QLatin1String("tst_QClipboard::setMimeData() mimeData"));
mimeData->setObjectName(TestName);
@ -299,7 +299,7 @@ void tst_QClipboard::clearBeforeSetText()
QApplication::processEvents();
if (!nativeClipboardWorking())
QSKIP("Native clipboard not working in this setup", SkipAll);
QSKIP("Native clipboard not working in this setup");
const QString text = "tst_QClipboard::clearBeforeSetText()";

30
tests/auto/gui/painting/qpainter/tst_qpainter.cpp
View File

@ -379,7 +379,7 @@ void tst_QPainter::cleanup()
void tst_QPainter::qt_format_text_clip()
{
QVERIFY(1);
QSKIP( "Needs fixing...", SkipAll);
QSKIP("Needs fixing...");
QWidget *w = new QWidget( 0 );
@ -513,7 +513,7 @@ void tst_QPainter::qt_format_text_clip()
void tst_QPainter::qt_format_text_boundingRect()
{
QVERIFY(1);
QSKIP( "Needs fixing...", SkipAll);
QSKIP("Needs fixing...");
{
const char * strings[] = {
@ -568,11 +568,8 @@ void tst_QPainter::qt_format_text_boundingRect()
#if !defined(QT_NO_PRINTER) && !defined(Q_OS_WINCE)
{
QPrinter printer(QPrinter::HighResolution);
if (printer.printerName().isEmpty()) {
QSKIP( "No printers installed, skipping bounding rect test",
SkipSingle );
break;
}
if (printer.printerName().isEmpty())
QSKIP("No printers installed, skipping bounding rect test");
printer.setOutputFileName("tmp.prn");
QPainter p(&printer);
@ -694,10 +691,8 @@ static const char* const maskResult_data[] = {
#ifndef Q_WS_MAC
void tst_QPainter::drawPixmap_comp_data()
{
if (qApp->desktop()->depth() < 24) {
QSKIP("Test only works on 32 bit displays", SkipAll);
return;
}
if (qApp->desktop()->depth() < 24)
QSKIP("Test only works on 32 bit displays");
QTest::addColumn<uint>("dest");
QTest::addColumn<uint>("source");
@ -752,7 +747,7 @@ void tst_QPainter::drawPixmap_comp()
#if defined(Q_WS_X11)
if (!destPm.x11PictureHandle())
QSKIP("Requires XRender support", SkipAll);
QSKIP("Requires XRender support");
#endif
QPainter p(&destPm);
@ -1621,7 +1616,7 @@ void tst_QPainter::drawClippedEllipse()
{
QFETCH(QRect, rect);
if (sizeof(qreal) != sizeof(double))
QSKIP("Test only works for qreal==double", SkipAll);
QSKIP("Test only works for qreal==double");
QImage image(rect.width() + 1, rect.height() + 1,
QImage::Format_ARGB32_Premultiplied);
QRect expected = QRect(rect.x(), rect.y(), rect.width()+1, rect.height()+1)
@ -1657,7 +1652,7 @@ void tst_QPainter::drawRoundRect()
QTest::currentDataTag() == QByteArray("rect(13, 50, 17, 91) with pen") ||
QTest::currentDataTag() == QByteArray("rect(17, 6, 24, 3) with pen") ||
QTest::currentDataTag() == QByteArray("rect(24, 12, 38, 14) with pen"))
QSKIP("The Mac paint engine is off-by-one on certain rect sizes", SkipSingle);
QSKIP("The Mac paint engine is off-by-one on certain rect sizes");
#endif
QPixmap pixmap(rect.x() + rect.width() + 10,
rect.y() + rect.height() + 10);
@ -3127,7 +3122,7 @@ void tst_QPainter::x() \
#define FPE_TEST(x) \
void tst_QPainter::x() \
{ \
QSKIP("Floating point exception checking (fenv.h) not available", SkipAll); \
QSKIP("Floating point exception checking (fenv.h) not available"); \
}
#endif
@ -3434,8 +3429,7 @@ bool verifyOutlineFillConsistency(const QImage &img, QRgb outside, QRgb inside,
void tst_QPainter::outlineFillConsistency()
{
QSKIP("currently broken...", SkipAll);
return;
QSKIP("currently broken...");
QImage dst(256, 256, QImage::Format_ARGB32_Premultiplied);
@ -4674,7 +4668,7 @@ void TextDrawerThread::run()
void tst_QPainter::drawTextOutsideGuiThread()
{
if (!QFontDatabase::supportsThreadedFontRendering())
QSKIP("No threaded font rendering", SkipAll);
QSKIP("No threaded font rendering");
QImage referenceRendering(100, 100, QImage::Format_ARGB32_Premultiplied);
referenceRendering.fill(0);

6
tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
View File

@ -421,7 +421,7 @@ void tst_QPathClipper::testComparePaths()
void tst_QPathClipper::clip()
{
if (sizeof(double) != sizeof(qreal)) {
QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll);
QSKIP("This test only works for qreal=double, otherwise ends in rounding errors");
}
QFETCH( QPainterPath, subject );
QFETCH( QPainterPath, clip );
@ -542,7 +542,7 @@ void tst_QPathClipper::clipTest(int subjectIndex, int clipIndex, QPathClipper::O
void tst_QPathClipper::clip2()
{
if (sizeof(double) != sizeof(qreal))
QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll);
QSKIP("This test only works for qreal=double, otherwise ends in rounding errors");
int operation = 0;
@ -1301,7 +1301,7 @@ void tst_QPathClipper::task251909()
void tst_QPathClipper::qtbug3778()
{
if (sizeof(double) != sizeof(qreal)) {
QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll);
QSKIP("This test only works for qreal=double, otherwise ends in rounding errors");
}
QPainterPath path1;
path1.moveTo(200, 3.22409e-5);

6
tests/auto/gui/painting/qprinter/tst_qprinter.cpp
View File

@ -111,7 +111,7 @@ private slots:
#ifdef QT_NO_PRINTER
void tst_QPrinter::initTestCase()
{
QSKIP("This test requires printing support", SkipAll);
QSKIP("This test requires printing support");
}
#else
@ -469,7 +469,7 @@ void tst_QPrinter::testMulitpleSets()
printer.setPageSize(printerPageSize);
if (printer.pageSize() != printerPageSize) {
QSKIP("Current page size is not supported on this printer", SkipSingle);
QSKIP("Current page size is not supported on this printer");
return;
}
@ -506,7 +506,7 @@ void tst_QPrinter::changingOutputFormat()
void tst_QPrinter::outputFormatFromSuffix()
{
if (QPrinterInfo::availablePrinters().size() == 0)
QSKIP("No printers available.", SkipAll);
QSKIP("No printers available.");
QPrinter p;
QVERIFY(p.outputFormat() == QPrinter::NativeFormat);
p.setOutputFileName("test.pdf");

8
tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
View File

@ -86,7 +86,7 @@ private:
#ifdef QT_NO_PRINTER
void tst_QPrinterInfo::initTestCase()
{
QSKIP("This test requires printing support", SkipAll);
QSKIP("This test requires printing support");
}
#else
@ -215,7 +215,7 @@ void tst_QPrinterInfo::testForDefaultPrinter()
if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") {
QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail");
} else {
QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows", SkipAll);
QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows");
}
QString defSysPrinter;
if (QHostInfo::localHostName() == "fantomet") {
@ -252,7 +252,7 @@ void tst_QPrinterInfo::testForPrinters()
if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") {
QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail");
} else {
QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows", SkipAll);
QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows");
}
QStringList sysPrinters;
if (QHostInfo::localHostName() == "fantomet") {
@ -296,7 +296,7 @@ void tst_QPrinterInfo::testForPrinters()
void tst_QPrinterInfo::testForPaperSizes()
{
QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux", SkipAll);
QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux");
// This test is based on common printers found at the Oslo
// office. It is likely to be skipped or fail for other locations.
QStringList hardPrinters;

2
tests/auto/gui/painting/qtransform/tst_qtransform.cpp
View File

@ -749,7 +749,7 @@ void tst_QTransform::inverted_data()
void tst_QTransform::inverted()
{
if (sizeof(qreal) != sizeof(double))
QSKIP("precision error if qreal is not double", SkipAll);
QSKIP("precision error if qreal is not double");
QFETCH(QTransform, matrix);

3
tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
View File

@ -316,8 +316,7 @@ void tst_QWMatrix::operator_star_qwmatrix()
QVERIFY( product12==result1x2 );
QVERIFY( product21==result2x1 );
#else
QSKIP( "Not tested with Qt versions since the operator is broken..",
SkipAll );
QSKIP( "Not tested with Qt versions since the operator is broken.." );
#endif
}

4
tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
View File

@ -1551,7 +1551,7 @@ void tst_QCssParser::gradient()
void tst_QCssParser::extractFontFamily_data()
{
if (QFontInfo(QFont("Times New Roman")).family() != "Times New Roman")
QSKIP("'Times New Roman' font not found ", SkipAll);
QSKIP("'Times New Roman' font not found");
QTest::addColumn<QString>("css");
QTest::addColumn<QString>("expectedFamily");
@ -1597,7 +1597,7 @@ void tst_QCssParser::extractFontFamily()
// Note, we have to QSKIP rather than QEXPECT_FAIL because font lookup is broken
// such that it may work or not work depending on the order in which fonts were
// loaded from disk
QSKIP("QTBUG-20986 may fail on qpa", SkipSingle);
QSKIP("QTBUG-20986 may fail on qpa");
#endif
QTEST(info.family(), "expectedFamily");

10
tests/auto/gui/text/qfont/tst_qfont.cpp
View File

@ -167,8 +167,7 @@ void tst_QFont::exactMatch()
QVERIFY(QFont("monospace").exactMatch());
#endif
QSKIP("This test is bogus on Unix with support for font aliases in fontconfig", SkipAll);
return;
QSKIP("This test is bogus on Unix with support for font aliases in fontconfig");
QFontDatabase fdb;
@ -538,9 +537,8 @@ void tst_QFont::setFontRaw()
if (str.toLower() == "fixed")
found = true;
}
if (!found) {
QSKIP("Fixed font not available.", SkipSingle);
}
if (!found)
QSKIP("Fixed font not available.");
QCOMPARE(QFontInfo(f).family().left(5).toLower(), QString("fixed"));
}
#endif
@ -654,7 +652,7 @@ void tst_QFont::defaultFamily()
QFontDatabase db;
if (!db.hasFamily(defaultFamily))
QSKIP("Font family is not available on the system", SkipSingle);
QSKIP("Font family is not available on the system");
QFont f;
f.setStyleHint(styleHint);

6
tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
View File

@ -157,7 +157,7 @@ void tst_QFontDatabase::fixedPitch()
QFontDatabase fdb;
if (!fdb.families().contains(font))
QSKIP( "Font not installed", SkipSingle);
QSKIP( "Font not installed");
QCOMPARE(fdb.isFixedPitch(font), fixedPitch);
@ -181,7 +181,7 @@ void tst_QFontDatabase::trickyFonts()
QFontDatabase fdb;
if (!fdb.families().contains(font))
QSKIP( "Font not installed", SkipSingle);
QSKIP( "Font not installed");
QFont qfont(font);
QFontInfo fi(qfont);
@ -254,7 +254,7 @@ void tst_QFontDatabase::addAppFont()
// addApplicationFont is supported on Mac, don't skip the test if it breaks.
#ifndef Q_WS_MAC
if (id == -1)
QSKIP("Skip the test since app fonts are not supported on this system", SkipSingle);
QSKIP("Skip the test since app fonts are not supported on this system");
#endif
const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id);

5
tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
View File

@ -104,9 +104,8 @@ void tst_QGlyphRun::initTestCase()
void tst_QGlyphRun::init()
{
if (!m_testFont_ok) {
QSKIP("Test font is not working correctly", SkipAll);
}
if (!m_testFont_ok)
QSKIP("Test font is not working correctly");
}
void tst_QGlyphRun::cleanupTestCase()

4
tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
View File

@ -1472,7 +1472,7 @@ void tst_QTextLayout::textWidthWithLineSeparator()
void tst_QTextLayout::cursorInLigatureWithMultipleLines()
{
#if !defined(Q_WS_MAC)
QSKIP("This test can not be run on Mac", SkipAll);
QSKIP("This test can not be run on Mac");
#endif
QTextLayout layout("first line finish", QFont("Times", 20));
layout.beginLayout();
@ -1488,7 +1488,7 @@ void tst_QTextLayout::cursorInLigatureWithMultipleLines()
void tst_QTextLayout::xToCursorForLigatures()
{
#if !defined(Q_WS_MAC)
QSKIP("This test can not be run on Mac", SkipAll);
QSKIP("This test can not be run on Mac");
#endif
QTextLayout layout("fi", QFont("Times", 20));
layout.beginLayout();

153
tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
View File

@ -207,9 +207,8 @@ static bool shaping( const QFont &f, const ShapeTable *s)
#ifdef Q_WS_X11
void tst_QTextScriptEngine::devanagari()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Raghindi")) {
@ -259,9 +258,8 @@ void tst_QTextScriptEngine::devanagari()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Raghindi", SkipAll);
}
} else
QSKIP("couldn't find Raghindi");
}
{
@ -311,9 +309,8 @@ void tst_QTextScriptEngine::devanagari()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find mangal", SkipAll);
}
} else
QSKIP("couldn't find mangal");
}
}
#endif
@ -321,9 +318,8 @@ void tst_QTextScriptEngine::devanagari()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::bengali()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Bengali).contains("Akaash")) {
@ -431,9 +427,8 @@ void tst_QTextScriptEngine::bengali()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Akaash", SkipAll);
}
} else
QSKIP("couldn't find Akaash");
}
{
if (QFontDatabase().families(QFontDatabase::Bengali).contains("Mukti Narrow")) {
@ -536,9 +531,8 @@ void tst_QTextScriptEngine::bengali()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Mukti", SkipAll);
}
} else
QSKIP("couldn't find Mukti");
}
{
if (QFontDatabase().families(QFontDatabase::Bengali).contains("Likhan")) {
@ -564,9 +558,8 @@ void tst_QTextScriptEngine::bengali()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Likhan", SkipAll);
}
} else
QSKIP("couldn't find Likhan");
}
}
#endif
@ -574,9 +567,8 @@ void tst_QTextScriptEngine::bengali()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::gurmukhi()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) {
@ -593,9 +585,8 @@ void tst_QTextScriptEngine::gurmukhi()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Lohit Punjabi", SkipAll);
}
} else
QSKIP("couldn't find Lohit Punjabi");
}
}
#endif
@ -603,9 +594,8 @@ void tst_QTextScriptEngine::gurmukhi()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::oriya()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Oriya).contains("utkal")) {
@ -634,19 +624,17 @@ void tst_QTextScriptEngine::oriya()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find utkal", SkipAll);
}
}
} else
QSKIP("couldn't find utkal");
}
}
#endif
#ifdef Q_WS_X11
void tst_QTextScriptEngine::tamil()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Tamil).contains("AkrutiTml1")) {
@ -712,9 +700,8 @@ void tst_QTextScriptEngine::tamil()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find AkrutiTml1", SkipAll);
}
} else
QSKIP("couldn't find AkrutiTml1");
}
}
#endif
@ -722,9 +709,8 @@ void tst_QTextScriptEngine::tamil()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::telugu()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Telugu).contains("Pothana2000")) {
@ -761,9 +747,8 @@ void tst_QTextScriptEngine::telugu()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Pothana2000", SkipAll);
}
} else
QSKIP("couldn't find Pothana2000");
}
}
#endif
@ -805,9 +790,8 @@ void tst_QTextScriptEngine::kannada()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Sampige", SkipAll);
}
} else
QSKIP("couldn't find Sampige");
}
{
if (QFontDatabase().families(QFontDatabase::Kannada).contains("Tunga")) {
@ -836,9 +820,8 @@ void tst_QTextScriptEngine::kannada()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Tunga", SkipAll);
}
} else
QSKIP("couldn't find Tunga");
}
}
#endif
@ -846,9 +829,8 @@ void tst_QTextScriptEngine::kannada()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::malayalam()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Malayalam).contains("AkrutiMal2")) {
@ -897,9 +879,8 @@ void tst_QTextScriptEngine::malayalam()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find AkrutiMal2", SkipAll);
}
} else
QSKIP("couldn't find AkrutiMal2");
}
{
if (QFontDatabase().families(QFontDatabase::Malayalam).contains("Rachana")) {
@ -925,9 +906,8 @@ void tst_QTextScriptEngine::malayalam()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Rachana", SkipAll);
}
} else
QSKIP("couldn't find Rachana");
}
}
#endif
@ -935,9 +915,8 @@ void tst_QTextScriptEngine::malayalam()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::sinhala()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Sinhala).contains("Malithi Web")) {
@ -964,9 +943,8 @@ void tst_QTextScriptEngine::sinhala()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Malithi Web", SkipAll);
}
} else
QSKIP("couldn't find Malithi Web");
}
}
#endif
@ -974,9 +952,8 @@ void tst_QTextScriptEngine::sinhala()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::khmer()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Khmer).contains("Khmer OS")) {
@ -1009,9 +986,8 @@ void tst_QTextScriptEngine::khmer()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Khmer OS", SkipAll);
}
} else
QSKIP("couldn't find Khmer OS");
}
}
#endif
@ -1019,9 +995,8 @@ void tst_QTextScriptEngine::khmer()
#ifdef Q_WS_X11
void tst_QTextScriptEngine::linearB()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Any).contains("Penuturesu")) {
@ -1038,9 +1013,8 @@ void tst_QTextScriptEngine::linearB()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find Penuturesu", SkipAll);
}
} else
QSKIP("couldn't find Penuturesu");
}
}
#endif
@ -1095,9 +1069,8 @@ static bool decomposedShaping( const QFont &f, const QChar &ch)
#ifdef Q_WS_X11
void tst_QTextScriptEngine::greek()
{
if (!haveTestFonts) {
QSKIP("Test fonts are not available", SkipAll);
}
if (!haveTestFonts)
QSKIP("Test fonts are not available");
{
if (QFontDatabase().families(QFontDatabase::Any).contains("DejaVu Sans")) {
@ -1113,9 +1086,8 @@ void tst_QTextScriptEngine::greek()
continue;
QVERIFY( decomposedShaping(f, QChar(uc)) );
}
} else {
QSKIP("couldn't find DejaVu Sans", SkipAll);
}
} else
QSKIP("couldn't find DejaVu Sans");
}
{
@ -1149,9 +1121,8 @@ void tst_QTextScriptEngine::greek()
QVERIFY( shaping(f, s) );
++s;
}
} else {
QSKIP("couldn't find SBL_grk", SkipAll);
}
} else
QSKIP("couldn't find SBL_grk");
}
}
#endif
@ -1196,10 +1167,8 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675()
#elif defined(Q_WS_X11)
QFontDatabase db;
if (!db.families().contains("DejaVu Sans Mono")) {
QSKIP("Required font (DejaVu Sans Mono) doesn't exist, skip test.", SkipAll);
return;
}
if (!db.families().contains("DejaVu Sans Mono"))
QSKIP("Required font (DejaVu Sans Mono) doesn't exist, skip test.");
QString s;
s.append(QChar(0x0062));

2
tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp
View File

@ -65,7 +65,7 @@ private slots:
#ifdef QT_NO_EXCEPTIONS
void tst_ExceptionSafety::initTestCase()
{
QSKIP("This test requires exception support", SkipAll);
QSKIP("This test requires exception support");
}
#else

8
tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
View File

@ -87,7 +87,7 @@ private:
#ifdef QT_NO_EXCEPTIONS
void tst_ExceptionSafety_Objects::initTestCase()
{
QSKIP("This test requires exception support", SkipAll);
QSKIP("This test requires exception support");
}
#else
@ -353,7 +353,7 @@ void tst_ExceptionSafety_Objects::objects()
|| tag == QLatin1String("QSettings")
|| tag == QLatin1String("QThread")
|| tag == QLatin1String("QThreadPool"))
QSKIP("This type of object is not currently strongly exception safe", SkipSingle);
QSKIP("This type of object is not currently strongly exception safe");
QFETCH(AbstractTester *, objectCreator);
@ -488,7 +488,7 @@ void tst_ExceptionSafety_Objects::widgets()
|| tag == QLatin1String("QTreeView")
|| tag == QLatin1String("QTreeWidget")
|| tag == QLatin1String("QWorkspace"))
QSKIP("This type of widget is not currently strongly exception safe", SkipSingle);
QSKIP("This type of widget is not currently strongly exception safe");
QFETCH(AbstractTester *, widgetCreator);
@ -766,7 +766,7 @@ void tst_ExceptionSafety_Objects::vector()
if (QLatin1String(QTest::currentDataTag()) == QLatin1String("insert static")
|| QLatin1String(QTest::currentDataTag()) == QLatin1String("insert moveable"))
QSKIP("QVector::insert is currently not strongly exception safe", SkipSingle);
QSKIP("QVector::insert is currently not strongly exception safe");
doOOMTest(testFunction, 0);
}

22
tests/auto/integrationtests/lancelot/tst_lancelot.cpp
View File

@ -112,7 +112,7 @@ void tst_Lancelot::initTestCase()
// caused by environment or server instability
if (!proto.connect(QLatin1String("tst_Lancelot"), &dryRunMode, clientInfo))
QSKIP(qPrintable(proto.errorMessage()), SkipAll);
QSKIP(qPrintable(proto.errorMessage()));
#if defined(USE_RUNTIME_DIR)
scriptsDir = QCoreApplication::applicationDirPath() + "/scripts/";
@ -123,7 +123,7 @@ void tst_Lancelot::initTestCase()
QStringList files = qpsDir.entryList(QStringList() << QLatin1String("*.qps"), QDir::Files | QDir::Readable);
if (files.isEmpty()) {
QWARN("No qps script files found in " + qpsDir.path().toLatin1());
QSKIP("Aborted due to errors.", SkipAll);
QSKIP("Aborted due to errors.");
}
baseList.resize(files.count());
@ -144,7 +144,7 @@ void tst_Lancelot::testRasterARGB32PM_data()
{
QStringList localBlacklist;
if (!setupTestSuite(localBlacklist))
QSKIP("Communication with baseline image server failed.", SkipAll);
QSKIP("Communication with baseline image server failed.");
}
@ -158,7 +158,7 @@ void tst_Lancelot::testRasterRGB32_data()
{
QStringList localBlacklist;
if (!setupTestSuite(localBlacklist))
QSKIP("Communication with baseline image server failed.", SkipAll);
QSKIP("Communication with baseline image server failed.");
}
@ -172,7 +172,7 @@ void tst_Lancelot::testRasterRGB16_data()
{
QStringList localBlacklist;
if (!setupTestSuite(localBlacklist))
QSKIP("Communication with baseline image server failed.", SkipAll);
QSKIP("Communication with baseline image server failed.");
}
@ -187,7 +187,7 @@ void tst_Lancelot::testOpenGL_data()
{
QStringList localBlacklist = QStringList() << QLatin1String("rasterops.qps");
if (!setupTestSuite(localBlacklist))
QSKIP("Communication with baseline image server failed.", SkipAll);
QSKIP("Communication with baseline image server failed.");
}
@ -207,7 +207,7 @@ void tst_Lancelot::testOpenGL()
if (ok)
runTestSuite(OpenGL, QImage::Format_RGB32);
else
QSKIP("System under test does not meet preconditions for GL testing. Skipping.", SkipAll);
QSKIP("System under test does not meet preconditions for GL testing. Skipping.");
}
#endif
@ -235,17 +235,17 @@ void tst_Lancelot::runTestSuite(GraphicsEngine engine, QImage::Format format)
QFETCH(ImageItem, baseline);
if (baseline.status == ImageItem::IgnoreItem)
QSKIP("Blacklisted by baseline server.", SkipSingle);
QSKIP("Blacklisted by baseline server.");
ImageItem rendered = render(baseline, engine, format);
static int consecutiveErrs = 0;
if (rendered.image.isNull()) { // Assume an error in the test environment, not Qt
QWARN("Error: Failed to render image.");
if (++consecutiveErrs < 3) {
QSKIP("Aborted due to errors.", SkipSingle);
QSKIP("Aborted due to errors.");
} else {
consecutiveErrs = 0;
QSKIP("Too many errors, skipping rest of testfunction.", SkipAll);
QSKIP("Too many errors, skipping rest of testfunction.");
}
} else {
consecutiveErrs = 0;
@ -255,7 +255,7 @@ void tst_Lancelot::runTestSuite(GraphicsEngine engine, QImage::Format format)
if (baseline.status == ImageItem::BaselineNotFound) {
if (!proto.submitNewBaseline(rendered, 0))
QWARN("Failed to submit new baseline: " + proto.errorMessage().toLatin1());
QSKIP("Baseline not found; new baseline created.", SkipSingle);
QSKIP("Baseline not found; new baseline created.");
}
if (!baseline.imageChecksums.contains(rendered.imageChecksums.at(0))) {

4
tests/auto/integrationtests/languagechange/tst_languagechange.cpp
View File

@ -217,14 +217,14 @@ void tst_languageChange::retranslatability()
case ColorDialog:
#ifdef Q_WS_MAC
QSKIP("The native color dialog is used on Mac OS", SkipSingle);
QSKIP("The native color dialog is used on Mac OS");
#else
(void)QColorDialog::getColor();
#endif
break;
case FileDialog: {
#ifdef Q_WS_MAC
QSKIP("The native file dialog is used on Mac OS", SkipSingle);
QSKIP("The native file dialog is used on Mac OS");
#endif
QFileDialog dlg;
dlg.setOption(QFileDialog::DontUseNativeDialog);

8
tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp
View File

@ -990,16 +990,16 @@ void tst_NetworkSelfTest::smbServer()
QProcess smbclient;
smbclient.start(progname, QIODevice::ReadOnly);
if (!smbclient.waitForStarted(2000))
QSKIP("Could not find smbclient (from Samba), cannot continue testing", SkipAll);
QSKIP("Could not find smbclient (from Samba), cannot continue testing");
if (!smbclient.waitForFinished(2000) || smbclient.exitStatus() != QProcess::NormalExit)
QSKIP("smbclient isn't working, cannot continue testing", SkipAll);
QSKIP("smbclient isn't working, cannot continue testing");
smbclient.close();
// try listing the server
smbclient.start(progname, QStringList() << "-g" << "-N" << "-L" << QtNetworkSettings::winServerName(), QIODevice::ReadOnly);
QVERIFY(smbclient.waitForFinished(5000));
if (smbclient.exitStatus() != QProcess::NormalExit)
QSKIP("smbclient crashed", SkipAll);
QSKIP("smbclient crashed");
QVERIFY2(smbclient.exitCode() == 0, "Test server not found");
QByteArray output = smbclient.readAll();
@ -1016,7 +1016,7 @@ void tst_NetworkSelfTest::smbServer()
<< QString("\\\\%1\\testshare").arg(QtNetworkSettings::winServerName()), QIODevice::ReadOnly);
QVERIFY(smbclient.waitForFinished(5000));
if (smbclient.exitStatus() != QProcess::NormalExit)
QSKIP("smbclient crashed", SkipAll);
QSKIP("smbclient crashed");
QVERIFY2(smbclient.exitCode() == 0, "File //qt-test-server/testshare/test.pri not found");
output = smbclient.readAll();

10
tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp
View File

@ -1417,9 +1417,8 @@ void tst_QAccessibility::menuTest()
QCOMPARE(iAction->role(), QAccessible::MenuItem);
#ifndef Q_WS_MAC
#ifdef Q_OS_WINCE
if (!IsValidCEPlatform()) {
QSKIP("Tests do not work on Mobile platforms due to native menus", SkipAll);
}
if (!IsValidCEPlatform())
QSKIP("Tests do not work on Mobile platforms due to native menus");
#endif
QCOMPARE(mw.mapFromGlobal(interface->rect().topLeft()), mw.menuBar()->geometry().topLeft());
QCOMPARE(interface->rect().size(), mw.menuBar()->size());
@ -3224,9 +3223,8 @@ void tst_QAccessibility::dockWidgetTest()
void tst_QAccessibility::comboBoxTest()
{
#if defined(Q_OS_WINCE)
if (!IsValidCEPlatform()) {
QSKIP("Test skipped on Windows Mobile test hardware", SkipAll);
}
if (!IsValidCEPlatform())
QSKIP("Test skipped on Windows Mobile test hardware");
#endif
{ // not editable combobox
QComboBox combo;

4
tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp
View File

@ -155,7 +155,7 @@ void takeScreenShot(const QString filename)
void tst_WindowsMobile::testMainWindowAndMenuBar()
{
if (qt_wince_is_smartphone())
QSKIP("This test is only for Windows Mobile", SkipAll);
QSKIP("This test is only for Windows Mobile");
QProcess process;
process.start("testQMenuBar.exe");
@ -171,7 +171,7 @@ void tst_WindowsMobile::testMainWindowAndMenuBar()
void tst_WindowsMobile::testSimpleWidget()
{
if (qt_wince_is_smartphone())
QSKIP("This test is only for Windows Mobile", SkipAll);
QSKIP("This test is only for Windows Mobile");
QMenuBar menubar;
menubar.show();

2
tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
View File

@ -341,7 +341,7 @@ void tst_QAbstractNetworkCache::check()
void tst_QAbstractNetworkCache::checkSynchronous()
{
QSKIP("not working yet, see QTBUG-15221", SkipAll);
QSKIP("not working yet, see QTBUG-15221");
QFETCH(QNetworkRequest::CacheLoadControl, cacheLoadControl);
QFETCH(QString, url);

9
tests/auto/network/access/qftp/tst_qftp.cpp
View File

@ -350,7 +350,7 @@ void tst_QFtp::connectToUnresponsiveHost()
{
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
QSKIP( "This test takes too long if we test with proxies too", SkipSingle );
QSKIP( "This test takes too long if we test with proxies too");
QString host = "192.0.2.42"; // IP out of TEST-NET, should be unreachable
uint port = 21;
@ -759,9 +759,8 @@ void tst_QFtp::put()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("With socks5 the put() test takes too long time on Windows.", SkipAll);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("With socks5 the put() test takes too long time on Windows.");
}
#endif
@ -2075,7 +2074,7 @@ void tst_QFtp::doneSignal()
void tst_QFtp::queueMoreCommandsInDoneSlot()
{
QSKIP("Task 127050 && 113966", SkipSingle);
QSKIP("Task 127050 && 113966");
QFtp ftp;
QSignalSpy doneSpy(&ftp, SIGNAL(done(bool)));

2
tests/auto/network/access/qhttp/tst_qhttp.cpp
View File

@ -1337,7 +1337,7 @@ void tst_QHttp::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticato
void tst_QHttp::postAuthNtlm()
{
QSKIP("NTLM not working", SkipAll);
QSKIP("NTLM not working");
QHostInfo info = QHostInfo::fromName(QHostInfo::localHostName());
QByteArray postData("Hello World");

8
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -2254,7 +2254,7 @@ void tst_QNetworkReply::putToHttpMultipart_data()
void tst_QNetworkReply::putToHttpMultipart()
{
QSKIP("test server script cannot handle PUT data yet", SkipAll);
QSKIP("test server script cannot handle PUT data yet");
QFETCH(QUrl, url);
static QSet<QByteArray> boundaries;
@ -3819,7 +3819,7 @@ void tst_QNetworkReply::ioPutToFileFromProcess()
#ifdef Q_OS_WIN
if (qstrcmp(QTest::currentDataTag(), "small") == 0)
QSKIP("When passing a CR-LF-LF sequence through Windows stdio, it gets converted, "
"so this test fails. Disabled on Windows", SkipSingle);
"so this test fails. Disabled on Windows");
#endif
QFile file(testFileName);
@ -4373,7 +4373,7 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp_data()
void tst_QNetworkReply::ioGetFromBuiltinHttp()
{
QSKIP("Limiting is broken right now, check QTBUG-15065", SkipAll);
QSKIP("Limiting is broken right now, check QTBUG-15065");
QFETCH(bool, https);
QFETCH(int, bufferSize);
@ -4620,7 +4620,7 @@ void tst_QNetworkReply::rateControl_data()
void tst_QNetworkReply::rateControl()
{
QSKIP("Test disabled -- only for manual purposes", SkipAll);
QSKIP("Test disabled -- only for manual purposes");
// this function tests that we aren't reading from the network
// faster than the data is being consumed.
QFETCH(int, rate);

2
tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
View File

@ -351,7 +351,7 @@ public:
void tst_QNetworkConfigurationManager::usedInThread()
{
#if defined Q_OS_MAC && !defined (QT_NO_COREWLAN)
QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken", SkipAll);
QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken");
#else
QNCMTestThread thread;
connect(&thread, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));

58
tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
View File

@ -261,15 +261,12 @@ void tst_QNetworkSession::sessionClosing()
// First check that opening once succeeds and determine if test is doable
QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType);
if (!config.isValid()) {
QSKIP("No suitable configurations, skipping this round of repeated open-close test.", SkipSingle);
}
if (!config.isValid())
QSKIP("No suitable configurations, skipping this round of repeated open-close test.");
qDebug() << "Using following configuration to bomb with close(): " << config.name();
QNetworkSession session(config);
if (!openSession(&session) ||
!closeSession(&session)) {
QSKIP("Unable to open/close session, skipping this round of close() bombing.", SkipSingle);
}
if (!openSession(&session) || !closeSession(&session))
QSKIP("Unable to open/close session, skipping this round of close() bombing.");
qDebug() << "Closing without issuing open()";
session.close();
@ -442,15 +439,12 @@ void tst_QNetworkSession::repeatedOpenClose()
// First check that opening once succeeds and determine if repeatable testing is doable
QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType);
if (!config.isValid()) {
QSKIP("No suitable configurations, skipping this round of repeated open-close test.", SkipSingle);
}
if (!config.isValid())
QSKIP("No suitable configurations, skipping this round of repeated open-close test.");
qDebug() << "Using following configuratio to repeatedly open and close: " << config.name();
QNetworkSession permanentSession(config);
if (!openSession(&permanentSession) ||
!closeSession(&permanentSession)) {
QSKIP("Unable to open/close session, skipping this round of repeated open-close test.", SkipSingle);
}
if (!openSession(&permanentSession) || !closeSession(&permanentSession))
QSKIP("Unable to open/close session, skipping this round of repeated open-close test.");
for (int i = 0; i < repeatTimes; i++) {
qDebug() << "Opening, loop number " << i;
QVERIFY(openSession(&permanentSession));
@ -468,7 +462,7 @@ void tst_QNetworkSession::userChoiceSession_data()
if (config.type() == QNetworkConfiguration::UserChoice)
QTest::newRow("UserChoice") << config;
else
QSKIP("Default configuration is not a UserChoice configuration.", SkipAll);
QSKIP("Default configuration is not a UserChoice configuration.");
}
void tst_QNetworkSession::userChoiceSession()
@ -489,7 +483,7 @@ void tst_QNetworkSession::userChoiceSession()
// The remaining tests require the session to be not NotAvailable.
if (session.state() == QNetworkSession::NotAvailable)
QSKIP("Network is not available.", SkipSingle);
QSKIP("Network is not available.");
QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened()));
QSignalSpy sessionClosedSpy(&session, SIGNAL(closed()));
@ -511,7 +505,7 @@ void tst_QNetworkSession::userChoiceSession()
if (error == QNetworkSession::OperationNotSupportedError) {
// The session needed to bring up the interface,
// but the operation is not supported.
QSKIP("Configuration does not support open().", SkipSingle);
QSKIP("Configuration does not support open().");
} else if (error == QNetworkSession::InvalidConfigurationError) {
// The session needed to bring up the interface, but it is not possible for the
// specified configuration.
@ -519,10 +513,10 @@ void tst_QNetworkSession::userChoiceSession()
QNetworkConfiguration::Discovered) {
QFAIL("Failed to open session for Discovered configuration.");
} else {
QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle);
QSKIP("Cannot test session for non-Discovered configuration.");
}
} else if (error == QNetworkSession::UnknownSessionError) {
QSKIP("Unknown session error.", SkipSingle);
QSKIP("Unknown session error.");
} else {
QFAIL("Error opening session.");
}
@ -619,7 +613,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
// The remaining tests require the session to be not NotAvailable.
if (session.state() == QNetworkSession::NotAvailable)
QSKIP("Network is not available.", SkipSingle);
QSKIP("Network is not available.");
QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened()));
QSignalSpy sessionClosedSpy(&session, SIGNAL(closed()));
@ -649,7 +643,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
if (error == QNetworkSession::OperationNotSupportedError) {
// The session needed to bring up the interface,
// but the operation is not supported.
QSKIP("Configuration does not support open().", SkipSingle);
QSKIP("Configuration does not support open().");
} else if (error == QNetworkSession::InvalidConfigurationError) {
// The session needed to bring up the interface, but it is not possible for the
// specified configuration.
@ -657,10 +651,10 @@ void tst_QNetworkSession::sessionOpenCloseStop()
QNetworkConfiguration::Discovered) {
QFAIL("Failed to open session for Discovered configuration.");
} else {
QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle);
QSKIP("Cannot test session for non-Discovered configuration.");
}
} else if (error == QNetworkSession::UnknownSessionError) {
QSKIP("Unknown Session error.", SkipSingle);
QSKIP("Unknown Session error.");
} else {
QFAIL("Error opening session.");
}
@ -779,7 +773,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
if (error == QNetworkSession::OperationNotSupportedError) {
// The session needed to bring down the interface,
// but the operation is not supported.
QSKIP("Configuration does not support stop().", SkipSingle);
QSKIP("Configuration does not support stop().");
} else if (error == QNetworkSession::InvalidConfigurationError) {
// The session needed to bring down the interface, but it is not possible for the
// specified configuration.
@ -787,7 +781,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
QNetworkConfiguration::Discovered) {
QFAIL("Failed to stop session for Discovered configuration.");
} else {
QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle);
QSKIP("Cannot test session for non-Discovered configuration.");
}
} else {
QFAIL("Error stopping session.");
@ -958,7 +952,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
if (error == QNetworkSession::OperationNotSupportedError) {
// The session needed to bring down the interface,
// but the operation is not supported.
QSKIP("Configuration does not support close().", SkipSingle);
QSKIP("Configuration does not support close().");
} else if (error == QNetworkSession::InvalidConfigurationError) {
// The session needed to bring down the interface, but it is not possible for the
// specified configuration.
@ -966,7 +960,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
QNetworkConfiguration::Discovered) {
QFAIL("Failed to close session for Discovered configuration.");
} else {
QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle);
QSKIP("Cannot test session for non-Discovered configuration.");
}
} else {
QFAIL("Error closing session.");
@ -1090,11 +1084,11 @@ void tst_QNetworkSession::outOfProcessSession()
qDebug("Lackey returned exit success (0)");
break;
case 1:
QSKIP("No discovered configurations found.", SkipAll);
QSKIP("No discovered configurations found.");
case 2:
QSKIP("Lackey could not start session.", SkipAll);
QSKIP("Lackey could not start session.");
default:
QSKIP("Lackey failed", SkipAll);
QSKIP("Lackey failed");
}
}
@ -1319,7 +1313,7 @@ void tst_QNetworkSession::sessionAutoClose_data()
}
if (!testData)
QSKIP("No applicable configurations to test", SkipAll);
QSKIP("No applicable configurations to test");
}
void tst_QNetworkSession::sessionAutoClose()
@ -1343,7 +1337,7 @@ void tst_QNetworkSession::sessionAutoClose()
session.waitForOpened();
if (!session.isOpen())
QSKIP("Session not open", SkipSingle);
QSKIP("Session not open");
// set session to auto close at next polling interval.
session.setSessionProperty(QLatin1String("AutoCloseSessionTimeout"), 0);

6
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
View File

@ -328,7 +328,7 @@ void tst_QHostInfo::lookupIPv6()
QFETCH(QString, addresses);
if (!ipv6LookupsAvailable)
QSKIP("This platform does not support IPv6 lookups", SkipAll);
QSKIP("This platform does not support IPv6 lookups");
lookupDone = false;
QHostInfo::lookupHost(hostname, this, SLOT(resultsReady(const QHostInfo&)));
@ -371,11 +371,11 @@ void tst_QHostInfo::reverseLookup()
QFETCH(int, err);
if (!ipv6LookupsAvailable && hostNames.contains("classical.hexago.com")) {
QSKIP("IPv6 lookups are not supported on this platform", SkipSingle);
QSKIP("IPv6 lookups are not supported on this platform");
}
#if defined(Q_OS_HPUX) && defined(__ia64)
if (hostNames.contains("classical.hexago.com"))
QSKIP("HP-UX 11i does not support IPv6 reverse lookups.", SkipSingle);
QSKIP("HP-UX 11i does not support IPv6 reverse lookups.");
#endif
QHostInfo info = QHostInfo::fromName(address);

2
tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
View File

@ -226,7 +226,7 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager()
if (count == factory->requestCounter) {
//RND phones are preconfigured with several test access points which won't work without a matching SIM
//If the network fails to start, QNAM won't ask the factory for proxies so we can't test.
QSKIP("network configuration didn't start", SkipSingle);
QSKIP("network configuration didn't start");
}
qDebug() << "testing network configuration for" << config.name();

27
tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
View File

@ -283,7 +283,7 @@ void tst_QTcpServer::dualStack()
{
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
QSKIP("test server proxy doesn't support ipv6", SkipSingle);
QSKIP("test server proxy doesn't support ipv6");
QFETCH(QHostAddress, bindAddress);
QFETCH(bool, v4ok);
QFETCH(bool, v6ok);
@ -349,9 +349,8 @@ void tst_QTcpServer::maxPendingConnections()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("With socks5 only 1 connection is allowed ever", SkipAll);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("With socks5 only 1 connection is allowed ever");
}
//### sees to fail sometimes ... a timing issue with the test on windows
QTcpServer server;
@ -388,9 +387,8 @@ void tst_QTcpServer::listenError()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("With socks5 we can not make hard requirements on the address or port", SkipAll);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("With socks5 we can not make hard requirements on the address or port");
}
QTcpServer server;
QVERIFY(!server.listen(QHostAddress("1.2.3.4"), 0));
@ -435,9 +433,8 @@ void tst_QTcpServer::waitForConnectionTest()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("Localhost servers don't work well with SOCKS5", SkipAll);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("Localhost servers don't work well with SOCKS5");
}
QTcpSocket findLocalIpSocket;
@ -533,9 +530,8 @@ void tst_QTcpServer::addressReusable()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("With socks5 this test does not make senans at the momment", SkipAll);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("With socks5 this test does not make senans at the momment");
}
#if defined(Q_OS_WINCE)
QString signalName = QString::fromLatin1("/test_signal.txt");
@ -574,9 +570,8 @@ void tst_QTcpServer::setNewSocketDescriptorBlocking()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("With socks5 we can not make the socket descripter blocking", SkipAll);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("With socks5 we can not make the socket descripter blocking");
}
SeverWithBlockingSockets server;
QVERIFY(server.listen());

11
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
View File

@ -1040,7 +1040,7 @@ void tst_QTcpSocket::disconnectWhileConnecting()
if (!data.isEmpty())
socket->write(data);
if (socket->state() == QAbstractSocket::ConnectedState)
QSKIP("localhost connections are immediate, test case is invalid", SkipSingle);
QSKIP("localhost connections are immediate, test case is invalid");
QFETCH(bool, closeDirectly);
if (closeDirectly) {
@ -1156,9 +1156,8 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop()
socket->connectToHost("127.0.0.1", thread->serverPort);
if (!data.isEmpty())
socket->write(data);
if (socket->state() == QAbstractSocket::ConnectedState) {
QSKIP("localhost connections are immediate, test case is invalid", SkipSingle);
}
if (socket->state() == QAbstractSocket::ConnectedState)
QSKIP("localhost connections are immediate, test case is invalid");
QFETCH(bool, closeDirectly);
if (closeDirectly) {
@ -2224,14 +2223,14 @@ void tst_QTcpSocket::suddenRemoteDisconnect()
#ifndef Q_OS_VXWORKS
void tst_QTcpSocket::connectToMultiIP()
{
QSKIP("TODO: setup DNS in the new network", SkipAll);
QSKIP("TODO: setup DNS in the new network");
QFETCH_GLOBAL(bool, ssl);
if (ssl)
return;
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
QSKIP("This test takes too long if we also add the proxies.", SkipSingle);
QSKIP("This test takes too long if we also add the proxies.");
qDebug("Please wait, this test can take a while...");

45
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
View File

@ -246,9 +246,8 @@ void tst_QUdpSocket::broadcasting()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("With socks5 Broadcast is not supported.", SkipSingle);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("With socks5 Broadcast is not supported.");
}
const char *message[] = {"Yo mista", "", "Yo", "Wassap"};
@ -261,7 +260,7 @@ void tst_QUdpSocket::broadcasting()
}
}
if (broadcastAddresses.isEmpty())
QSKIP("No interface can broadcast", SkipAll);
QSKIP("No interface can broadcast");
for (int i = 0; i < 4; ++i) {
QUdpSocket serverSocket;
#ifdef FORCE_SESSION
@ -432,7 +431,7 @@ void tst_QUdpSocket::dualStack()
{
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
QSKIP("test server SOCKS proxy doesn't support IPv6", SkipSingle);
QSKIP("test server SOCKS proxy doesn't support IPv6");
QUdpSocket dualSock;
QByteArray dualData("dual");
QVERIFY(dualSock.bind(QHostAddress(QHostAddress::Any), 0));
@ -545,26 +544,23 @@ void tst_QUdpSocket::pendingDatagramSize()
QCOMPARE(server.readDatagram(&c, 1), qint64(1));
QCOMPARE(c, 't');
c = '\0';
} else {
QSKIP("does not have the 1st datagram", SkipSingle);
}
} else
QSKIP("does not have the 1st datagram");
if (server.hasPendingDatagrams()) {
QCOMPARE(server.pendingDatagramSize(), qint64(0));
QCOMPARE(server.readDatagram(&c, 1), qint64(0));
QCOMPARE(c, '\0'); // untouched
c = '\0';
} else {
QSKIP("does not have the 2nd datagram", SkipSingle);
}
c = '\0';
} else
QSKIP("does not have the 2nd datagram");
if (server.hasPendingDatagrams()) {
QCOMPARE(server.pendingDatagramSize(), qint64(10));
QCOMPARE(server.readDatagram(&c, 1), qint64(1));
QCOMPARE(c, '3');
} else {
QSKIP("does not have the 3rd datagram", SkipSingle);
}
} else
QSKIP("does not have the 3rd datagram");
}
@ -597,7 +593,7 @@ void tst_QUdpSocket::writeDatagram()
if (written != i * 1024) {
#if defined (Q_OS_HPUX)
QSKIP("HP-UX 11.11 on hai (PA-RISC 64) truncates too long datagrams.", SkipSingle);
QSKIP("HP-UX 11.11 on hai (PA-RISC 64) truncates too long datagrams.");
#endif
QCOMPARE(bytesspy.count(), 0);
QCOMPARE(errorspy.count(), 1);
@ -610,9 +606,8 @@ void tst_QUdpSocket::writeDatagram()
QCOMPARE(*static_cast<const qint64 *>(bytesspy.at(0).at(0).constData()),
qint64(i * 1024));
QCOMPARE(errorspy.count(), 0);
if (!server.waitForReadyRead(5000)) {
QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data(), SkipSingle);
}
if (!server.waitForReadyRead(5000))
QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data());
QCOMPARE(server.pendingDatagramSize(), qint64(i * 1024));
QCOMPARE(server.readDatagram(0, 0), qint64(0));
}
@ -663,9 +658,8 @@ void tst_QUdpSocket::bindMode()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
if (proxyType == QNetworkProxy::Socks5Proxy) {
QSKIP("With socks5 explicit port binding is not supported.", SkipAll);
}
if (proxyType == QNetworkProxy::Socks5Proxy)
QSKIP("With socks5 explicit port binding is not supported.");
}
QUdpSocket socket;
@ -745,7 +739,7 @@ void tst_QUdpSocket::writeToNonExistingPeer_data()
void tst_QUdpSocket::writeToNonExistingPeer()
{
QSKIP("Connected-mode UDP sockets and their behaviour are erratic", SkipAll);
QSKIP("Connected-mode UDP sockets and their behaviour are erratic");
QFETCH(QHostAddress, peerAddress);
quint16 peerPort = 34534;
qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
@ -1058,9 +1052,8 @@ void tst_QUdpSocket::multicastLeaveAfterClose()
{
QFETCH_GLOBAL(bool, setProxy);
QFETCH(QHostAddress, groupAddress);
if (setProxy) {
QSKIP("UDP Multicast does not work with proxies", SkipAll);
}
if (setProxy)
QSKIP("UDP Multicast does not work with proxies");
QUdpSocket udpSocket;
#ifdef FORCE_SESSION

2
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -1269,7 +1269,7 @@ void tst_QSslSocket::wildcardCertificateNames()
void tst_QSslSocket::wildcard()
{
QSKIP("TODO: solve wildcard problem", SkipAll);
QSKIP("TODO: solve wildcard problem");
if (!QSslSocket::supportsSsl())
return;

34
tests/auto/opengl/qgl/tst_qgl.cpp
View File

@ -145,7 +145,7 @@ static int appDefaultDepth()
void tst_QGL::getSetCheck()
{
if (!QGLFormat::hasOpenGL())
QSKIP("QGL not supported on this platform", SkipAll);
QSKIP("QGL not supported on this platform");
QGLFormat obj1;
// int QGLFormat::depthBufferSize()
@ -656,7 +656,7 @@ void tst_QGL::openGLVersionCheck()
{
#ifdef QT_BUILD_INTERNAL
if (!QGLFormat::hasOpenGL())
QSKIP("QGL not supported on this platform", SkipAll);
QSKIP("QGL not supported on this platform");
QString versionString;
QGLFormat::OpenGLVersionFlags expectedFlag;
@ -895,7 +895,7 @@ void tst_QGL::partialGLWidgetUpdates_data()
void tst_QGL::partialGLWidgetUpdates()
{
if (!QGLFormat::hasOpenGL())
QSKIP("QGL not supported on this platform", SkipAll);
QSKIP("QGL not supported on this platform");
QFETCH(bool, doubleBufferedContext);
QFETCH(bool, autoFillBackground);
@ -923,7 +923,7 @@ void tst_QGL::partialGLWidgetUpdates()
QTest::qWait(200);
if (widget.format().doubleBuffer() != doubleBufferedContext)
QSKIP("Platform does not support requested format", SkipAll);
QSKIP("Platform does not support requested format");
widget.paintEventRegion = QRegion();
widget.repaint(50, 50, 50, 50);
@ -939,7 +939,7 @@ void tst_QGL::partialGLWidgetUpdates()
void tst_QGL::glPBufferRendering()
{
if (!QGLPixelBuffer::hasOpenGLPbuffers())
QSKIP("QGLPixelBuffer not supported on this platform", SkipSingle);
QSKIP("QGLPixelBuffer not supported on this platform");
QGLPixelBuffer* pbuf = new QGLPixelBuffer(128, 128);
@ -1063,7 +1063,7 @@ void tst_QGL::glWidgetRendering()
void tst_QGL::glFBOSimpleRendering()
{
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QGLFramebufferObject not supported on this platform");
QGLWidget glw;
glw.makeCurrent();
@ -1097,7 +1097,7 @@ void tst_QGL::glFBOSimpleRendering()
void tst_QGL::glFBORendering()
{
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QGLFramebufferObject not supported on this platform");
QGLWidget glw;
glw.makeCurrent();
@ -1111,7 +1111,7 @@ void tst_QGL::glFBORendering()
if (fbo->attachment() != QGLFramebufferObject::CombinedDepthStencil) {
delete fbo;
QSKIP("FBOs missing combined depth~stencil support", SkipSingle);
QSKIP("FBOs missing combined depth~stencil support");
}
QPainter fboPainter;
@ -1135,7 +1135,7 @@ void tst_QGL::glFBORendering()
void tst_QGL::multipleFBOInterleavedRendering()
{
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QGLFramebufferObject not supported on this platform");
QGLWidget glw;
glw.makeCurrent();
@ -1155,7 +1155,7 @@ void tst_QGL::multipleFBOInterleavedRendering()
delete fbo1;
delete fbo2;
delete fbo3;
QSKIP("FBOs missing combined depth~stencil support", SkipSingle);
QSKIP("FBOs missing combined depth~stencil support");
}
QPainter fbo1Painter;
@ -1169,7 +1169,7 @@ void tst_QGL::multipleFBOInterleavedRendering()
// Confirm we're using the GL2 engine, as interleaved rendering isn't supported
// on the GL1 engine:
if (fbo1Painter.paintEngine()->type() != QPaintEngine::OpenGL2)
QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher", SkipSingle);
QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher");
QPainterPath intersectingPath;
intersectingPath.moveTo(0, 0);
@ -1282,7 +1282,7 @@ protected:
void tst_QGL::glFBOUseInGLWidget()
{
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QGLFramebufferObject not supported on this platform");
FBOUseInGLWidget w;
#ifdef Q_WS_QWS
@ -1401,7 +1401,7 @@ void tst_QGL::glWidgetRenderPixmap()
reference.fill(0xffff0000);
#if defined(QGL_EGL) && !defined(Q_WS_X11)
QSKIP("renderPixmap() not yet supported under EGL on your platform", SkipAll);
QSKIP("renderPixmap() not yet supported under EGL on your platform");
#endif
QFUZZY_COMPARE_IMAGES(fb, reference);
@ -1825,7 +1825,7 @@ void tst_QGL::clipTest()
void tst_QGL::destroyFBOAfterContext()
{
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QGLFramebufferObject not supported on this platform");
QGLWidget *glw = new QGLWidget();
glw->makeCurrent();
@ -1896,7 +1896,7 @@ void tst_QGL::shareRegister()
if (!glw2->isSharing()) {
delete glw2;
delete glw1;
QSKIP("Context sharing is not supported", SkipSingle);
QSKIP("Context sharing is not supported");
}
QVERIFY(glw1->isSharing());
QVERIFY(glw1->context() != glw2->context());
@ -2352,7 +2352,7 @@ void tst_QGL::threadImages()
void tst_QGL::nullRectCrash()
{
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QGLFramebufferObject not supported on this platform");
QGLWidget glw;
glw.makeCurrent();
@ -2380,7 +2380,7 @@ public:
private slots:
void qglSkipTests() {
QSKIP("QGL not supported on this system.", SkipAll);
QSKIP("QGL not supported on this system.");
}
};

6
tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
View File

@ -110,7 +110,7 @@ void tst_QGLBuffer::testBuffer(QGLBuffer::Type type)
// Create the buffer - if this fails, then assume that the
// GL implementation does not support buffers at all.
if (!buffer.create())
QSKIP("Buffers are not supported on this platform", SkipAll);
QSKIP("Buffers are not supported on this platform");
// Should now have a buffer id.
QVERIFY(buffer.bufferId() != 0);
@ -209,13 +209,13 @@ void tst_QGLBuffer::bufferSharing()
if (!w2->isSharing()) {
delete w2;
delete w1;
QSKIP("Context sharing is not supported on this platform", SkipSingle);
QSKIP("Context sharing is not supported on this platform");
}
// Bind the buffer in the first context and write some data to it.
QGLBuffer buffer(QGLBuffer::VertexBuffer);
if (!buffer.create())
QSKIP("Buffers are not supported on this platform", SkipSingle);
QSKIP("Buffers are not supported on this platform");
QVERIFY(buffer.isCreated());
QVERIFY(buffer.bind());
static GLfloat const data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};

10
tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
View File

@ -91,7 +91,7 @@ void tst_QGLFunctions::features()
// Make a context current.
QGLWidget glw;
if (!glw.isValid())
QSKIP("Could not create a GL context", SkipAll);
QSKIP("Could not create a GL context");
glw.makeCurrent();
funcs.initializeGLFunctions();
@ -195,12 +195,12 @@ void tst_QGLFunctions::multitexture()
QGLFunctions funcs;
QGLWidget glw;
if (!glw.isValid())
QSKIP("Could not create a GL context", SkipAll);
QSKIP("Could not create a GL context");
glw.makeCurrent();
funcs.initializeGLFunctions();
if (!funcs.hasOpenGLFeature(QGLFunctions::Multitexture))
QSKIP("Multitexture functions are not supported", SkipSingle);
QSKIP("Multitexture functions are not supported");
funcs.glActiveTexture(GL_TEXTURE1);
@ -221,12 +221,12 @@ void tst_QGLFunctions::blendColor()
QGLFunctions funcs;
QGLWidget glw;
if (!glw.isValid())
QSKIP("Could not create a GL context", SkipAll);
QSKIP("Could not create a GL context");
glw.makeCurrent();
funcs.initializeGLFunctions();
if (!funcs.hasOpenGLFeature(QGLFunctions::BlendColor))
QSKIP("glBlendColor() is not supported", SkipSingle);
QSKIP("glBlendColor() is not supported");
funcs.glBlendColor(0.0f, 1.0f, 0.0f, 1.0f);

28
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
View File

@ -141,7 +141,7 @@ public:
void tst_QGLThreads::swapInThread()
{
#ifdef Q_OS_MAC
QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll);
QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots");
#endif
QGLFormat format;
@ -250,7 +250,7 @@ private:
void tst_QGLThreads::textureUploadInThread()
{
#ifdef Q_OS_MAC
QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll);
QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots");
#endif
TextureDisplay display;
@ -425,7 +425,7 @@ void tst_QGLThreads::renderInThread_data()
void tst_QGLThreads::renderInThread()
{
#ifdef Q_OS_MAC
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
#endif
QFETCH(bool, resize);
@ -633,11 +633,11 @@ private:
void tst_QGLThreads::painterOnGLWidgetInThread()
{
#ifdef Q_OS_MAC
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
#endif
if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll);
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
}
PaintThreadManager<GLWidgetWrapper> painterThreads(5);
@ -657,7 +657,7 @@ void tst_QGLThreads::painterOnGLWidgetInThread()
void tst_QGLThreads::painterOnPixmapInThread()
{
#ifdef Q_WS_X11
QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.", SkipAll);
QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.");
#endif
PaintThreadManager<PixmapWrapper> painterThreads(5);
painterThreads.start();
@ -675,17 +675,15 @@ void tst_QGLThreads::painterOnPixmapInThread()
void tst_QGLThreads::painterOnPboInThread()
{
#ifdef Q_OS_MAC
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
#endif
if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll);
return;
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
}
if (!QGLPixelBuffer::hasOpenGLPbuffers()) {
QSKIP("This system doesn't support pbuffers.", SkipAll);
return;
QSKIP("This system doesn't support pbuffers.");
}
PaintThreadManager<PixelBufferWrapper> painterThreads(5);
@ -705,17 +703,15 @@ void tst_QGLThreads::painterOnPboInThread()
void tst_QGLThreads::painterOnFboInThread()
{
#ifdef Q_OS_MAC
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
#endif
if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll);
return;
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
}
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) {
QSKIP("This system doesn't support framebuffer objects.", SkipAll);
return;
QSKIP("This system doesn't support framebuffer objects.");
}
PaintThreadManager<FrameBufferObjectWrapper> painterThreads(5);

2
tests/auto/other/atwrapper/atWrapperAutotest.cpp
View File

@ -70,7 +70,7 @@ void atWrapperAutotest::runTest()
atWrapper wrapper;
if (!wrapper.runAutoTests())
QSKIP("Arthur not tested on this machine", SkipAll);
QSKIP("Arthur not tested on this machine");
QVERIFY(true);
}

11
tests/auto/qopengl/tst_qopengl.cpp
View File

@ -297,7 +297,7 @@ void tst_QOpenGL::fboSimpleRendering()
ctx.makeCurrent(&window);
if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QOpenGLFramebufferObject not supported on this platform");
// No multisample with combined depth/stencil attachment:
QOpenGLFramebufferObjectFormat fboFormat;
@ -336,7 +336,7 @@ void tst_QOpenGL::fboRendering()
ctx.makeCurrent(&window);
if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle);
QSKIP("QOpenGLFramebufferObject not supported on this platform");
// No multisample with combined depth/stencil attachment:
QOpenGLFramebufferObjectFormat fboFormat;
@ -346,7 +346,7 @@ void tst_QOpenGL::fboRendering()
QOpenGLFramebufferObject fbo(256, 128, fboFormat);
if (fbo.attachment() != QOpenGLFramebufferObject::CombinedDepthStencil)
QSKIP("FBOs missing combined depth~stencil support", SkipSingle);
QSKIP("FBOs missing combined depth~stencil support");
fbo.bind();
@ -378,9 +378,8 @@ void tst_QOpenGL::fboHandleNulledAfterContextDestroyed()
ctx.makeCurrent(&window);
if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) {
QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle);
}
if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects())
QSKIP("QOpenGLFramebufferObject not supported on this platform");
fbo = new QOpenGLFramebufferObject(128, 128);

6
tests/auto/qwindowsurface/tst_qwindowsurface.cpp
View File

@ -69,7 +69,7 @@ private slots:
#if QT_VERSION >= 0x050000
void tst_QWindowSurface::initTestCase()
{
QSKIP("This test is temporarily skipped until it is fixed for Qt5", SkipAll);
QSKIP("This test is temporarily skipped until it is fixed for Qt5");
}
#else
@ -162,7 +162,7 @@ void tst_QWindowSurface::flushOutsidePaintEvent()
{
#ifdef Q_WS_X11
if (QX11Info::isCompositingManagerRunning())
QSKIP("Test is unreliable with composition manager", SkipAll);
QSKIP("Test is unreliable with composition manager");
#endif
#ifdef Q_WS_WIN
@ -208,7 +208,7 @@ void tst_QWindowSurface::flushOutsidePaintEvent()
QApplication::processEvents();
#if defined(Q_WS_QWS)
QSKIP("task 176755", SkipAll);
QSKIP("task 176755");
#endif
VERIFY_COLOR(w.geometry(), w.color);
QCOMPARE(QRegion(w.rect()), w.r);

2
tests/auto/qx11info/tst_qx11info.cpp
View File

@ -60,7 +60,7 @@ private slots:
#ifndef Q_WS_X11
void tst_QX11Info::initTestCase()
{
QSKIP("This test is only valid for X11", SkipAll);
QSKIP("This test is only valid for X11");
}
#else

2
tests/auto/sql/kernel/qsql/tst_qsql.cpp
View File

@ -220,7 +220,7 @@ void tst_QSql::openErrorRecovery()
dbs.addDbs();
if (dbs.dbNames.isEmpty())
QSKIP("No database drivers installed", SkipAll);
QSKIP("No database drivers installed");
foreach ( const QString& dbName, dbs.dbNames ) {
QSqlDatabase db = QSqlDatabase::database( dbName, false );
CHECK_DATABASE( db );

2
tests/auto/sql/kernel/qsqldatabase/tst_databases.h
View File

@ -71,7 +71,7 @@
#define QFAIL_SQL(q, stmt) QVERIFY2(!(q).stmt, tst_Databases::printError((q).lastError(), db))
#define DBMS_SPECIFIC(db, driver) \
if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test", SkipSingle); }
if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test"); }
// ### use QSystem::hostName if it is integrated in qtest/main
static QString qGetHostName()

52
tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
View File

@ -421,9 +421,9 @@ void tst_QSqlDatabase::generic_data(const QString& engine)
{
if ( dbs.fillTestTable(engine) == 0 ) {
if(engine.isEmpty())
QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
QSKIP( "No database drivers are available in this Qt configuration");
else
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
}
}
@ -476,7 +476,7 @@ void tst_QSqlDatabase::tables()
QSqlQuery q(db);
if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
QSKIP( "Test requires MySQL >= 5.0");
if (!q.exec("CREATE VIEW " + qtest_view + " as select * from " + qtest)) {
@ -553,7 +553,7 @@ void tst_QSqlDatabase::whitespaceInIdentifiers()
else
QCOMPARE(idx.field(0).type(), QVariant::Int);
} else {
QSKIP("DBMS does not support whitespaces in identifiers", SkipSingle);
QSKIP("DBMS does not support whitespaces in identifiers");
}
}
@ -576,7 +576,7 @@ void tst_QSqlDatabase::alterTable()
}
if (!q.exec("alter table " + qtestalter + " drop column F2")) {
QSKIP("DBMS doesn't support dropping columns in ALTER TABLE statement", SkipSingle);
QSKIP("DBMS doesn't support dropping columns in ALTER TABLE statement");
}
rec = db.record(qtestalter);
@ -985,7 +985,7 @@ void tst_QSqlDatabase::recordSQLServer()
CHECK_DATABASE(db);
if (!tst_Databases::isSqlServer(db))
QSKIP("SQL server specific test", SkipSingle);
QSKIP("SQL server specific test");
// ### TODO: Add the rest of the fields
static const FieldDef fieldDefs[] = {
@ -1014,7 +1014,7 @@ void tst_QSqlDatabase::recordAccess()
CHECK_DATABASE(db);
if (!tst_Databases::isMSAccess(db))
QSKIP("MS Access specific test", SkipSingle);
QSKIP("MS Access specific test");
QString memo;
for (int i = 0; i < 32; i++)
@ -1045,7 +1045,7 @@ void tst_QSqlDatabase::transaction()
const QString qtest(qTableName("qtest", __FILE__));
if (!db.driver()->hasFeature(QSqlDriver::Transactions))
QSKIP("DBMS not transaction capable", SkipSingle);
QSKIP("DBMS not transaction capable");
QVERIFY(db.transaction());
@ -1073,7 +1073,7 @@ void tst_QSqlDatabase::transaction()
q.clear(); // for SQLite which does not allow any references on rows that shall be rolled back
if (!db.rollback()) {
if (db.driverName().startsWith("QMYSQL"))
QSKIP("MySQL transaction failed: " + tst_Databases::printError(db.lastError()), SkipSingle);
QSKIP("MySQL transaction failed: " + tst_Databases::printError(db.lastError()));
else
QFAIL("Could not rollback transaction: " + tst_Databases::printError(db.lastError()));
}
@ -1110,7 +1110,7 @@ void tst_QSqlDatabase::bigIntField()
//} else if (drvName.startsWith("QIBASE")) {
// QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int64, t_u64bit int64)"));
} else {
QSKIP("no 64 bit integer support", SkipAll);
QSKIP("no 64 bit integer support");
}
QVERIFY(q.prepare("insert into " + qtest_bigint + " values (?, ?, ?)"));
qlonglong ll = Q_INT64_C(9223372036854775807);
@ -1205,7 +1205,7 @@ void tst_QSqlDatabase::psql_schemas()
CHECK_DATABASE(db);
if (!db.tables(QSql::SystemTables).contains("pg_namespace"))
QSKIP("server does not support schemas", SkipSingle);
QSKIP("server does not support schemas");
QSqlQuery q(db);
@ -1238,7 +1238,7 @@ void tst_QSqlDatabase::psql_escapedIdentifiers()
CHECK_DATABASE(db);
if (!db.tables(QSql::SystemTables).contains("pg_namespace"))
QSKIP("server does not support schemas", SkipSingle);
QSKIP("server does not support schemas");
QSqlQuery q(db);
@ -1315,7 +1315,7 @@ void tst_QSqlDatabase::bug_249059()
QString version=tst_Databases::getPSQLVersion( db );
double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble();
if (ver < 7.3)
QSKIP("Test requires PostgreSQL >= 7.3", SkipSingle);
QSKIP("Test requires PostgreSQL >= 7.3");
QSqlQuery q(db);
const QString tableName(qTableName("bug_249059", __FILE__));
@ -1355,7 +1355,7 @@ void tst_QSqlDatabase::precisionPolicy()
QSqlQuery q(db);
const QString tableName(qTableName("qtest_prec", __FILE__));
if(!db.driver()->hasFeature(QSqlDriver::LowPrecisionNumbers))
QSKIP("Driver or database doesn't support setting precision policy", SkipSingle);
QSKIP("Driver or database doesn't support setting precision policy");
// Create a test table with some data
if(tst_Databases::isMSAccess(db))
@ -1445,7 +1445,7 @@ void tst_QSqlDatabase::mysqlOdbc_unsignedIntegers()
CHECK_DATABASE(db);
if (!db.driverName().startsWith("QODBC") || !dbName.toUpper().contains("MYSQL"))
QSKIP("MySQL through ODBC-driver specific test", SkipSingle);
QSKIP("MySQL through ODBC-driver specific test");
QSqlQuery q(db);
const QString tableName(qTableName("uint", __FILE__));
@ -1469,7 +1469,7 @@ void tst_QSqlDatabase::accessOdbc_strings()
CHECK_DATABASE(db);
if (!tst_Databases::isMSAccess(db))
QSKIP("MS Access specific test", SkipSingle);
QSKIP("MS Access specific test");
QSqlQuery q(db);
const QString tableName(qTableName("strings", __FILE__));
@ -1629,7 +1629,7 @@ void tst_QSqlDatabase::ibase_procWithReturnValues()
CHECK_DATABASE(db);
if (!db.driverName().startsWith("QIBASE"))
QSKIP("InterBase specific test", SkipSingle);
QSKIP("InterBase specific test");
const QString procName(qTableName("qtest_proc2", __FILE__));
@ -1716,7 +1716,7 @@ void tst_QSqlDatabase::odbc_bindBoolean()
CHECK_DATABASE(db);
if (tst_Databases::isMySQL(db))
QSKIP("MySql has inconsistent behaviour of bit field type across versions.", SkipSingle);
QSKIP("MySql has inconsistent behaviour of bit field type across versions.");
QSqlQuery q(db);
QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("qtestBindBool", __FILE__) + "(id int, boolvalue bit)"));
@ -1795,7 +1795,7 @@ void tst_QSqlDatabase::mysql_multiselect()
QString version=tst_Databases::getMySqlVersion( db );
double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble();
if (ver < 4.1)
QSKIP("Test requires MySQL >= 4.1", SkipSingle);
QSKIP("Test requires MySQL >= 4.1");
QVERIFY_SQL(q, exec("SELECT * FROM " + qtest + "; SELECT * FROM " + qtest));
QVERIFY_SQL(q, next());
@ -1859,7 +1859,7 @@ void tst_QSqlDatabase::oci_xmltypeSupport()
// Embedding the XML in the statement
if(!q.exec(QString("CREATE TABLE %1(xmldata xmltype)").arg(tableName)))
QSKIP("This test requries xml type support", SkipSingle);
QSKIP("This test requries xml type support");
QVERIFY_SQL(q, exec(QString("INSERT INTO %1 values('%2')").arg(tableName).arg(xml)));
QVERIFY_SQL(q, exec(QString("SELECT a.xmldata.getStringVal() FROM %1 a").arg(tableName)));
QVERIFY_SQL(q, last());
@ -1928,7 +1928,7 @@ void tst_QSqlDatabase::odbc_uniqueidentifier()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
if (!tst_Databases::isSqlServer(db))
QSKIP("SQL Server (ODBC) specific test", SkipSingle);
QSKIP("SQL Server (ODBC) specific test");
const QString tableName(qTableName("qtest_sqlguid", __FILE__));
QString guid = QString("AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE");
@ -1998,7 +1998,7 @@ void tst_QSqlDatabase::eventNotification()
QSqlDriver *driver = db.driver();
if (!driver->hasFeature(QSqlDriver::EventNotifications))
QSKIP("DBMS doesn't support event notifications", SkipSingle);
QSKIP("DBMS doesn't support event notifications");
// Not subscribed to any events yet
QCOMPARE(driver->subscribedToNotifications().size(), 0);
@ -2067,7 +2067,7 @@ void tst_QSqlDatabase::eventNotificationPSQL()
CHECK_DATABASE(db);
#if defined(Q_OS_LINUX)
QSKIP( "Event support doesn't work on linux", SkipAll );
QSKIP( "Event support doesn't work on linux");
#endif
QSqlQuery query(db);
@ -2090,7 +2090,7 @@ void tst_QSqlDatabase::sqlite_bindAndFetchUInt()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
if (db.driverName().startsWith("QSQLITE2"))
QSKIP("SQLite3 specific test", SkipSingle);
QSKIP("SQLite3 specific test");
QSqlQuery q(db);
const QString tableName(qTableName("uint_test", __FILE__));
@ -2155,7 +2155,7 @@ void tst_QSqlDatabase::mysql_savepointtest()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 1 ).toDouble()<4.1 )
QSKIP( "Test requires MySQL >= 4.1", SkipSingle );
QSKIP( "Test requires MySQL >= 4.1");
QSqlQuery q(db);
QVERIFY_SQL(q, exec("begin"));
@ -2179,7 +2179,7 @@ void tst_QSqlDatabase::sqlite_enable_cache_mode()
{
QFETCH(QString, dbName);
if(dbName.endsWith(":memory:"))
QSKIP( "cache mode is meaningless for :memory: databases", SkipSingle );
QSKIP( "cache mode is meaningless for :memory: databases");
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
db.close();

2
tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
View File

@ -76,7 +76,7 @@ void tst_QSqlDriver::initTestCase_data()
{
dbs.open();
if (dbs.fillTestTable() == 0)
QSKIP("No database drivers are available in this Qt configuration", SkipAll);
QSKIP("No database drivers are available in this Qt configuration");
}
void tst_QSqlDriver::recreateTestTables(QSqlDatabase db)

76
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
View File

@ -294,9 +294,9 @@ void tst_QSqlQuery::generic_data(const QString& engine)
{
if ( dbs.fillTestTable(engine) == 0 ) {
if(engine.isEmpty())
QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
QSKIP( "No database drivers are available in this Qt configuration");
else
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
}
}
@ -428,14 +428,14 @@ void tst_QSqlQuery::char1SelectUnicode()
CHECK_DATABASE( db );
if(db.driverName().startsWith("QDB2"))
QSKIP("Needs someone with more Unicode knowledge than I have to fix", SkipSingle);
QSKIP("Needs someone with more Unicode knowledge than I have to fix");
if ( db.driver()->hasFeature( QSqlDriver::Unicode ) ) {
QString uniStr( QChar(0x0915) ); // DEVANAGARI LETTER KA
QSqlQuery q( db );
if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
QSKIP( "Test requires MySQL >= 5.0");
QString createQuery;
const QString char1SelectUnicode(qTableName( "char1SU", __FILE__ ));
@ -475,7 +475,7 @@ void tst_QSqlQuery::char1SelectUnicode()
QVERIFY( !q.next() );
}
else
QSKIP( "Database not unicode capable", SkipSingle );
QSKIP( "Database not unicode capable");
}
void tst_QSqlQuery::oraRowId()
@ -523,7 +523,7 @@ void tst_QSqlQuery::mysqlOutValues()
QSqlQuery q( db );
if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
QSKIP( "Test requires MySQL >= 5.0");
q.exec( "drop function " + hello );
@ -572,7 +572,7 @@ void tst_QSqlQuery::oraOutValues()
const QString tst_outValues(qTableName("tst_outValues", __FILE__));
if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
QSKIP( "Test requires prepared query support", SkipSingle );
QSKIP( "Test requires prepared query support");
QSqlQuery q( db );
@ -754,7 +754,7 @@ void tst_QSqlQuery::outValuesDB2()
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
QSKIP( "Test requires prepared query support", SkipSingle );
QSKIP( "Test requires prepared query support");
QSqlQuery q( db );
@ -791,7 +791,7 @@ void tst_QSqlQuery::outValues()
const QString tst_outValues(qTableName("tst_outValues", __FILE__));
if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
QSKIP( "Test requires prepared query support", SkipSingle );
QSKIP( "Test requires prepared query support");
QSqlQuery q( db );
@ -819,7 +819,7 @@ void tst_QSqlQuery::outValues()
"end\n" ) );
QVERIFY( q.prepare( "{call " + tst_outValues + "(?)}" ) );
} else
QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test", SkipSingle );
QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test");
q.addBindValue( 0, QSql::Out );
@ -838,7 +838,7 @@ void tst_QSqlQuery::blob()
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) )
QSKIP( "DBMS not BLOB capable", SkipSingle );
QSKIP( "DBMS not BLOB capable");
//don' make it too big otherwise sybase and mysql will complain
QByteArray ba( BLOBSIZE, 0 );
@ -994,7 +994,7 @@ void tst_QSqlQuery::numRowsAffected()
++i;
if ( q.numRowsAffected() == -1 || q.numRowsAffected() == 0 )
QSKIP("Database doesn't support numRowsAffected", SkipSingle);
QSKIP("Database doesn't support numRowsAffected");
if ( q.numRowsAffected() != -1 && q.numRowsAffected() != 0 && q.numRowsAffected() != i ) {
// the value is undefined for SELECT, this check is just here for curiosity
@ -1346,7 +1346,7 @@ void tst_QSqlQuery::bitField()
CHECK_DATABASE( db );
if ( !db.driverName().startsWith( "QTDS" ) )
QSKIP( "TDS specific test", SkipSingle );
QSKIP( "TDS specific test");
QSqlQuery q( db );
@ -1434,7 +1434,7 @@ void tst_QSqlQuery::precision()
static const char* precStr = "1.2345678901234567891";
if ( db.driverName().startsWith( "QIBASE" ) )
QSKIP( "DB unable to store high precision", SkipSingle );
QSKIP( "DB unable to store high precision");
{
// need a new scope for SQLITE
@ -1499,14 +1499,14 @@ void tst_QSqlQuery::nullResult()
void tst_QSqlQuery::transaction()
{
// query based transaction is not really possible with Qt
QSKIP( "only tested manually by trained staff", SkipAll );
QSKIP( "only tested manually by trained staff");
QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::Transactions ) )
QSKIP( "DBMS not transaction capable", SkipSingle );
QSKIP( "DBMS not transaction capable");
// this is the standard SQL
QString startTransactionStr( "start transaction" );
@ -1551,7 +1551,7 @@ void tst_QSqlQuery::transaction()
if ( !q.exec( "rollback" ) ) {
if ( db.driverName().startsWith( "QMYSQL" ) ) {
qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) ));
QSKIP( "MySQL transaction failed ", SkipSingle ); //non-fatal
QSKIP( "MySQL transaction failed "); //non-fatal
} else
QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) );
}
@ -1595,7 +1595,7 @@ void tst_QSqlQuery::joins()
|| db.driverName().startsWith( "QIBASE" ) )
// Oracle broken beyond recognition - cannot outer join on more than
// one table.
QSKIP( "DBMS cannot understand standard SQL", SkipSingle );
QSKIP( "DBMS cannot understand standard SQL");
QSqlQuery q( db );
@ -1657,9 +1657,9 @@ void tst_QSqlQuery::prepare_bind_exec()
const QString qtest_prepare(qTableName("qtest_prepare", __FILE__));
if(db.driverName().startsWith("QIBASE") && (db.databaseName() == "silence.nokia.troll.no:c:\\ibase\\testdb_ascii" || db.databaseName() == "/opt/interbase/qttest.gdb"))
QSKIP("Can't transliterate extended unicode to ascii", SkipSingle);
QSKIP("Can't transliterate extended unicode to ascii");
if(db.driverName().startsWith("QDB2"))
QSKIP("Needs someone with more Unicode knowledge than I have to fix", SkipSingle);
QSKIP("Needs someone with more Unicode knowledge than I have to fix");
{
// new scope for SQLITE
@ -1878,7 +1878,7 @@ void tst_QSqlQuery::sqlServerLongStrings()
CHECK_DATABASE( db );
if ( !tst_Databases::isSqlServer( db ) )
QSKIP( "SQL Server specific test", SkipSingle );
QSKIP( "SQL Server specific test");
QSqlQuery q( db );
@ -1963,7 +1963,7 @@ void tst_QSqlQuery::batchExec()
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::BatchOperations ) )
QSKIP( "Database can't do BatchOperations", SkipSingle );
QSKIP( "Database can't do BatchOperations");
QSqlQuery q( db );
const QString tableName = qTableName( "qtest_batch", __FILE__ );
@ -2018,7 +2018,7 @@ void tst_QSqlQuery::oraArrayBind()
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::BatchOperations ) )
QSKIP( "Database can't do BatchOperations", SkipSingle );
QSKIP( "Database can't do BatchOperations");
QSqlQuery q( db );
@ -2180,7 +2180,7 @@ void tst_QSqlQuery::lastInsertId()
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::LastInsertId ) )
QSKIP( "Database doesn't support lastInsertId", SkipSingle );
QSKIP( "Database doesn't support lastInsertId");
QSqlQuery q( db );
@ -2213,7 +2213,7 @@ void tst_QSqlQuery::bindWithDoubleColonCastOperator()
// Only PostgreSQL support the double-colon cast operator
if ( !db.driverName().startsWith( "QPSQL" ) )
QSKIP( "Test requires PostgreSQL", SkipSingle );
QSKIP( "Test requires PostgreSQL");
const QString tablename(qTableName( "bindtest", __FILE__ ));
@ -2281,7 +2281,7 @@ void tst_QSqlQuery::createQueryOnClosedDatabase()
&& !db.driverName().startsWith( "QOCI" )
&& !db.driverName().startsWith( "QMYSQL" )
&& !db.driverName().startsWith( "QDB2" ) )
QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2", SkipSingle );
QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2");
db.close();
@ -2367,10 +2367,10 @@ void tst_QSqlQuery::sqlite_finish()
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
if (db.driverName() != QLatin1String("QSQLITE"))
QSKIP("Sqlite3 specific test", SkipSingle);
QSKIP("Sqlite3 specific test");
if ( db.databaseName().startsWith( ':' ) )
QSKIP( "This test requires a database on the filesystem, not in-memory", SkipAll );
QSKIP( "This test requires a database on the filesystem, not in-memory");
{
QSqlDatabase db2 = QSqlDatabase::addDatabase( "QSQLITE", "sqlite_finish_sqlite" );
@ -2412,12 +2412,12 @@ void tst_QSqlQuery::nextResult()
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::MultipleResultSets ) || !db.driver()->hasFeature( QSqlDriver::BatchOperations ) )
QSKIP( "DBMS does not support multiple result sets or batch operations", SkipSingle );
QSKIP( "DBMS does not support multiple result sets or batch operations");
QSqlQuery q( db );
if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
QSKIP( "Test requires MySQL >= 5.0");
enum DriverType { ODBC, MYSQL, DB2 };
DriverType driverType = ODBC;
@ -2607,7 +2607,7 @@ void tst_QSqlQuery::blobsPreparedQuery()
CHECK_DATABASE( db );
if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) || !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
QSKIP( "DBMS does not support BLOBs or prepared queries", SkipSingle );
QSKIP( "DBMS does not support BLOBs or prepared queries");
const QString tableName(qTableName( "blobstest", __FILE__ ));
@ -2712,7 +2712,7 @@ void tst_QSqlQuery::task_250026()
if ( !q.exec( "create table " + tableName + " (longfield varchar(1100))" ) ) {
qDebug() << "Error" << q.lastError();
QSKIP( "Db doesn't support \"1100\" as a size for fields", SkipSingle );
QSKIP( "Db doesn't support \"1100\" as a size for fields");
}
data258.fill( 'A', 258 );
@ -2853,7 +2853,7 @@ void tst_QSqlQuery::sqlServerReturn0()
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
if (!tst_Databases::isSqlServer( db ))
QSKIP("SQL Server specific test", SkipSingle);
QSKIP("SQL Server specific test");
const QString tableName(qTableName("test141895", __FILE__)), procName(qTableName("test141895_proc", __FILE__));
QSqlQuery q( db );
@ -3001,7 +3001,7 @@ void tst_QSqlQuery::QTBUG_6618()
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
if (!tst_Databases::isSqlServer( db ))
QSKIP("SQL Server specific test", SkipSingle);
QSKIP("SQL Server specific test");
QSqlQuery q(db);
q.exec( "drop procedure " + qTableName( "tst_raiseError", __FILE__ ) ); //non-fatal
@ -3023,7 +3023,7 @@ void tst_QSqlQuery::QTBUG_6852()
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
QSKIP( "Test requires MySQL >= 5.0");
QSqlQuery q(db);
const QString tableName(qTableName("bug6852", __FILE__)), procName(qTableName("bug6852_proc", __FILE__));
@ -3057,7 +3057,7 @@ void tst_QSqlQuery::QTBUG_5765()
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 1 ).toFloat()<4.1 )
QSKIP( "Test requires MySQL >= 4.1", SkipSingle );
QSKIP( "Test requires MySQL >= 4.1");
QSqlQuery q(db);
const QString tableName(qTableName("bug5765", __FILE__));
@ -3199,7 +3199,7 @@ void tst_QSqlQuery::sqlite_constraint()
CHECK_DATABASE( db );
if (db.driverName() != QLatin1String("QSQLITE"))
QSKIP("Sqlite3 specific test", SkipSingle);
QSKIP("Sqlite3 specific test");
QSqlQuery q(db);
const QString trigger(qTableName("test_constraint", __FILE__));
@ -3222,7 +3222,7 @@ void tst_QSqlQuery::benchmark()
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
QSKIP( "Test requires MySQL >= 5.0");
QSqlQuery q(db);
const QString tableName(qTableName("benchmark", __FILE__));

18
tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
View File

@ -291,9 +291,9 @@ void tst_QSqlThread::generic_data(const QString& engine)
{
if ( dbs.fillTestTable(engine) == 0 ) {
if(engine.isEmpty())
QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
QSKIP( "No database drivers are available in this Qt configuration");
else
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
}
}
@ -380,7 +380,7 @@ void tst_QSqlThread::simpleThreading()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
QSKIP("does not work with in-memory databases", SkipSingle);
QSKIP("does not work with in-memory databases");
QtTestSqlThread t1(db);
QtTestSqlThread t2(db);
@ -404,9 +404,9 @@ void tst_QSqlThread::readWriteThreading()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
QSKIP("does not work with in-memory databases", SkipSingle);
QSKIP("does not work with in-memory databases");
else if (tst_Databases::isMSAccess(db))
QSKIP("does not work with MS Access databases", SkipSingle);
QSKIP("does not work with MS Access databases");
SqlProducer producer(db);
SqlConsumer consumer(db);
@ -432,7 +432,7 @@ void tst_QSqlThread::readFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
QSKIP("does not work with in-memory databases", SkipSingle);
QSKIP("does not work with in-memory databases");
QObject cleanupHelper; // make sure the threads die when we exit the scope
for (int i = 0; i < maxThreadCount; ++i) {
@ -454,7 +454,7 @@ void tst_QSqlThread::readWriteFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
QSKIP("does not work with in-memory databases", SkipSingle);
QSKIP("does not work with in-memory databases");
QObject cleanupHelper;
for (int i = 0; i < maxThreadCount; ++i) {
@ -480,7 +480,7 @@ void tst_QSqlThread::preparedReadWriteFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
QSKIP("does not work with in-memory databases", SkipSingle);
QSKIP("does not work with in-memory databases");
QObject cleanupHelper;
for (int i = 0; i < maxThreadCount; ++i) {
@ -506,7 +506,7 @@ void tst_QSqlThread::transactionsFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
QSKIP("does not work with in-memory databases", SkipSingle);
QSKIP("does not work with in-memory databases");
// start and commit a transaction
QVERIFY_SQL(db, db.transaction());

6
tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
View File

@ -213,9 +213,9 @@ void tst_QSqlQueryModel::generic_data(const QString& engine)
{
if ( dbs.fillTestTable(engine) == 0 ) {
if(engine.isEmpty())
QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
QSKIP( "No database drivers are available in this Qt configuration");
else
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
}
}
@ -512,7 +512,7 @@ void tst_QSqlQueryModel::withSortFilterProxyModel()
CHECK_DATABASE(db);
if (db.driver()->hasFeature(QSqlDriver::QuerySize))
QSKIP("Test applies only for drivers not reporting the query size.", SkipSingle);
QSKIP("Test applies only for drivers not reporting the query size.");
QSqlQueryModel model;
model.setQuery(QSqlQuery("SELECT * FROM " + qTableName("test3", __FILE__), db));

10
tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
View File

@ -103,7 +103,7 @@ void tst_QSqlRelationalTableModel::initTestCase_data()
{
dbs.open();
if (dbs.fillTestTable() == 0)
QSKIP("No database drivers are available in this Qt configuration", SkipAll);
QSKIP("No database drivers are available in this Qt configuration");
}
void tst_QSqlRelationalTableModel::recreateTestTables(QSqlDatabase db)
@ -1086,7 +1086,7 @@ void tst_QSqlRelationalTableModel::casing()
CHECK_DATABASE(db);
if (db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QIBASE") || tst_Databases::isSqlServer(db))
QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll);
QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities");
QSqlQuery q(db);
QVERIFY_SQL( q, exec("create table " + qTableName("CASETEST1", db.driver()).toUpper() +
@ -1094,7 +1094,7 @@ void tst_QSqlRelationalTableModel::casing()
if( !q.exec("create table " + qTableName("casetest1", db.driver()) +
" (ident int not null primary key, name varchar(20), title_key int)"))
QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll);
QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities");
QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(1, 'harry', 1, 2)"));
QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(2, 'trond', 2, 1)"));
@ -1364,7 +1364,7 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers()
CHECK_DATABASE(db);
if (!testWhiteSpaceNames(db.driverName()))
QSKIP("White space test irrelevant for driver", SkipAll);
QSKIP("White space test irrelevant for driver");
QSqlRelationalTableModel model(0, db);
model.setTable(db.driver()->escapeIdentifier(qTableName("rel", __FILE__)+" test6", QSqlDriver::TableName));
model.setSort(0, Qt::DescendingOrder);
@ -1448,7 +1448,7 @@ void tst_QSqlRelationalTableModel::psqlSchemaTest()
CHECK_DATABASE(db);
if(!tst_Databases::isPostgreSQL(db))
QSKIP("Postgresql specific test", SkipSingle);
QSKIP("Postgresql specific test");
QSqlRelationalTableModel model(0, db);
QSqlQuery q(db);

12
tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
View File

@ -233,9 +233,9 @@ void tst_QSqlTableModel::generic_data(const QString &engine)
{
if ( dbs.fillTestTable(engine) == 0 ) {
if (engine.isEmpty())
QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
QSKIP( "No database drivers are available in this Qt configuration");
else
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
}
}
@ -243,9 +243,9 @@ void tst_QSqlTableModel::generic_data_with_strategies(const QString &engine)
{
if ( dbs.fillTestTableWithStrategies(engine) == 0 ) {
if (engine.isEmpty())
QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
QSKIP( "No database drivers are available in this Qt configuration");
else
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
}
}
@ -961,7 +961,7 @@ void tst_QSqlTableModel::whitespaceInIdentifiers()
CHECK_DATABASE(db);
if (!testWhiteSpaceNames(db.driverName()))
QSKIP("DBMS doesn't support whitespaces in identifiers", SkipSingle);
QSKIP("DBMS doesn't support whitespaces in identifiers");
QString tableName = qTableName("qtestw hitespace", db.driver());
@ -1221,7 +1221,7 @@ void tst_QSqlTableModel::sqlite_attachedDatabase()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
if(db.databaseName() == ":memory:")
QSKIP(":memory: database, skipping test", SkipSingle);
QSKIP(":memory: database, skipping test");
QSqlDatabase attachedDb = QSqlDatabase::cloneDatabase(db, db.driverName() + QLatin1String("attached"));
attachedDb.setDatabaseName(db.databaseName()+QLatin1String("attached.dat"));

2
tests/auto/tools/uic/tst_uic.cpp
View File

@ -110,7 +110,7 @@ void tst_uic::initTestCase()
void tst_uic::run()
{
if (!uicExists)
QSKIP("uic not found in the path...", SkipAll);
QSKIP("uic not found in the path...");
QFETCH(QString, originalFile);
QFETCH(QString, generatedFile);

2
tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
View File

@ -68,7 +68,7 @@ private slots:
#if defined(QT_NO_PRINTER) || defined(QT_NO_PRINTDIALOG)
void tst_QAbstractPrintDialog::initTestCase()
{
QSKIP("This test requires printing and print dialog support", SkipAll);
QSKIP("This test requires printing and print dialog support");
}
#else

3
tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
View File

@ -458,8 +458,7 @@ void tst_QDialog::throwInExec()
qPrintable(QString(
"Throwing exceptions in exec() won't work if %1 event dispatcher is used.\n"
"Try running with QT_NO_GLIB=1 in environment."
).arg(QString::fromLatin1(dispatcher))),
SkipAll
).arg(QString::fromLatin1(dispatcher)))
);
}
#endif

2
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
View File

@ -565,7 +565,7 @@ void tst_QFileDialog2::completionOnLevelAfterRoot()
fd.setDirectory("/");
QDir etc("/etc");
if (!etc.exists())
QSKIP("This test requires to have an etc directory under /", SkipAll);
QSKIP("This test requires to have an etc directory under /");
#endif
fd.show();
QLineEdit *edit = qFindChild<QLineEdit*>(&fd, "fileNameEdit");

4
tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
View File

@ -450,7 +450,7 @@ void tst_QFileSystemModel::rowsInserted_data()
void tst_QFileSystemModel::rowsInserted()
{
#if defined(Q_OS_WINCE)
QSKIP("Watching directories does not work on CE(see #137910)", SkipAll);
QSKIP("Watching directories does not work on CE(see #137910)");
#endif
QString tmp = flatDirTestPath;
rowCount();
@ -505,7 +505,7 @@ void tst_QFileSystemModel::rowsRemoved_data()
void tst_QFileSystemModel::rowsRemoved()
{
#if defined(Q_OS_WINCE)
QSKIP("Watching directories does not work on CE(see #137910)", SkipAll);
QSKIP("Watching directories does not work on CE(see #137910)");
#endif
QString tmp = flatDirTestPath;
rowCount();

4
tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
View File

@ -989,7 +989,7 @@ void tst_QWizard::setOption_IndependentPages()
void tst_QWizard::setOption_IgnoreSubTitles()
{
#if defined(Q_OS_WINCE)
QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)", SkipAll);
QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)");
#endif
QWizard wizard1;
wizard1.setButtonLayout(QList<QWizard::WizardButton>() << QWizard::CancelButton);
@ -1087,7 +1087,7 @@ void tst_QWizard::setOption_IgnoreSubTitles()
void tst_QWizard::setOption_ExtendedWatermarkPixmap()
{
#if defined(Q_OS_WINCE)
QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)", SkipAll);
QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)");
#endif
QPixmap watermarkPixmap(200, 400);
watermarkPixmap.fill(Qt::black);

4
tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
View File

@ -423,7 +423,7 @@ void tst_QGraphicsEffect::opacity()
void tst_QGraphicsEffect::grayscale()
{
if (qApp->desktop()->depth() < 24)
QSKIP("Test only works on 32 bit displays", SkipAll);
QSKIP("Test only works on 32 bit displays");
QGraphicsScene scene(0, 0, 100, 100);
@ -470,7 +470,7 @@ void tst_QGraphicsEffect::grayscale()
void tst_QGraphicsEffect::colorize()
{
if (qApp->desktop()->depth() < 24)
QSKIP("Test only works on 32 bit displays", SkipAll);
QSKIP("Test only works on 32 bit displays");
QGraphicsScene scene(0, 0, 100, 100);

5
tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
View File

@ -1675,9 +1675,8 @@ void tst_QGraphicsAnchorLayout::floatConflict()
void tst_QGraphicsAnchorLayout::infiniteMaxSizes()
{
if (sizeof(qreal) <= 4) {
QSKIP("qreal has too little precision, result will be wrong", SkipAll);
}
if (sizeof(qreal) <= 4)
QSKIP("qreal has too little precision, result will be wrong");
QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
l->setContentsMargins(0, 0, 0, 0);
l->setSpacing(0);

6
tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
View File

@ -1059,7 +1059,7 @@ void tst_QGraphicsGridLayout::horizontalSpacing()
qreal new_w = layout->sizeHint(Qt::PreferredSize, QSizeF()).width();
QCOMPARE(new_w, w - (3-1)*(oldSpacing - horizontalSpacing));
} else {
QSKIP("The current style uses non-uniform layout spacing", SkipAll);
QSKIP("The current style uses non-uniform layout spacing");
}
delete widget;
}
@ -1645,7 +1645,7 @@ void tst_QGraphicsGridLayout::setSpacing()
QCOMPARE(newSH.height(), sh.height() - (2-1)*(oldVSpacing - spacing));
QCOMPARE(newSH.width(), sh.width() - (3-1)*(oldHSpacing - spacing));
} else {
QSKIP("The current style uses non-uniform layout spacing", SkipAll);
QSKIP("The current style uses non-uniform layout spacing");
}
delete widget;
}
@ -1759,7 +1759,7 @@ void tst_QGraphicsGridLayout::verticalSpacing()
qreal new_h = layout->sizeHint(Qt::PreferredSize, QSizeF()).height();
QCOMPARE(new_h, h - (2-1)*(oldSpacing - verticalSpacing));
} else {
QSKIP("The current style uses non-uniform layout spacing", SkipAll);
QSKIP("The current style uses non-uniform layout spacing");
}
delete widget;
}

20
tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
View File

@ -80,7 +80,7 @@ Q_DECLARE_METATYPE(QRectF)
#include <windows.h>
#define Q_CHECK_PAINTEVENTS \
if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \
QSKIP("The Graphics View doesn't get the paint events", SkipSingle);
QSKIP("The Graphics View doesn't get the paint events");
#else
#define Q_CHECK_PAINTEVENTS
#endif
@ -2393,9 +2393,8 @@ void tst_QGraphicsItem::shape()
void tst_QGraphicsItem::contains()
{
if (sizeof(qreal) != sizeof(double)) {
QSKIP("Skipped due to rounding errors", SkipAll);
}
if (sizeof(qreal) != sizeof(double))
QSKIP("Skipped due to rounding errors");
// Rect
QGraphicsRectItem rect(QRectF(-10, -10, 20, 20));
@ -2673,9 +2672,8 @@ protected:
void tst_QGraphicsItem::isObscured()
{
if (sizeof(qreal) != sizeof(double)) {
QSKIP("Skipped due to rounding errors", SkipAll);
}
if (sizeof(qreal) != sizeof(double))
QSKIP("Skipped due to rounding errors");
OpaqueItem *item1 = new OpaqueItem;
item1->setRect(0, 0, 100, 100);
@ -5086,7 +5084,7 @@ void tst_QGraphicsItem::paint()
#ifdef Q_OS_WIN32
//we try to switch the desktop: if it fails, we skip the test
if (::SwitchDesktop( ::GetThreadDesktop( ::GetCurrentThreadId() ) ) == 0) {
QSKIP("The Graphics View doesn't get the paint events", SkipSingle);
QSKIP("The Graphics View doesn't get the paint events");
}
#endif
@ -5827,7 +5825,7 @@ void tst_QGraphicsItem::itemClippingDiscovery()
// The rect items are no longer visible at these points.
QCOMPARE(scene.itemAt(10, 10), (QGraphicsItem *)0);
if (sizeof(qreal) != sizeof(double))
QSKIP("This fails due to internal rounding errors", SkipSingle);
QSKIP("This fails due to internal rounding errors");
QCOMPARE(scene.itemAt(90, 90), (QGraphicsItem *)0);
}
@ -8112,7 +8110,7 @@ void tst_QGraphicsItem::sorting_data()
void tst_QGraphicsItem::sorting()
{
if (PlatformQuirks::isAutoMaximizing())
QSKIP("Skipped because Platform is auto maximizing", SkipAll);
QSKIP("Skipped because Platform is auto maximizing");
_paintedItems.clear();
@ -10516,7 +10514,7 @@ public:
void tst_QGraphicsItem::updateMicroFocus()
{
#if defined Q_OS_WIN || defined Q_OS_MAC
QSKIP("QTBUG-9578", SkipAll);
QSKIP("QTBUG-9578");
#endif
QGraphicsScene scene;
QWidget parent;

4
tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
View File

@ -952,7 +952,7 @@ void tst_QGraphicsLinearLayout::setSpacing()
QCOMPARE(oldSizeHint.width() - oldSpacing * 2, newSizeHint.width() - spacing * 2);
} else {
QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)", SkipAll);
QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)");
}
delete widget;
}
@ -998,7 +998,7 @@ void tst_QGraphicsLinearLayout::setItemSpacing()
if (oldSpacing >= 0) {
QCOMPARE(newSizeHint.width() - spacing, oldSizeHint.width() - oldSpacing);
} else {
QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)", SkipAll);
QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)");
}
delete widget;
}

12
tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
View File

@ -1039,7 +1039,7 @@ void tst_QGraphicsProxyWidget::hoverMoveEvent()
QFETCH(bool, mouseTracking);
QFETCH(bool, mouseDown);
QSKIP("Ambiguous test...", SkipAll);
QSKIP("Ambiguous test...");
// proxy should translate the move events to what the widget would expect
@ -1362,7 +1362,7 @@ void tst_QGraphicsProxyWidget::sizeHint()
QFETCH(QSizeF, constraint);
QFETCH(QSizeF, sizeHint);
QFETCH(bool, hasWidget);
QSKIP("Broken test", SkipAll);
QSKIP("Broken test");
SubQGraphicsProxyWidget proxy;
QWidget *widget = new QWidget;
if (hasWidget)
@ -2486,7 +2486,7 @@ void tst_QGraphicsProxyWidget::popup_basic()
opt.initFrom(box);
opt.editable = box->isEditable();
if (box->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt))
QSKIP("Does not work due to SH_Combobox_Popup", SkipAll);
QSKIP("Does not work due to SH_Combobox_Popup");
QCOMPARE(child->widget()->parent(), static_cast<QObject*>(box));
QTRY_COMPARE(proxy->pos(), QPointF(box->pos()));
@ -2539,7 +2539,7 @@ void tst_QGraphicsProxyWidget::popup_subwidget()
opt.initFrom(box);
opt.editable = box->isEditable();
if (box->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt))
QSKIP("Does not work due to SH_Combobox_Popup", SkipAll);
QSKIP("Does not work due to SH_Combobox_Popup");
QGraphicsProxyWidget *child = (QGraphicsProxyWidget*)(groupBoxProxy->childItems())[0];
QWidget *popup = child->widget();
QCOMPARE(popup->parent(), static_cast<QObject*>(box));
@ -2675,7 +2675,7 @@ void tst_QGraphicsProxyWidget::childPos_data()
void tst_QGraphicsProxyWidget::childPos()
{
#ifdef Q_OS_IRIX
QSKIP("This test is not reliable on IRIX.", SkipAll);
QSKIP("This test is not reliable on IRIX.");
#endif
QFETCH(bool, moveCombo);
QFETCH(QPoint, comboPos);
@ -3630,7 +3630,7 @@ public slots:
void tst_QGraphicsProxyWidget::QTBUG_6986_sendMouseEventToAlienWidget()
{
#if defined(Q_OS_MAC) || defined(Q_OS_WIN) || defined(QT_NO_CURSOR)
QSKIP("Test case unstable on this platform", SkipAll);
QSKIP("Test case unstable on this platform");
#endif
QGraphicsView view;
Scene scene;

2
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
View File

@ -56,7 +56,7 @@
#include <windows.h>
#define Q_CHECK_PAINTEVENTS \
if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \
QSKIP("The Graphics View doesn't get the paint events", SkipSingle);
QSKIP("The Graphics View doesn't get the paint events");
#else
#define Q_CHECK_PAINTEVENTS
#endif

12
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -1624,9 +1624,9 @@ void tst_QGraphicsView::itemAt2()
QVERIFY(view.itemAt(itemViewPoint + QPoint(0, -1)));
QVERIFY(!view.items(itemViewPoint + QPoint(0, -1)).isEmpty());
if (sizeof(qreal) != sizeof(double)) {
QSKIP("Skipped due to rounding errors", SkipAll);
}
if (sizeof(qreal) != sizeof(double))
QSKIP("Skipped due to rounding errors");
// Not here
QVERIFY(!view.itemAt(itemViewPoint + QPoint(-1, 0)));
QVERIFY(view.items(itemViewPoint + QPoint(-1, 0)).isEmpty());
@ -2062,7 +2062,7 @@ void tst_QGraphicsView::wheelEvent()
void tst_QGraphicsView::cursor()
{
if (PlatformQuirks::haveMouseCursor())
QSKIP("The Platform does not have regular cursor support", SkipAll);
QSKIP("The Platform does not have regular cursor support");
QGraphicsScene scene;
QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20));
@ -2090,7 +2090,7 @@ void tst_QGraphicsView::cursor()
void tst_QGraphicsView::cursor2()
{
if (PlatformQuirks::haveMouseCursor())
QSKIP("The Platform does not have regular cursor support", SkipAll);
QSKIP("The Platform does not have regular cursor support");
QGraphicsScene scene;
QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20));
@ -2710,7 +2710,7 @@ void tst_QGraphicsView::scrollBarRanges()
#if !defined(QT_NO_STYLE_MOTIF)
view.setStyle(new QMotifStyle);
#else
QSKIP("No Motif style compiled.", SkipSingle);
QSKIP("No Motif style compiled.");
#endif
} else {
#if defined(Q_OS_WINCE)

8
tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
View File

@ -735,7 +735,7 @@ void tst_QAbstractItemView::persistentEditorFocus()
Qt::LeftButton, Qt::NoModifier);
qApp->sendEvent(list.at(i), &mouseEvent);
if (!qApp->focusWidget())
QSKIP("Some window managers don't handle focus that well", SkipAll);
QSKIP("Some window managers don't handle focus that well");
QTRY_COMPARE(qApp->focusWidget(), static_cast<QWidget *>(list.at(i)));
}
}
@ -890,7 +890,7 @@ void tst_QAbstractItemView::dragAndDrop()
// From Task 137729
#ifdef Q_WS_QWS
QSKIP("Embedded drag-and-drop not good enough yet...", SkipAll);
QSKIP("Embedded drag-and-drop not good enough yet...");
#endif
const int attempts = 10;
@ -933,7 +933,7 @@ void tst_QAbstractItemView::dragAndDrop()
void tst_QAbstractItemView::dragAndDropOnChild()
{
#ifdef Q_WS_QWS
QSKIP("Embedded drag-and-drop not good enough yet...", SkipAll);
QSKIP("Embedded drag-and-drop not good enough yet...");
#endif
const int attempts = 10;
@ -1230,7 +1230,7 @@ void tst_QAbstractItemView::task250754_fontChange()
void tst_QAbstractItemView::task200665_itemEntered()
{
#ifdef Q_OS_WINCE_WM
QSKIP("On Windows Mobile the mouse tracking is unavailable at the moment", SkipAll);
QSKIP("On Windows Mobile the mouse tracking is unavailable at the moment");
#endif
//we test that view will emit entered
//when the scrollbar move but not the mouse itself

5
tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
View File

@ -597,9 +597,8 @@ void tst_QColumnView::clicked()
QCOMPARE(clickedSpy.count(), 1);
qApp->processEvents();
if (sizeof(qreal) != sizeof(double)) {
QSKIP("Skipped due to rounding errors", SkipAll);
}
if (sizeof(qreal) != sizeof(double))
QSKIP("Skipped due to rounding errors");
for (int i = 0; i < view.createdColumns.count(); ++i) {
QAbstractItemView *column = view.createdColumns.at(i);

2
tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
View File

@ -72,7 +72,7 @@ Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint)
#include <windows.h>
#define Q_CHECK_PAINTEVENTS \
if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \
QSKIP("The widgets don't get the paint events", SkipSingle);
QSKIP("The widgets don't get the paint events");
#else
#define Q_CHECK_PAINTEVENTS
#endif

2
tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
View File

@ -511,7 +511,7 @@ void tst_QItemView::resize_data()
*/
void tst_QItemView::resize()
{
QSKIP("This test needs to be re-thought out, it takes too long and doesn't really catch the problem.", SkipAll);
QSKIP("This test needs to be re-thought out, it takes too long and doesn't really catch the problem.");
QFETCH(QString, viewType);
QFETCH(int, vscroll);

2
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
View File

@ -3347,7 +3347,7 @@ QT_END_NAMESPACE
void tst_QTableView::tabFocus()
{
if (!qt_tab_all_widgets)
QSKIP("This test requires full keyboard control to be enabled.", SkipAll);
QSKIP("This test requires full keyboard control to be enabled.");
// QTableView enables tabKeyNavigation by default, but you should be able
// to change focus on an empty table view, or on a table view that doesn't

2
tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
View File

@ -2953,7 +2953,7 @@ void tst_QTreeWidget::defaultRowSizes()
}
QPixmap icon = tw->style()->standardPixmap((QStyle::StandardPixmap)(i + QStyle::SP_TitleBarMenuButton));
if (icon.isNull())
QSKIP("No pixmap found on current style, skipping this test.", SkipSingle);
QSKIP("No pixmap found on current style, skipping this test.");
it->setIcon(tw->columnCount() - 1,
icon.scaled(tw->iconSize()));
}

2
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -339,7 +339,7 @@ void tst_QApplication::nonGui()
{
#ifdef Q_OS_HPUX
// ### This is only to allow us to generate a test report for now.
QSKIP("This test shuts down the window manager on HP-UX.", SkipAll);
QSKIP("This test shuts down the window manager on HP-UX.");
#endif
int argc = 0;

Some files were not shown because too many files have changed in this diff Show More