tests: Re-enable QAccessibility test.

The test has four stable failures. Mark these with QEXPECT_FAIL and
re-enable the test.

Task-number: QTBUG-26499
Change-Id: I3774405f736609a4c262d2d44c5ffcceec1a0a09
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

2 files changed, 12 insertions, 2 deletions

diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro
index c4d0fcd70a..71d6f95175 100644
--- a/tests/auto/qaccessibility/qaccessibility.pro
+++ b/tests/auto/qaccessibility/qaccessibility.pro
@@ -10,5 +10,3 @@ wince*: {
 	accessneeded.path = accessible
 	DEPLOYMENT += accessneeded
 }
-
-CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 3aba9b35ca..297e853674 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -1553,6 +1553,7 @@ void tst_QAccessibility::text()
     // Accelerator
     QCOMPARE(acc_pbOk->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::Key_Enter));
     QCOMPARE(acc_pb1->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT + Qt::Key_1));
+    QEXPECT_FAIL("", "QTBUG-26499", Abort);
     QCOMPARE(acc_lineedit->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "L");
     QCOMPARE(acc_frequency->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "C");
 
@@ -2174,6 +2175,11 @@ void tst_QAccessibility::sliderTest()
         for (int i = PageLeft; i <= PageRight; ++i) {
             const QRect testRect = sliderInterface->rect(i);
             QVERIFY(testRect.isValid());
+#ifdef Q_OS_MAC
+            if (!sliderRect.contains(testRect)) {
+                QEXPECT_FAIL("", "QTBUG-26499", Abort);
+            }
+#endif
             QVERIFY(sliderRect.contains(testRect));
         }
 
@@ -2738,6 +2744,9 @@ void tst_QAccessibility::textEditTest()
     QCOMPARE(iface->text(QAccessible::Value, 6), QString());
     QCOMPARE(iface->textInterface()->characterCount(), 31);
     QFontMetrics fm(edit.font());
+#ifdef Q_WS_X11
+    QEXPECT_FAIL("", "QTBUG-26499", Abort);
+#endif
     QCOMPARE(iface->textInterface()->characterRect(0, QAccessible2::RelativeToParent).size(), QSize(fm.width("h"), fm.height()));
     QCOMPARE(iface->textInterface()->characterRect(5, QAccessible2::RelativeToParent).size(), QSize(fm.width(" "), fm.height()));
     QCOMPARE(iface->textInterface()->characterRect(6, QAccessible2::RelativeToParent).size(), QSize(fm.width("w"), fm.height()));
@@ -4375,6 +4384,9 @@ void tst_QAccessibility::comboBoxTest()
     QAccessibleInterface *acc2 = 0;
     entry = accList->navigate(QAccessible::Ancestor, 1, &acc2);
     QCOMPARE(entry, 0);
+#if defined(Q_WS_X11) && defined(QT_BUILD_INTERNAL)
+    QEXPECT_FAIL("", "QTBUG-26499", Abort);
+#endif
     QCOMPARE(verifyHierarchy(acc), 0);
     delete acc2;