Improve DolphinTreeViewTest's stability.

When running the test in the background while using the computer for
other things, it may happen that the test's widgets are not focused,
which led to an infinite loop before this commit. I've removed the
checks that caused this loop because the only thing that is important
for the test is that the view loses the keyboard focus at some point
(see bug 220898).

svn path=/trunk/KDE/kdebase/apps/; revision=1215139

diff --git a/src/tests/dolphintreeviewtest.cpp b/src/tests/dolphintreeviewtest.cpp
index 18069125a62eddb5692be601cf0ab9913fb50132..61922acd77ee3bda5fdc426b277b5d29fb32c75b 100644 (file)
--- a/src/tests/dolphintreeviewtest.cpp
+++ b/src/tests/dolphintreeviewtest.cpp
@@ -373,10 +373,9 @@ void DolphinTreeViewTest::bug220898_focusOut()
     widget.setFocus();
 
     // Wait until the widgets have received the focus events
-    while (view.viewport()->hasFocus() || !widget.hasFocus()) {
+    while (view.viewport()->hasFocus()) {
         QTest::qWait(10);
     }
-    QVERIFY(widget.hasFocus());
     QVERIFY(!view.viewport()->hasFocus());
 
     // Release the "Down" key
@@ -387,11 +386,10 @@ void DolphinTreeViewTest::bug220898_focusOut()
     view.viewport()->setFocus();
 
     // Wait until the widgets have received the focus events
-    while (!view.viewport()->hasFocus() || widget.hasFocus()) {
+    while (widget.hasFocus()) {
         QTest::qWait(10);
     }
     QVERIFY(!widget.hasFocus());
-    QVERIFY(view.viewport()->hasFocus());
 
     // Press left mouse button below the last item
     const int lastRowHeight = view.sizeHintForRow(4);