Changeset 51076 in webkit

Timestamp:

Nov 17, 2009 9:55:31 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

[Qt] better test coverage for ErrorPageExtension
​https://bugs.webkit.org/show_bug.cgi?id=31583

Reviewed by Kenneth Christiansen.

Improved the coverage of current ErrorPageExtension tests by
adding autotests involving frameset and iframes.

• tests/qwebpage/tst_qwebpage.cpp:

(ErrorPage::extension): Make the ErrorPageExtension
to work for all frames, not only the main frame.
(tst_QWebPage::errorPageExtension): Stop using
the 'frameset.html' resouce in this method since
an autotest specific for frameset's is being added.
(tst_QWebPage::errorPageExtensionInIFrames): Added.
(tst_QWebPage::errorPageExtensionInFrameset): Added.

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebpage/tst_qwebpage.cpp (modified) (4 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-11-17  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] better test coverage for ErrorPageExtension
+        https://bugs.webkit.org/show_bug.cgi?id=31583
+
+        Improved the coverage of current ErrorPageExtension tests by
+        adding autotests involving frameset and iframes.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (ErrorPage::extension): Make the ErrorPageExtension
+        to work for all frames, not only the main frame.
+        (tst_QWebPage::errorPageExtension): Stop using
+        the 'frameset.html' resouce in this method since
+        an autotest specific for frameset's is being added.
+        (tst_QWebPage::errorPageExtensionInIFrames): Added.
+        (tst_QWebPage::errorPageExtensionInFrameset): Added.
+
 2009-11-16  Simon Hausmann  <simon.hausmann@nokia.com>
 

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

@@ -148 +148 @@
     void defaultTextEncoding();
     void errorPageExtension();
+    void errorPageExtensionInIFrames();
+    void errorPageExtensionInFrameset();
 
     void crashTests_LazyInitializationOfMainFrame();
@@ -1630 +1632 @@
         ErrorPageExtensionReturn* errorPage = static_cast<ErrorPageExtensionReturn*>(output);
 
-        if (info->frame == mainFrame()) {
-            errorPage->content = "data:text/html,error";
-            return true;
-        }
-
-        return false;
+        errorPage->content = "data:text/html,error";
+        return true;
     }
 };
@@ -1646 +1644 @@
     QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
 
-    page->mainFrame()->load(QUrl("qrc:///frametest/index.html"));
+    m_view->setUrl(QUrl("data:text/html,foo"));
     QTRY_COMPARE(spyLoadFinished.count(), 1);
 
     page->mainFrame()->setUrl(QUrl("http://non.existent/url"));
-    QTest::qWait(2000);
     QTRY_COMPARE(spyLoadFinished.count(), 2);
     QCOMPARE(page->mainFrame()->toPlainText(), QString("data:text/html,error"));
@@ -1672 +1669 @@
     QCOMPARE(page->history()->canGoBack(), false);
     QCOMPARE(page->history()->canGoForward(), true);
-    QCOMPARE(page->history()->currentItem().url(), QUrl("qrc:///frametest/index.html"));
+    QCOMPARE(page->history()->currentItem().url(), QUrl("data:text/html,foo"));
+
+    m_view->setPage(0);
+}
+
+void tst_QWebPage::errorPageExtensionInIFrames()
+{
+    ErrorPage* page = new ErrorPage;
+    m_view->setPage(page);
+
+    m_view->setHtml(QString("data:text/html,"
+                            "<h1>h1</h1>"
+                            "<iframe src='data:text/html,<p/>p'></iframe>"
+                            "<iframe src='non-existent.html'></iframe>"));
+    QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
+    QTRY_COMPARE(spyLoadFinished.count(), 1);
+
+    QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("data:text/html,error"));
+
+    m_view->setPage(0);
+}
+
+void tst_QWebPage::errorPageExtensionInFrameset()
+{
+    ErrorPage* page = new ErrorPage;
+    m_view->setPage(page);
+
+    m_view->load(QUrl("qrc:///frametest/index.html"));
+
+    QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
+    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("data:text/html,error"));
 
     m_view->setPage(0);