From 718f58487d8d0840a2bd993d18000abf0d7feb9b Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Mon, 31 Oct 2011 10:25:35 +0100 Subject: Re-enabled passing tests in tst_qgraphicsview To increase the effective test coverage, this patch re-enables the tst_qgraphicsview test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: I6b8eb09000ece789b990a2dd697cdb8b47cc8e1c Reviewed-by: Jason McDonald --- tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro | 3 --- tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro index f78bd4f470..20cff5500a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro @@ -6,6 +6,3 @@ QT += core-private gui-private SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp DEFINES += QT_NO_CAST_TO_ASCII - -# ### fixme: QTBUG-20756 crashes on xcb -contains(QT_CONFIG,xcb):CONFIG+=insignificant_test diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index e41c378350..ded0cc7965 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -4149,6 +4149,7 @@ void tst_QGraphicsView::inputContextReset() scene.setFocusItem(0); // the input context is reset twice, once because an item has lost focus and again because // the Qt::WA_InputMethodEnabled flag is cleared because no item has focus. + QEXPECT_FAIL("", "QTBUG-22454", Abort); QCOMPARE(inputContext->resets, 2); // introduce another item that is focusable but does not accept input methods @@ -4285,6 +4286,7 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins() QPointF newMouseScenePos = view.mapToScene(mouseViewPos); qreal slack = 1; + QEXPECT_FAIL("", "QTBUG-22455", Abort); QVERIFY(qAbs(newMouseScenePos.x() - mouseScenePos.x()) < slack); QVERIFY(qAbs(newMouseScenePos.y() - mouseScenePos.y()) < slack); } -- cgit v1.2.3