Changeset 68507 in webkit


Ignore:
Timestamp:
Sep 28, 2010 5:18:41 AM (14 years ago)
Author:
benjamin.poulain@nokia.com
Message:

2010-09-28 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] tst_QWebPage::testStopScheduledPageRefresh() fails on MeeGo handset
​https://bugs.webkit.org/show_bug.cgi?id=46706

The test require the network to succeed or fail in order to work.
On MeeGo, the network can simply timeout the because of the netword access
management. This patch makes the test use local URLs to avoid the
problem.

  • tests/qwebpage/tst_qwebpage.cpp: (TestNetworkManager::TestNetworkManager):
Location:
trunk/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/qt/ChangeLog

    r68457 r68507  
     12010-09-28  Benjamin Poulain  <benjamin.poulain@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] tst_QWebPage::testStopScheduledPageRefresh() fails on MeeGo handset
     6        https://bugs.webkit.org/show_bug.cgi?id=46706
     7
     8        The test require the network to succeed or fail in order to work.
     9        On MeeGo, the network can simply timeout the because of the netword access
     10        management. This patch makes the test use local URLs to avoid the
     11        problem.
     12
     13        * tests/qwebpage/tst_qwebpage.cpp:
     14        (TestNetworkManager::TestNetworkManager):
     15
    1162010-09-27  Kenneth Rohde Christiansen  <kenneth.christiansen@openbossa.org>
    217

  • trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

    r67878 r68507  
    21902190    page1.setNetworkAccessManager(new TestNetworkManager(&page1));
    21912191    page1.mainFrame()->setHtml("<html><head>"
    2192                                 "<meta http-equiv=\"refresh\"content=\"0;URL=http://qt.nokia.com/favicon.ico\">"
     2192                                "<meta http-equiv=\"refresh\"content=\"0;URL=qrc:///resources/index.html\">"
    21932193                                "</head><body><h1>Page redirects immediately...</h1>"
    21942194                                "</body></html>");
    21952195    QVERIFY(::waitForSignal(&page1, SIGNAL(loadFinished(bool))));
    21962196    QTest::qWait(500);
    2197     QCOMPARE(page1.mainFrame()->url().toString(), QString("http://qt.nokia.com/favicon.ico"));
     2197    QCOMPARE(page1.mainFrame()->url(), QUrl(QLatin1String("qrc:///resources/index.html")));
    21982198   
    21992199    // With QWebPage::StopScheduledPageRefresh
    … …  
    22012201    page2.setNetworkAccessManager(new TestNetworkManager(&page2));
    22022202    page2.mainFrame()->setHtml("<html><head>"
    2203                                "<meta http-equiv=\"refresh\"content=\"1;URL=http://qt.nokia.com/favicon.ico\">"
     2203                               "<meta http-equiv=\"refresh\"content=\"1;URL=qrc:///resources/index.html\">"
    22042204                               "</head><body><h1>Page redirect test with 1 sec timeout...</h1>"
    22052205                               "</body></html>");
    22062206    page2.triggerAction(QWebPage::StopScheduledPageRefresh);
    22072207    QTest::qWait(1500);
    2208     QCOMPARE(page2.mainFrame()->url().toString(), QString("about:blank"));
     2208    QCOMPARE(page2.mainFrame()->url().toString(), QLatin1String("about:blank"));
    22092209}
    22102210
Note: See TracChangeset for help on using the changeset viewer.