diff options
Diffstat (limited to 'tests/auto/widgets/graphicsview')
7 files changed, 29 insertions, 32 deletions
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) |