From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Mon, 17 Jan 2011 19:36:00 +0000 (+0000)
Subject: Improve DolphinTreeViewTest's stability.
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/519c2d435fe17bbaea4e0219ab570473bd567b11?ds=sidebyside

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 18069125a..61922acd7 100644
--- 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);