[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libkdeaccessibilityclient] tests/auto: Improve test stability
From:       Frederik Gladhorn <frederik.gladhorn () digia ! com>
Date:       2014-04-30 20:33:56
Message-ID: E1WfbCW-0006mT-GA () scm ! kde ! org
[Download RAW message or body]

Git commit a5ab9a3beacd981bdd3c8f84b0eab14e94beb228 by Frederik Gladhorn.
Committed on 30/04/2014 at 20:31.
Pushed by gladhorn into branch 'master'.

Improve test stability

M  +4    -0    tests/auto/tst_accessibilityclient.cpp

http://commits.kde.org/libkdeaccessibilityclient/a5ab9a3beacd981bdd3c8f84b0eab14e94beb228

diff --git a/tests/auto/tst_accessibilityclient.cpp b/tests/auto/tst_accessibilityclient.cpp
index 2fcb856..3aaa892 100644
--- a/tests/auto/tst_accessibilityclient.cpp
+++ b/tests/auto/tst_accessibilityclient.cpp
@@ -178,10 +178,12 @@ void AccessibilityClientTest::tst_navigation()
     QString desc = "This is a button...";
     button->setAccessibleDescription(desc);
     w.show();
+    w.activateWindow();
     button->setFocus();
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     QTest::qWaitForWindowExposed(&w);
+    QTest::qWaitForWindowActive(&w);
 #else
     QTest::qWaitForWindowShown(&w);
 #endif
@@ -253,7 +255,9 @@ void AccessibilityClientTest::tst_navigation()
     QVERIFY(!accLabel.isChecked());
     QVERIFY(!accLabel.isFocusable());
     QVERIFY(!accLabel.isFocused());
+#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 1))
     QEXPECT_FAIL("", "Labels in Qt 4 report themselves as editable.", Continue);
+#endif
     QVERIFY(!accLabel.isEditable());
 
     AccessibleObject accLine = accW.child(2);

[prev in list] [next in list] [prev in thread] [next in thread]