diff options
Diffstat (limited to 'tests/auto/gui/painting')
6 files changed, 24 insertions, 31 deletions
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 } |