Changeset 87695 in webkit

Timestamp:

May 30, 2011 12:02:21 PM (13 years ago)

Author:

caio.oliveira@openbossa.org

Message:

2011-05-30 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Andreas Kling.

[Qt] Fix unnecessary wait in API autotest tst_QWebFrame::scrollbarsOff
​https://bugs.webkit.org/show_bug.cgi?id=61711

The loadFinished() signal was emitted directly inside the call for setHtml, so
the test was waiting the loadFinished() signal with a big timeout. Change this by
a very small timeout and a verification with signal spy.

In practice, setHtml() will either directly call loadFinished() or queue it to
the next event loop run, and test will work for both situations.

• tests/qwebframe/tst_qwebframe.cpp: (tst_QWebFrame::scrollbarsOff):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebframe/tst_qwebframe.cpp (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-30  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix unnecessary wait in API autotest tst_QWebFrame::scrollbarsOff
+        https://bugs.webkit.org/show_bug.cgi?id=61711
+
+        The loadFinished() signal was emitted directly inside the call for setHtml, so
+        the test was waiting the loadFinished() signal with a big timeout. Change this by
+        a very small timeout and a verification with signal spy.
+
+        In practice, setHtml() will either directly call loadFinished() or queue it to
+        the next event loop run, and test will work for both situations.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (tst_QWebFrame::scrollbarsOff):
+
 2011-05-30  Noam Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -3135 +3135 @@
 
 
+    QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     view.setHtml(html);
-    ::waitForSignal(&view, SIGNAL(loadFinished(bool)));
+    ::waitForSignal(&view, SIGNAL(loadFinished(bool)), 200);
+    QCOMPARE(loadSpy.count(), 1);
 
     mainFrame->evaluateJavaScript("checkScrollbar();");