Re-enabled passing tests in tst_qinputcontext

To increase the effective test coverage, this patch
re-enables the tst_qinputcontext test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: Ib1d4946ab29e67e0e72f4f9c6a7bf39b65d0f6be
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

diff --git a/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro b/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro
index 3700cad..fcfb15c 100644 (file)
--- a/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro
+++ b/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro
@@ -4,5 +4,3 @@ QT += widgets testlib
 SOURCES  += tst_qinputcontext.cpp
 
 mac*:CONFIG+=insignificant_test
-
-CONFIG += insignificant_test # QTBUG-21402

diff --git a/tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp b/tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp
index 9b64528..cb7d7eb 100644 (file)
--- a/tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp
@@ -128,6 +128,7 @@ void tst_QInputContext::filterMouseEvents()
     qApp->setInputContext(ic);
     QTest::mouseClick(&le, Qt::LeftButton);
 
+    QEXPECT_FAIL("", "QTBUG-22564", Abort);
     QVERIFY(ic->lastTypes.indexOf(QEvent::MouseButtonRelease) >= 0);
 }
 
@@ -183,6 +184,7 @@ void tst_QInputContext::requestSoftwareInputPanel()
     // Testing single click panel activation.
     newStyle->m_rsipBehavior = QStyle::RSIP_OnMouseClick;
     QTest::mouseClick(le2, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QEXPECT_FAIL("", "QTBUG-22564", Abort);
     QVERIFY(ic->lastTypes.indexOf(QEvent::RequestSoftwareInputPanel) >= 0);
     ic->lastTypes.clear();
 
@@ -229,6 +231,7 @@ void tst_QInputContext::closeSoftwareInputPanel()
 
     // Testing that panel closes when focusing non-aware widget.
     QTest::mouseClick(rb, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QEXPECT_FAIL("", "QTBUG-22564", Abort);
     QVERIFY(ic->lastTypes.indexOf(QEvent::CloseSoftwareInputPanel) >= 0);
 }