summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-10-28 14:38:33 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-10-28 14:41:40 (GMT)
commit71913d435213188959441a89454de6308fd76484 (patch)
treefbc45d7506df5e9238fba994a9d12c887ed858f5 /src/3rdparty/webkit/WebKit
parent5d8dcd57cd13fdd9c8643fa3bdda9f197a4351ff (diff)
downloadQt-71913d435213188959441a89454de6308fd76484.zip
Qt-71913d435213188959441a89454de6308fd76484.tar.gz
Qt-71913d435213188959441a89454de6308fd76484.tar.bz2
Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixed
upstream. Reviewed-by: TrustMe
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp23
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 80c9d72..100f272 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: