Changeset 79463 in webkit

Timestamp:

Feb 23, 2011 11:03:32 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-23 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Ariya Hidayat.

[Qt] tst_QWebView::setPalette(activeFG) fails
​https://bugs.webkit.org/show_bug.cgi?id=55029

Attempt to make the test more robust. By investigating with the bot virtual machine
I discovered that the activation can take some time. In this patch we make sure that
the active window we want to have is the same as the QApplication.

• tests/qwebview/tst_qwebview.cpp: (tst_QWebView::setPalette):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebview/tst_qwebview.cpp (modified) (3 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-02-23  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] tst_QWebView::setPalette(activeFG) fails
+        https://bugs.webkit.org/show_bug.cgi?id=55029
+
+        Attempt to make the test more robust. By investigating with the bot virtual machine
+        I discovered that the activation can take some time. In this patch we make sure that
+        the active window we want to have is the same as the QApplication.
+
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::setPalette):
+
 2011-02-23  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp

@@ -333 +333 @@
     QFETCH(bool, active);
     QFETCH(bool, background);
+
+    QWidget* activeView = 0;
 
     // Use controlView to manage active/inactive state of test views by raising
@@ -369 +371 @@
         controlView.activateWindow();
         QTest::qWaitForWindowShown(&controlView);
-    } else
+        activeView = &controlView;
+    } else {
         view1.activateWindow();
+        activeView = &view1;
+    }
+
+    QTRY_COMPARE(QApplication::activeWindow(), activeView);
 
     view1.page()->triggerAction(QWebPage::SelectAll);
@@ -411 +418 @@
         controlView.activateWindow();
         QTest::qWaitForWindowShown(&controlView);
-    } else
+        activeView = &controlView;
+    } else {
         view2.activateWindow();
+        activeView = &view2;
+    }
+
+    QTRY_COMPARE(QApplication::activeWindow(), activeView);
 
     view2.page()->triggerAction(QWebPage::SelectAll);