diff options
Diffstat (limited to 'tests/auto/widgets')
46 files changed, 129 insertions, 142 deletions
diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp index 5d6165d174..5973dabb99 100644 --- a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -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 diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 0f4acdcc9e..78458d4531 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -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 diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index a2d18eb847..056d748c93 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -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"); diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 26fa58e649..9c587ea1f5 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -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(); diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 2e05eb5bab..107ddd53aa 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -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); diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index 2d9d87a2c5..0bc85bffdc 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -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); diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 5dbe501ea8..6bf2f0b733 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -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); diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index e9d9cb67bb..5d9d4afcb6 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -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; } diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 8ac1f6b5c5..634f6826c9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -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; diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 873a711127..9769ff0da4 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -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; } diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 78c545e25a..0e86c0ab48 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -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; diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 9ac1573b2a..db44876fd8 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -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 diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 0a404cab46..e41c378350 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -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) diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index b9c652f1d3..4d530a353b 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -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 diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index 364f917511..218c974365 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -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); diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index e419a7f097..df053975af 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -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 diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp index 4c64d4c52a..d4cf3944c1 100644 --- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp +++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp @@ -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); diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 2242490a44..de76768d24 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -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 diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 5e1faf97c4..71a82cf2bb 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -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())); } diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index c37dfc609e..80c1bdb202 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -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; diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 100b7eb892..11f0cfc7fb 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -724,7 +724,7 @@ void tst_QGridLayout::spacingsAndMargins() QSize minimumsize = vbox.totalMinimumSize(); if (topsize.width() < minimumsize.width() || topsize.height() < minimumsize.height()) - QSKIP("The screen is too small to run this test case", SkipSingle); + QSKIP("The screen is too small to run this test case"); // We are relying on the order here... for (int pi = 0; pi < sizehinters.count(); ++pi) { @@ -869,7 +869,7 @@ void tst_QGridLayout::minMaxSize() }else{ style = QStyleFactory::create(stylename); if (!style) { - QSKIP( qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename)), SkipSingle); + QSKIP( qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename))); } } QApplication::setStyle(style); diff --git a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp index 7450549f47..1b8907b1be 100644 --- a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp +++ b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp @@ -60,7 +60,7 @@ private slots: void tst_QSound::checkFinished() { #if defined(Q_WS_QPA) - QSKIP("QSound is not implemented on Lighthouse", SkipAll); + QSKIP("QSound is not implemented on Lighthouse"); #else QSound sound(SRCDIR"4.wav"); sound.setLoops(3); @@ -76,7 +76,7 @@ void tst_QSound::checkFinished() void tst_QSound::staticPlay() { - QSKIP("Test disabled -- only for manual purposes", SkipAll); + QSKIP("Test disabled -- only for manual purposes"); #if !defined(Q_WS_QPA) // Check that you hear sound with static play also. QSound::play(SRCDIR"4.wav"); diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp index de734877d7..66a8fe24a8 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp +++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp @@ -291,7 +291,7 @@ void tst_QStackedLayout::removeWidget() if (QApplication::focusWidget() == top) break; else if (i >= 5) - QSKIP("Can't get focus", SkipSingle); + QSKIP("Can't get focus"); QTest::qWait(100); ++i; } diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index ded0c5e061..e92389ff62 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -108,7 +108,7 @@ static HWND winHandleOf(const QWidget *w) # if !defined(Q_OS_WINCE) #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("desktop is not visible, this test would fail", SkipSingle); + QSKIP("desktop is not visible, this test would fail"); # else # define Q_CHECK_PAINTEVENTS # endif @@ -2407,7 +2407,7 @@ void tst_QWidget::hideWhenFocusWidgetIsChild() QString actualFocusWidget, expectedFocusWidget; #ifdef Q_WS_X11 if (!qApp->focusWidget()) - QSKIP("Your window manager is too broken for this test", SkipAll); + QSKIP("Your window manager is too broken for this test"); #endif QVERIFY(qApp->focusWidget()); actualFocusWidget.sprintf("%p %s %s", qApp->focusWidget(), qApp->focusWidget()->objectName().toLatin1().constData(), qApp->focusWidget()->metaObject()->className()); @@ -2551,7 +2551,7 @@ void tst_QWidget::setGeometry() tlw.show(); QTest::qWait(50); if (tlw.frameGeometry() != tlw.geometry()) - QSKIP("Your window manager is too broken for this test", SkipAll); + QSKIP("Your window manager is too broken for this test"); QCOMPARE(tlw.geometry(), tr); } @@ -2689,7 +2689,7 @@ void tst_QWidget::raise() #ifdef Q_OS_MAC if (child1->internalWinId()) { - QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events.", SkipAll); + QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events."); } #endif @@ -2718,7 +2718,7 @@ void tst_QWidget::raise() int expectedPaintEvents = child == child2 ? 1 : 0; int expectedZOrderChangeEvents = child == child2 ? 1 : 0; #ifdef Q_OS_MAC - QSKIP("Not yet sure why this fails.", SkipSingle); + QSKIP("Not yet sure why this fails."); #endif QTRY_COMPARE(child->numPaintEvents, expectedPaintEvents); QCOMPARE(child->numZOrderChangeEvents, expectedZOrderChangeEvents); @@ -3766,7 +3766,7 @@ void tst_QWidget::optimizedResizeMove() void tst_QWidget::optimizedResize_topLevel() { #if defined(Q_WS_MAC) || defined(Q_WS_QWS) - QSKIP("We do not yet have static contents support for *top-levels* on this platform", SkipAll); + QSKIP("We do not yet have static contents support for *top-levels* on this platform"); #endif StaticWidget topLevel; @@ -3835,7 +3835,7 @@ void tst_QWidget::childDeletesItsSibling() do { \ QSize safeSize(qt_screen->width() - 250, qt_screen->height() - 250); \ if (!safeSize.isValid()) \ - QSKIP("Screen size too small", SkipAll); \ + QSKIP("Screen size too small"); \ if (defaultSize.width() > safeSize.width() || defaultSize.height() > safeSize.height()) { \ defaultSize = safeSize; \ w.resize(defaultSize); \ @@ -6575,9 +6575,8 @@ void tst_QWidget::render_windowOpacity() QPixmap expected(child.size()); #ifdef Q_WS_X11 - if (expected.depth() < 24) { - QSKIP("This test won't give correct results with dithered pixmaps", SkipAll); - } + if (expected.depth() < 24) + QSKIP("This test won't give correct results with dithered pixmaps"); #endif expected.fill(Qt::green); QPainter painter(&expected); @@ -7661,7 +7660,7 @@ void tst_QWidget::sendUpdateRequestImmediately() { #ifdef Q_WS_MAC if (!QApplicationPrivate::graphicsSystem()) - QSKIP("We only send update requests on the Mac when passing -graphicssystem", SkipAll); + QSKIP("We only send update requests on the Mac when passing -graphicssystem"); #endif UpdateWidget updateWidget; @@ -7687,7 +7686,7 @@ void tst_QWidget::doubleRepaint() { #if defined(Q_WS_MAC) if (!macHasAccessToWindowsServer()) - QSKIP("Not having window server access causes the wrong number of repaints to be issues", SkipAll); + QSKIP("Not having window server access causes the wrong number of repaints to be issues"); #endif UpdateWidget widget; widget.setFocusPolicy(Qt::StrongFocus); @@ -9035,7 +9034,7 @@ void tst_QWidget::inputFocus_task257832() QLineEdit *widget = new QLineEdit; QInputContext *context = widget->inputContext(); if (!context) - QSKIP("No input context", SkipSingle); + QSKIP("No input context"); widget->setFocus(); widget->winId(); // make sure, widget has been created context->setFocusWidget(widget); diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 0045dbbb52..1f26e42515 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -368,7 +368,7 @@ void tst_QStyle::testScrollBarSubControls(QStyle* style) { #ifdef Q_OS_WINCE_WM if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone()) - QSKIP("SmartPhone doesn't have scrollbar subcontrols.", SkipAll); + QSKIP("SmartPhone doesn't have scrollbar subcontrols."); #else Q_UNUSED(style); #endif diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index c5591c48ab..2e5ddb4695 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -777,9 +777,8 @@ void tst_QStyleSheetStyle::focusColors() QImage image(frame.width(), frame.height(), QImage::Format_ARGB32); frame.render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)), (QString::fromLatin1(widget->metaObject()->className()) @@ -798,7 +797,7 @@ void tst_QStyleSheetStyle::focusColors() void tst_QStyleSheetStyle::hoverColors() { if (!PlatformQuirks::haveMouseCursor()) - QSKIP("No mouse Cursor on this platform",SkipAll); + QSKIP("No mouse Cursor on this platform"); QList<QWidget *> widgets; widgets << new QPushButton("TESTING"); widgets << new QLineEdit("TESTING"); @@ -937,9 +936,8 @@ void tst_QStyleSheetStyle::background() QImage image(widget->width(), widget->height(), QImage::Format_ARGB32); widget->render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)), (QString::fromLatin1(widget->metaObject()->className()) @@ -1470,9 +1468,8 @@ void tst_QStyleSheetStyle::complexWidgetFocus() QImage image(frame.width(), frame.height(), QImage::Format_ARGB32); frame.render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xff, 0x00, 0x84)), (QString::fromLatin1(widget->metaObject()->className()) @@ -1547,9 +1544,8 @@ void tst_QStyleSheetStyle::task232085_spinBoxLineEditBg() QImage image(frame.width(), frame.height(), QImage::Format_ARGB32); frame.render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)), (QString::fromLatin1(spinbox->metaObject()->className()) diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp index 6d51252e22..4d37daf681 100644 --- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp @@ -609,9 +609,8 @@ void tst_QUndoGroup::commandTextFormat() { QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); - if (QProcess::execute(binDir + "/lrelease -version") != 0) { - QSKIP("lrelease is missing or broken", SkipAll); - } + if (QProcess::execute(binDir + "/lrelease -version") != 0) + QSKIP("lrelease is missing or broken"); QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/qundogroup.ts")); @@ -654,11 +653,11 @@ public: tst_QUndoGroup() {} private slots: - void setActive() { QSKIP( "Not tested on irix-g++", SkipAll); } - void addRemoveStack() { QSKIP( "Not tested on irix-g++", SkipAll); } - void deleteStack() { QSKIP( "Not tested on irix-g++", SkipAll); } - void checkSignals() { QSKIP( "Not tested on irix-g++", SkipAll); } - void addStackAndDie() { QSKIP( "Not tested on irix-g++", SkipAll); } + void setActive() { QSKIP( "Not tested on irix-g++"); } + void addRemoveStack() { QSKIP( "Not tested on irix-g++"); } + void deleteStack() { QSKIP( "Not tested on irix-g++"); } + void checkSignals() { QSKIP( "Not tested on irix-g++"); } + void addStackAndDie() { QSKIP( "Not tested on irix-g++"); } }; #endif diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp index 834c2d5d50..b1fa420a60 100644 --- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp @@ -2971,9 +2971,8 @@ void tst_QUndoStack::commandTextFormat() { QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); - if (QProcess::execute(binDir + "/lrelease -version") != 0) { - QSKIP("lrelease is missing or broken", SkipAll); - } + if (QProcess::execute(binDir + "/lrelease -version") != 0) + QSKIP("lrelease is missing or broken"); QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/qundostack.ts")); diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index f5f60c8fd3..526cfff1ee 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -593,7 +593,7 @@ void tst_QAbstractButton::stopRepeatTimer() void tst_QAbstractButton::keyNavigation() { - QSKIP("Key navigation in QAbstractButton will be fixed/improved as part of task 194373", SkipSingle); + QSKIP("Key navigation in QAbstractButton will be fixed/improved as part of task 194373"); QWidget widget; QGridLayout *layout = new QGridLayout(&widget); diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp index f9f6ec0a54..c48efcd5eb 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp @@ -131,7 +131,7 @@ QT_END_NAMESPACE void tst_QButtonGroup::arrowKeyNavigation() { 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."); QDialog dlg(0); QHBoxLayout layout(&dlg); diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index cb4468f6f4..8f6d5bc0e0 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -460,7 +460,7 @@ void tst_QComboBox::setPalette() { #ifdef Q_WS_MAC if (qobject_cast<QMacStyle *>(testWidget->style())) { - QSKIP("This test doesn't make sense for pixmap-based styles", SkipAll); + QSKIP("This test doesn't make sense for pixmap-based styles"); } #endif QPalette pal = testWidget->palette(); diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index c64c9e7019..c83634a6a7 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -2537,7 +2537,7 @@ void tst_QDateTimeEdit::newCase() { if (QDate::shortMonthName(6) != "Jun" || QDate::shortMonthName(7) != "Jul" || QDate::longMonthName(6) != "June" || QDate::longMonthName(7) != "July") - QSKIP("This test only works in English", SkipAll); + QSKIP("This test only works in English"); testWidget->setDisplayFormat("MMMM'a'MbMMMcMM"); testWidget->setDate(QDate(2005, 6, 1)); @@ -2584,7 +2584,7 @@ void tst_QDateTimeEdit::newCase2() void tst_QDateTimeEdit::newCase3() { if (!QDate::longMonthName(1).startsWith("Januar")) - QSKIP("This test does not work in this locale", SkipAll); + QSKIP("This test does not work in this locale"); testWidget->setDisplayFormat("dd MMMM yyyy"); testWidget->setDate(QDate(2000, 1, 1)); @@ -2605,7 +2605,7 @@ void tst_QDateTimeEdit::newCase3() void tst_QDateTimeEdit::cursorPos() { if (QDate::longMonthName(1) != "January") - QSKIP("This test only works in English", SkipAll); + QSKIP("This test only works in English"); testWidget->setDisplayFormat("dd MMMM yyyy"); //testWidget->setGeometry(0, 0, 200, 200); @@ -3210,7 +3210,7 @@ void tst_QDateTimeEdit::timeSpec() QVERIFY(edit.minimumDateTime().timeSpec() != min.timeSpec()); QCOMPARE(edit.minimumDateTime().toTime_t(), min.toTime_t()); } else { - QSKIP("Not tested in the GMT timezone", SkipAll); + QSKIP("Not tested in the GMT timezone"); } } diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 2c1f7c0954..cd0b95160d 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -842,7 +842,7 @@ void tst_QDockWidget::taskQTBUG_1665_closableChanged() QDockWidgetLayout *l = qobject_cast<QDockWidgetLayout*>(dock.layout()); if (l && !l->nativeWindowDeco()) - QSKIP("this machine doesn't support native dock widget", SkipAll); + QSKIP("this machine doesn't support native dock widget"); QVERIFY(dock.windowFlags() & Qt::WindowCloseButtonHint); diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 6e4726e5b5..841fbbd955 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -1424,7 +1424,7 @@ static bool nativeClipboardWorking() void tst_QLineEdit::QTBUG5786_undoPaste() { if (!nativeClipboardWorking()) - QSKIP("this machine doesn't support the clipboard", SkipAll); + QSKIP("this machine doesn't support the clipboard"); QString initial("initial"); QString string("test"); QString additional("add"); @@ -2803,7 +2803,7 @@ void tst_QLineEdit::cut() if (status == noErr) CFRelease(pasteboard); else - QSKIP("Autotests run from cron and pasteboard don't get along quite ATM", SkipAll); + QSKIP("Autotests run from cron and pasteboard don't get along quite ATM"); } #endif // test newlines in cut'n'paste diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 9722a3194b..966f5842a0 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -1648,7 +1648,7 @@ void tst_QMainWindow::addToolbarAfterShow() void tst_QMainWindow::centralWidgetSize() { if(PlatformQuirks::isAutoMaximizing()) - QSKIP("The platform is auto maximizing, so the test makes no sense", SkipAll);; + QSKIP("The platform is auto maximizing, so the test makes no sense");; QMainWindow mainWindow; mainWindow.menuBar()->addMenu("menu"); diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index a4ce94cc3d..59fbdafbaf 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -515,7 +515,7 @@ void tst_QMdiArea::subWindowActivated2() spy.clear(); if (PlatformQuirks::isAutoMaximizing()) - QSKIP("Platform is auto maximizing, so no showMinimized()", SkipAll); + QSKIP("Platform is auto maximizing, so no showMinimized()"); // Check that we only emit _one_ signal and the active window // is unchanged after showMinimized/showNormal. @@ -531,7 +531,7 @@ void tst_QMdiArea::subWindowActivated2() QEXPECT_FAIL("", "task 168682", Abort); #endif #ifdef Q_OS_WINCE - QSKIP("Not fixed yet. See Task 197453", SkipAll); + QSKIP("Not fixed yet. See Task 197453"); #endif QTRY_COMPARE(spy.count(), 1); QVERIFY(!mdiArea.activeSubWindow()); @@ -1757,7 +1757,7 @@ void tst_QMdiArea::tileSubWindows() const int spacing = 2 * frameWidth + 2; const QSize expectedViewportSize(3 * minSize.width() + spacing, 3 * minSize.height() + spacing); #ifdef Q_OS_WINCE - QSKIP("Not fixed yet! See task 197453", SkipAll); + QSKIP("Not fixed yet! See task 197453"); #endif QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize); @@ -2714,7 +2714,7 @@ void tst_QMdiArea::nativeSubWindows() #ifndef QT_NO_OPENGL { if (!QGLFormat::hasOpenGL()) - QSKIP("QGL not supported on this platform", SkipAll); + QSKIP("QGL not supported on this platform"); QMdiArea mdiArea; QGLWidget *glViewport = new QGLWidget; @@ -2728,7 +2728,7 @@ void tst_QMdiArea::nativeSubWindows() const QGLContext *context = glViewport->context(); if (!context || !context->isValid()) - QSKIP("QGL is broken, cannot continue test", SkipAll); + QSKIP("QGL is broken, cannot continue test"); // The viewport and all the sub-windows must be native. QVERIFY(mdiArea.viewport()->internalWinId()); diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index f7593336e1..72c6335fdb 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -598,7 +598,7 @@ void tst_QMdiSubWindow::showShaded() QTest::qWait(250); #ifdef Q_OS_WINCE - QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll); + QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip"); #endif const QSize minimumSizeHint = window->minimumSizeHint(); @@ -907,7 +907,7 @@ void tst_QMdiSubWindow::setWindowFlags_data() void tst_QMdiSubWindow::setWindowFlags() { - QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll); + QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip"); QFETCH(Qt::WindowType, windowType); QFETCH(Qt::WindowType, expectedWindowType); QFETCH(Qt::WindowFlags, customFlags); @@ -968,7 +968,7 @@ void tst_QMdiSubWindow::mouseDoubleClick() QCOMPARE(window->geometry(), originalGeometry); // With Qt::WindowShadeButtonHint flag set - QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll); + QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip"); window->setWindowFlags(window->windowFlags() | Qt::WindowShadeButtonHint); QVERIFY(window->windowFlags() & Qt::WindowShadeButtonHint); originalGeometry = window->geometry(); diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index d115da865b..306cd892ed 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -381,7 +381,7 @@ void tst_QMenu::focus() #ifdef Q_WS_MAC if (!qt_tab_all_widgets) QSKIP("Computer is currently set up to NOT tab to all widgets," - " this test assumes you can tab to all widgets", SkipAll); + " this test assumes you can tab to all widgets"); #endif QWidget window; @@ -675,7 +675,7 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition() if (sub.style()->styleHint(QStyle::SH_Menu_Scrollable, 0, &sub)) { //the style prevents the menus from getting columns - QSKIP("the style doesn't support multiple columns, it makes the menu scrollable", SkipSingle); + QSKIP("the style doesn't support multiple columns, it makes the menu scrollable"); } sub.addAction("Sub-Item1"); @@ -774,7 +774,7 @@ public: void tst_QMenu::task258920_mouseBorder() { #ifdef Q_WS_QPA - QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa", SkipAll); + QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa"); #endif Menu258920 menu; // For styles which inherit from QWindowsStyle, styleHint(QStyle::SH_Menu_MouseTracking) is true. @@ -842,7 +842,7 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow() // (kwin in kde4 does, for example, since the button would probably appear behind // or partially behind the taskbar). // Your best bet is to run this test _without_ a WM. - QSKIP("Your window manager won't allow a window against the bottom of the screen", SkipAll); + QSKIP("Your window manager won't allow a window against the bottom of the screen"); } QTimer::singleShot(300,lastMenu, SLOT(hide())); diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index dc3b81920d..4a6123cdc3 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -853,7 +853,7 @@ void tst_QMenuBar::check_escKey() // void tst_QMenuBar::check_mouse1() // { // if (QSystem::curStyle() == "Motif") -// QSKIP("This fails in Motif due to a bug in the testing framework", SkipAll); +// QSKIP("This fails in Motif due to a bug in the testing framework"); // QFETCH( QString, popup_item ); // QFETCH( int, itemA_count ); // QFETCH( int, itemB_count ); @@ -914,7 +914,7 @@ void tst_QMenuBar::check_escKey() // void tst_QMenuBar::check_mouse2() // { // if (QSystem::curStyle() == "Motif") -// QSKIP("This fails in Motif due to a bug in the testing framework", SkipAll); +// QSKIP("This fails in Motif due to a bug in the testing framework"); // QFETCH( QString, label ); // QFETCH( int, itemA_count ); // QFETCH( int, itemB_count ); @@ -991,7 +991,7 @@ void tst_QMenuBar::check_altPress() { if ( !qApp->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation) ) { QSKIP( QString( "this is not supposed to work in the %1 style. Skipping." ). - arg( qApp->style()->objectName() ).toAscii(), SkipAll ); + arg( qApp->style()->objectName() ).toAscii()); } initSimpleMenubar(); diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index d847f295e0..c9b3a3c6f1 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -307,7 +307,7 @@ void tst_QPlainTextEdit::createSelection() void tst_QPlainTextEdit::clearMustNotChangeClipboard() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->textCursor().insertText("Hello World"); QString txt("This is different text"); QApplication::clipboard()->setText(txt); @@ -340,7 +340,7 @@ void tst_QPlainTextEdit::paragSeparatorOnPlaintextAppend() void tst_QPlainTextEdit::selectAllSetsNotSelection() { if (!QApplication::clipboard()->supportsSelection()) - QSKIP("Test only relevant for systems with selection", SkipAll); + QSKIP("Test only relevant for systems with selection"); QApplication::clipboard()->setText(QString("foobar"), QClipboard::Selection); QVERIFY(QApplication::clipboard()->text(QClipboard::Selection) == QString("foobar")); @@ -484,7 +484,7 @@ void tst_QPlainTextEdit::setTextCursor() void tst_QPlainTextEdit::undoAvailableAfterPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool))); @@ -677,7 +677,7 @@ void tst_QPlainTextEdit::preserveCharFormatInAppend() void tst_QPlainTextEdit::copyAndSelectAllInReadonly() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->setReadOnly(true); ed->setPlainText("Hello World"); @@ -1012,7 +1012,7 @@ void tst_QPlainTextEdit::copyAvailable() QFETCH(QString, function); #ifdef Q_WS_MAC - QSKIP("copyAvailable has never passed on Mac, task to fix is 132482", SkipAll); + QSKIP("copyAvailable has never passed on Mac, task to fix is 132482"); #endif ed->clear(); QApplication::clipboard()->clear(); @@ -1194,7 +1194,7 @@ void tst_QPlainTextEdit::selectWordsFromStringsContainingSeparators() void tst_QPlainTextEdit::canPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QApplication::clipboard()->setText(QString()); QVERIFY(!ed->canPaste()); diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index e5083553e2..c79d157880 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -580,8 +580,7 @@ void tst_QPushButton::sizeHint() QStyle *style = QStyleFactory::create(stylename); if (!style) - QSKIP(qPrintable(QString::fromLatin1("Qt has been compiled without style: %1") - .arg(stylename)), SkipSingle); + QSKIP(qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename))); QApplication::setStyle(style); // Test 1 diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp index c4b64f3f1e..3bd5da4649 100644 --- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp @@ -94,7 +94,7 @@ void tst_QScrollBar::scrollSingleStep() QStyle::SC_ScrollBarAddLine, testWidget); if (!sr.isValid()) - QSKIP("SC_ScrollBarAddLine not valid", SkipAll); + QSKIP("SC_ScrollBarAddLine not valid"); QTest::mouseClick(testWidget, Qt::LeftButton, Qt::NoModifier, QPoint(sr.x(), sr.y())); QTest::qWait(510); // initial delay is 500 for setRepeatAction diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index a1a8f3b0aa..d43e17135a 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -283,7 +283,7 @@ void tst_QTabBar::setElideMode() void tst_QTabBar::sizeHints() { QTabBar tabBar; - QSKIP("To be fixed on Mac (font size below not large enough) and Linux QWS (probably too large for the screen).", SkipSingle); + QSKIP("To be fixed on Mac (font size below not large enough) and Linux QWS (probably too large for the screen)."); tabBar.setFont(QFont("Arial", 10)); tabBar.addTab("tab 01"); tabBar.addTab("tab 02"); diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp index 6d356dee9b..deaece337d 100644 --- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp @@ -54,7 +54,7 @@ # include <qt_windows.h> #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("desktop is not visible, this test would fail", SkipSingle); + QSKIP("desktop is not visible, this test would fail"); #else #define Q_CHECK_PAINTEVENTS #endif diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 481bda962a..66ded68a7f 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -495,7 +495,7 @@ void tst_QTextEdit::createSelection() void tst_QTextEdit::clearMustNotChangeClipboard() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->textCursor().insertText("Hello World"); QString txt("This is different text"); QApplication::clipboard()->setText(txt); @@ -570,7 +570,7 @@ void tst_QTextEdit::layoutingLoop() void tst_QTextEdit::selectAllSetsNotSelection() { if (!QApplication::clipboard()->supportsSelection()) { - QSKIP("Test only relevant for systems with selection", SkipAll); + QSKIP("Test only relevant for systems with selection"); return; } @@ -784,7 +784,7 @@ void tst_QTextEdit::setTextCursor() void tst_QTextEdit::undoAvailableAfterPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool))); @@ -1005,7 +1005,7 @@ void tst_QTextEdit::preserveCharFormatInAppend() void tst_QTextEdit::copyAndSelectAllInReadonly() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->setReadOnly(true); ed->setPlainText("Hello World"); @@ -1357,7 +1357,7 @@ void tst_QTextEdit::copyAvailable() QFETCH(QString, function); #ifdef Q_WS_MAC - QSKIP("copyAvailable has never passed on Mac, task to fix is 132482", SkipAll); + QSKIP("copyAvailable has never passed on Mac, task to fix is 132482"); #endif ed->clear(); QApplication::clipboard()->clear(); @@ -1551,7 +1551,7 @@ void tst_QTextEdit::selectWordsFromStringsContainingSeparators() void tst_QTextEdit::canPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QApplication::clipboard()->setText(QString()); QVERIFY(!ed->canPaste()); @@ -1853,7 +1853,7 @@ void tst_QTextEdit::copyPasteBackgroundImage() { #ifndef QT_NO_CLIPBOARD if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); QImage foo(16, 16, QImage::Format_ARGB32_Premultiplied); foo.save("foo.png"); diff --git a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp index a996c38438..d93043c12b 100644 --- a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp +++ b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp @@ -369,7 +369,7 @@ void tst_QWorkspace::showWindows() void tst_QWorkspace::changeWindowTitle() { #ifdef Q_OS_WINCE - QSKIP( "Test fails on Windows CE due to QWorkspace state handling", SkipAll); + QSKIP( "Test fails on Windows CE due to QWorkspace state handling"); #endif const QString mwc( "MainWindow's Caption" ); const QString mwc2( "MainWindow's New Caption" ); |