summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
authorJo Asplin <jo.asplin@nokia.com>2011-10-31 11:52:32 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-01 13:15:44 +0100
commit6264bf242a267eff0dde578c64e0442e1924bce3 (patch)
tree1dd3d44ae2ce8c352a1e1224afbdb00dd6db2d45 /tests/auto/widgets
parentd2ed5884192202dae8efefa66b9bdc2caaf8c551 (diff)
Re-enabled passing tests in tst_qgraphicswidget
To increase the effective test coverage, this patch re-enables the tst_qgraphicswidget test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: Ic484fde3492f077453f47a959dd6dc862288dcaf Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro1
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro
index fd5cb3897d..afe584e57d 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro
@@ -8,4 +8,3 @@ SOURCES += tst_qgraphicswidget.cpp
mac*:CONFIG+=insignificant_test
-qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-20778 unstable on qpa, xcb
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index c983016a20..164d5564e3 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -1158,6 +1158,7 @@ void tst_QGraphicsWidget::initStyleOption()
QCOMPARE(hasFocus, focus);
bool isUnderMouse = option.state & QStyle::State_MouseOver;
#ifndef Q_OS_WINCE
+ QEXPECT_FAIL("all", "QTBUG-22457", Abort);
QCOMPARE(isUnderMouse, underMouse);
#endif
// if (layoutDirection != Qt::LeftToRight)
@@ -3191,6 +3192,7 @@ void tst_QGraphicsWidget::initialShow2()
view.show();
QTest::qWaitForWindowShown(&view);
+ QEXPECT_FAIL("", "QTBUG-20778", Abort);
QTRY_COMPARE(widget->repaints, expectedRepaintCount);
}