From 9c21557dd68892e51ac14b9f2ff19bf6b2f9c666 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 19 Apr 2012 20:43:52 +1000 Subject: Remove insignification from QGraphicsProxyWidget test on Windows. This test has three stable failures on Windows. Mark those failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-24294 Change-Id: I9eee2701a228912c3a91fa730e712661fb93add6 Reviewed-by: Rohan McGovern --- .../graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro | 2 -- .../qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro index 13bd2a4a6f..7fd6db1dd6 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro @@ -7,5 +7,3 @@ QT += core-private gui-private SOURCES += tst_qgraphicsproxywidget.cpp contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-25294 - -win32:CONFIG += insignificant_test # QTBUG-24294 diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index fc1126989d..2b143c5d98 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1498,6 +1498,9 @@ void tst_QGraphicsProxyWidget::scrollUpdate() // QRect(0, 0, 200, 12) is the first update, expanded (-2, -2, 2, 2) // QRect(0, 12, 102, 10) is the scroll update, expanded (-2, -2, 2, 2), // intersected with the above update. +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24294", Abort); +#endif QCOMPARE(view.paintEventRegion.rects(), QVector() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10)); QCOMPARE(widget->npaints, 2); @@ -2472,6 +2475,9 @@ void tst_QGraphicsProxyWidget::popup_basic() QTest::mousePress(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center()))); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24294", Abort); +#endif QTRY_COMPARE(box->pos(), QPoint()); QCOMPARE(proxy->childItems().count(), 1); @@ -3376,6 +3382,9 @@ void tst_QGraphicsProxyWidget::updateAndDelete() // Update and hide. proxy->update(); proxy->hide(); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24294", Abort); +#endif QTRY_COMPARE(view.npaints, 1); #ifdef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-23700", Continue); -- cgit v1.2.3