diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-28 14:38:33 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-03 16:21:12 (GMT) |
| commit | 49663ed7dd5acf25462c3ecbb5799e108d1736b4 (patch) | |
| tree | e9842684b44780581996814d5d6cbd75d789516f | |
| parent | cadd19cd98b9a6ff7ff8755f7774027400aadb0f (diff) | |
| download | Qt-49663ed7dd5acf25462c3ecbb5799e108d1736b4.zip Qt-49663ed7dd5acf25462c3ecbb5799e108d1736b4.tar.gz Qt-49663ed7dd5acf25462c3ecbb5799e108d1736b4.tar.bz2 | |
Re-apply change 71913d435213188959441a89454de6308fd76484 by Jocelyn Turcotte
Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixed upstream.
Reviewed-by: TrustMe
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp index 7cc62b0..5445ce8 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp @@ -586,7 +586,6 @@ private slots: void javaScriptWindowObjectClearedOnEvaluate(); void setHtml(); void setHtmlWithResource(); - void setHtmlWithBaseURL(); void ipv6HostEncoding(); void metaData(); void popupFocus(); @@ -2372,28 +2371,6 @@ void tst_QWebFrame::setHtmlWithResource() QCOMPARE(p.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("red")); } -void tst_QWebFrame::setHtmlWithBaseURL() -{ - QString html("<html><body><p>hello world</p><img src='resources/image2.png'/></body></html>"); - - QWebPage page; - QWebFrame* frame = page.mainFrame(); - - // in few seconds, the image should be completey loaded - QSignalSpy spy(&page, SIGNAL(loadFinished(bool))); - - frame->setHtml(html, QUrl::fromLocalFile(QDir::currentPath())); - QTest::qWait(200); - QCOMPARE(spy.count(), 1); - - QCOMPARE(frame->evaluateJavaScript("document.images.length").toInt(), 1); - QCOMPARE(frame->evaluateJavaScript("document.images[0].width").toInt(), 128); - QCOMPARE(frame->evaluateJavaScript("document.images[0].height").toInt(), 128); - - // no history item has to be added. - QCOMPARE(m_view->page()->history()->count(), 0); -} - class TestNetworkManager : public QNetworkAccessManager { public: |