Changeset 70556 in webkit
- Timestamp:
- Oct 26, 2010 12:35:31 PM (13 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/ChangeLog
r70487 r70556 1 2010-10-26 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] Unit tests: setHtml("data:text/html,...") -> load(QUrl("data:text/html,...")) 6 https://bugs.webkit.org/show_bug.cgi?id=48319 7 8 These tests were failing since the new HTML parser. 9 This patch removes the content type from the error page as well. 10 11 * tests/qgraphicswebview/tst_qgraphicswebview.cpp: 12 (tst_QGraphicsWebView::crashOnViewlessWebPages): 13 * tests/qwebelement/tst_qwebelement.cpp: 14 (tst_QWebElement::frame): 15 * tests/qwebpage/tst_qwebpage.cpp: 16 (tst_QWebPage::loadFinished): 17 (ErrorPage::extension): 18 (tst_QWebPage::errorPageExtension): 19 (tst_QWebPage::errorPageExtensionInIFrames): 20 (tst_QWebPage::errorPageExtensionInFrameset): 21 1 22 2010-10-25 No'am Rosenthal <noam.rosenthal@nokia.com> 2 23 -
trunk/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
r70297 r70556 125 125 connect(page->mainFrame(), SIGNAL(initialLayoutCompleted()), page, SLOT(aborting())); 126 126 127 page->mainFrame()-> setHtml(QString("data:text/html,"128 129 130 131 127 page->mainFrame()->load(QUrl("data:text/html," 128 "<frameset cols=\"25%,75%\">" 129 "<frame src=\"data:text/html,foo \">" 130 "<frame src=\"data:text/html,bar\">" 131 "</frameset>")); 132 132 133 133 QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool)))); -
trunk/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
r63637 r70556 431 431 QVERIFY(doc.webFrame() == m_mainFrame); 432 432 433 m_ view->setHtml(QString("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html,"434 435 "<frame src=\"data:text/html,<p>frame2\"></frameset>"), QUrl());433 m_mainFrame->load(QUrl("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html," 434 "<p>frame1\">" 435 "<frame src=\"data:text/html,<p>frame2\"></frameset>")); 436 436 437 437 waitForSignal(m_page, SIGNAL(loadFinished(bool))); -
trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
r70259 r70556 286 286 QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool))); 287 287 288 m_view-> setHtml(QString("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html,"289 "<head><meta http-equiv='refresh' content='1'></head>foo \">"290 "<frame src=\"data:text/html,bar\"></frameset>"), QUrl());288 m_view->page()->mainFrame()->load(QUrl("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html," 289 "<head><meta http-equiv='refresh' content='1'></head>foo \">" 290 "<frame src=\"data:text/html,bar\"></frameset>")); 291 291 QTRY_COMPARE(spyLoadFinished.count(), 1); 292 292 … … 296 296 spyLoadFinished.clear(); 297 297 298 m_view-> setHtml(QString("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html,"299 "foo \"><frame src=\"data:text/html,bar\"></frameset>"), QUrl());298 m_view->page()->mainFrame()->load(QUrl("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html," 299 "foo \"><frame src=\"data:text/html,bar\"></frameset>")); 300 300 QTRY_COMPARE(spyLoadFinished.count(), 1); 301 301 QCOMPARE(spyLoadFinished.count(), 1); … … 1883 1883 ErrorPageExtensionReturn* errorPage = static_cast<ErrorPageExtensionReturn*>(output); 1884 1884 1885 errorPage->content = "data:text/html,error"; 1885 errorPage->contentType = "text/html"; 1886 errorPage->content = "error"; 1886 1887 return true; 1887 1888 } … … 1900 1901 page->mainFrame()->setUrl(QUrl("http://non.existent/url")); 1901 1902 QTRY_COMPARE(spyLoadFinished.count(), 2); 1902 QCOMPARE(page->mainFrame()->toPlainText(), QString(" data:text/html,error"));1903 QCOMPARE(page->mainFrame()->toPlainText(), QString("error")); 1903 1904 QCOMPARE(page->history()->count(), 2); 1904 1905 QCOMPARE(page->history()->currentItem().url(), QUrl("http://non.existent/url")); … … 1927 1928 m_view->setPage(page); 1928 1929 1929 m_view->setHtml(QString("data:text/html," 1930 "<h1>h1</h1>" 1931 "<iframe src='data:text/html,<p/>p'></iframe>" 1932 "<iframe src='non-existent.html'></iframe>")); 1930 m_view->page()->mainFrame()->load(QUrl( 1931 "data:text/html," 1932 "<h1>h1</h1>" 1933 "<iframe src='data:text/html,<p/>p'></iframe>" 1934 "<iframe src='http://non.existent/url'></iframe>")); 1933 1935 QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool))); 1934 1936 QTRY_COMPARE(spyLoadFinished.count(), 1); 1935 1937 1936 QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString(" data:text/html,error"));1938 QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("error")); 1937 1939 1938 1940 m_view->setPage(0); … … 1948 1950 QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool))); 1949 1951 QTRY_COMPARE(spyLoadFinished.count(), 1); 1950 QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString(" data:text/html,error"));1952 QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("error")); 1951 1953 1952 1954 m_view->setPage(0);
Note: See TracChangeset
for help on using the changeset viewer.