diff options
Diffstat (limited to 'tests/auto/gui')
17 files changed, 116 insertions, 157 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index 35be4ae04f..5fac4739e2 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -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"); diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index a144fdb3fc..e2da34dd6e 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -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()); } } diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index d36a7bba39..4f9ec0dfb1 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -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 diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 996bd6c017..5ff764378a 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -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 diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index 88506e66a6..bdcfb00ba1 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -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()"; diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 70674aa29a..e8e3f998e0 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -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); diff --git a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp index 5a7c803eea..6acaf5e5c3 100644 --- a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp +++ b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp @@ -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); diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp index 508d0ea628..43524649ae 100644 --- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp +++ b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp @@ -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"); diff --git a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp index 297664978e..e039347801 100644 --- a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp @@ -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; diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp index f8319c9e13..741b7f1680 100644 --- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp +++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp @@ -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); diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp index 06abc5a68c..32084df61f 100644 --- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp +++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp @@ -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 } diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 4e8085811d..822b5275da 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -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"); diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index d21c673b6d..3566342f00 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -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); diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index af6d822666..c3b942f331 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -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); diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index 4db01c91a2..256ea20a1c 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -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() diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index e8889f55c6..17955b36f2 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -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(); diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index 4f9beb6f19..0149a0a0a0 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -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)); |