From c2e430bf1c441f676d6b3f4bce7ae29ed39e61ab Mon Sep 17 00:00:00 2001 From: "eric@webkit.org" Date: Mon, 7 Dec 2009 15:31:42 +0000 Subject: [PATCH 1/1] 2009-12-07 Benjamin Poulain Reviewed by Kenneth Rohde Christiansen. [Qt] Improve the autotests of QtWebkit https://bugs.webkit.org/show_bug.cgi?id=32216 Remove the calls to qWait() of the autotest of QWebView * tests/qwebview/tst_qwebview.cpp: (tst_QWebView::reusePage): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51767 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/qt/ChangeLog | 12 ++++++++++++ WebKit/qt/tests/qwebview/tst_qwebview.cpp | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog index c7f52ea27fe4..2c2722bd7504 100644 --- a/WebKit/qt/ChangeLog +++ b/WebKit/qt/ChangeLog @@ -1,3 +1,15 @@ +2009-12-07 Benjamin Poulain + + Reviewed by Kenneth Rohde Christiansen. + + [Qt] Improve the autotests of QtWebkit + https://bugs.webkit.org/show_bug.cgi?id=32216 + + Remove the calls to qWait() of the autotest of QWebView + + * tests/qwebview/tst_qwebview.cpp: + (tst_QWebView::reusePage): + 2009-12-07 Benjamin Poulain Reviewed by Kenneth Rohde Christiansen. diff --git a/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/WebKit/qt/tests/qwebview/tst_qwebview.cpp index 27daf38417f4..bd2f1855974f 100644 --- a/WebKit/qt/tests/qwebview/tst_qwebview.cpp +++ b/WebKit/qt/tests/qwebview/tst_qwebview.cpp @@ -132,18 +132,18 @@ void tst_QWebView::reusePage() mainFrame->setHtml(html, QUrl::fromLocalFile(QDir::currentPath())); if (html.contains("")) { // some reasonable time for the PluginStream to feed test.swf to flash and start painting - QTest::qWait(2000); + waitForSignal(view1, SIGNAL(loadFinished(bool)), 2000); } view1->show(); - QTest::qWait(2000); + QTest::qWaitForWindowShown(view1); delete view1; QVERIFY(page != 0); // deleting view must not have deleted the page, since it's not a child of view QWebView *view2 = new QWebView; view2->setPage(page); view2->show(); // in Windowless mode, you should still be able to see the plugin here - QTest::qWait(2000); + QTest::qWaitForWindowShown(view2); delete view2; delete page; // must not crash -- 2.36.0