Changeset 561 for trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebpage

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest )
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/frame_a.html (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/frame_a.html )
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/iframe.html (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/iframe.html )
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/iframe2.html (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/iframe2.html )
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/iframe3.html (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/iframe3.html )
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/index.html (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/frametest/index.html )
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/qwebpage.pro (modified) (1 diff)
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (29 diffs)
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.qrc (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.qrc )

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/qwebpage.pro

@@ -3 +3 @@
 include(../../../../WebKit.pri)
 SOURCES  += tst_qwebpage.cpp
+
 QT += testlib network
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+
+
+
+
+
+

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -1 +1 @@
 /*
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+
 
     This library is free software; you can redistribute it and/or
@@ -21 +22 @@
 #include <QtTest/QtTest>
 
+
+
+
+
 #include <qwebpage.h>
 #include <qwidget.h>
+
 #include <qwebview.h>
 #include <qwebframe.h>
@@ -33 +39 @@
 #include <qwebdatabase.h>
 #include <QPushButton>
+
+
+
+
+
 
 // Will try to wait for the condition while allowing event processing
@@ -60 +71 @@
  *         \p false on timeout
  */
-static bool waitForSignal(QObject* obj, const char* signal, int timeout = 0)
+static bool waitForSignal(QObject* obj, const char* signal, int timeout = 0)
 {
     QEventLoop loop;
@@ -75 +86 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 class tst_QWebPage : public QObject
 {
@@ -93 +120 @@
 
     void acceptNavigationRequest();
+
     void loadFinished();
     void acceptNavigationRequestWithNewWindow();
@@ -100 +128 @@
     void database();
     void createPlugin();
+
     void destroyPlugin();
+
     void createViewlessPlugin();
     void multiplePageGroupsAndLocalStorage();
@@ -106 +136 @@
     void textSelection();
     void textEditing();
-
-private:
-
+    void backActionUpdate();
+    void frameAt();
+    void requestCache();
+    void protectBindingsRuntimeObjectsFromCollector();
+    void localURLSchemes();
+    void testOptionalJSObjects();
+    void testEnablePersistentStorage();
+    void consoleOutput();
+    void inputMethods_data();
+    void inputMethods();
+    void defaultTextEncoding();
+    void errorPageExtension();
+
+    void crashTests_LazyInitializationOfMainFrame();
+
+    void screenshot_data();
+    void screenshot();
+
+    void originatingObjectInNetworkRequests();
 
 private:
@@ -190 +236 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 void tst_QWebPage::loadFinished()
 {
+
+
     QSignalSpy spyLoadStarted(m_view, SIGNAL(loadStarted()));
     QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
@@ -212 +280 @@
     QTRY_COMPARE(spyLoadFinished.count(), 1);
     QCOMPARE(spyLoadFinished.count(), 1);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -278 +371 @@
 
     QList<QUrl> requestedUrls;
+
 
 protected:
     virtual QNetworkReply* createRequest(Operation op, const QNetworkRequest &request, QIODevice* outgoingData) {
+
         requestedUrls.append(request.url());
         return QNetworkAccessManager::createRequest(op, request, outgoingData);
@@ -292 +387 @@
     networkManager->requestedUrls.clear();
 
-    m_page->settings()->setUserStyleSheetUrl(QUrl("data:text/css,p { background-image: url('http://does.not/exist.png');}"));
+    m_page->settings()->setUserStyleSheetUrl(QUrl("data:text/css;charset=utf-8;base64,"
+            + QByteArray("p { background-image: url('http://does.not/exist.png');}").toBase64()));
     m_view->setHtml("<p>hello world</p>");
     QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool))));
 
-    QVERIFY(networkManager->requestedUrls.count() >= 2);
-    QCOMPARE(networkManager->requestedUrls.at(0), QUrl("data:text/css,p { background-image: url('http://does.not/exist.png');}"));
-    QCOMPARE(networkManager->requestedUrls.at(1), QUrl("http://does.not/exist.png"));
+    QVERIFY(networkManager->requestedUrls.count() >= 1);
+    QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
 }
 
@@ -354 +449 @@
     QVERIFY(m_page->history()->count() == 2);
     m_page->mainFrame()->setUrl(QUrl("data:text/html,<body>This is fifth page"));
-    QVERIFY(::waitForSignal(m_page, SIGNAL(saveFrameStateRequested(QWebFrame*, QWebHistoryItem*))));
+    QVERIFY(::waitForSignal(m_page, SIGNAL(saveFrameStateRequested(QWebFrame*,QWebHistoryItem*))));
 }
 
@@ -381 +476 @@
     QVERIFY(QWebSettings::offlineStorageDefaultQuota() == 1024 * 1024);
 
+
+
+
     QString dbFileName = path + "Databases.db";
 
@@ -387 +485 @@
 
     qRegisterMetaType<QWebFrame*>("QWebFrame*");
-    QSignalSpy spy(m_page, SIGNAL(databaseQuotaExceeded(QWebFrame *, QString)));
+    QSignalSpy spy(m_page, SIGNAL(databaseQuotaExceeded(QWebFrameQString)));
     m_view->setHtml(QString("<html><head><script>var db; db=openDatabase('testdb', '1.0', 'test database API', 50000); </script></head><body><div></div></body></html>"), QUrl("http://www.myexample.com"));
     QTRY_COMPARE(spy.count(), 1);
@@ -408 +506 @@
     QTest::qWait(200);
 
+
     QWebSecurityOrigin origin = m_page->mainFrame()->securityOrigin();
     QList<QWebDatabase> dbs = origin.databases();
-    if (dbs.count() > 0) {
-        QString fileName = dbs[0].fileName();
+    ) {
+        QString fileName = dbs[].fileName();
         QVERIFY(QFile::exists(fileName));
-        QWebDatabase::removeDatabase(dbs[0]);
+        QWebDatabase::removeDatabase(dbs[]);
         QVERIFY(!QFile::exists(fileName));
     }
+
+
+
+
     QTest::qWait(1000);
 }
@@ -554 +657 @@
 }
 
-class PluginTrackedPage : public QWebPage
-{
+
+// Standard base class for template PluginTracerPage. In tests it is used as interface.
+class PluginCounterPage : public QWebPage {
 public:
-
-    int count;
-    QPointer<QWidget> widget;
-
-    PluginTrackedPage(QWidget *parent = 0) : QWebPage(parent), count(0) {
+    int m_count;
+    QPointer<QObject> m_widget;
+    QObject* m_pluginParent;
+    PluginCounterPage(QObject* parent = 0)
+        : QWebPage(parent)
+        , m_count(0)
+        , m_widget(0)
+        , m_pluginParent(0)
+    {
        settings()->setAttribute(QWebSettings::PluginsEnabled, true);
     }
-
-    virtual QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&) {
-       count++;
-       QWidget *w = new QWidget;
-       widget = w;
-       return w;
+    ~PluginCounterPage()
+    {
+        if (m_pluginParent)
+            m_pluginParent->deleteLater();
     }
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void tst_QWebPage::destroyPlugin()
 {
-    PluginTrackedPage* page = new PluginTrackedPage(m_view);
+    QFETCH(int, type);
+    PluginCounterPage* page = PluginFactory::create((PluginFactory::FactoredType)type, m_view);
     m_view->setPage(page);
 
@@ -581 +741 @@
     QString content("<html><body><object type=\"application/x-qt-plugin\" classid=\"QProgressBar\"></object></body></html>");
     m_view->setHtml(content);
-    QVERIFY(page->widget != 0);
-    QCOMPARE(page->count, 1);
+    QVERIFY(page->);
+    QCOMPARE(page->count, 1);
 
     // navigate away, the plugin widget should be destructed
     m_view->setHtml("<html><body>Hi</body></html>");
     QTestEventLoop::instance().enterLoop(1);
-    QVERIFY(page->widget == 0);
+    QVERIFY(!page->m_widget);
+}
+
+void tst_QWebPage::createViewlessPlugin_data()
+{
+    PluginFactory::prepareTestData();
 }
 
 void tst_QWebPage::createViewlessPlugin()
 {
-    PluginTrackedPage* page = new PluginTrackedPage;
+    QFETCH(int, type);
+    PluginCounterPage* page = PluginFactory::create((PluginFactory::FactoredType)type);
     QString content("<html><body><object type=\"application/x-qt-plugin\" classid=\"QProgressBar\"></object></body></html>");
     page->mainFrame()->setHtml(content);
-    QCOMPARE(page->count, 1);
-    QVERIFY(page->widget != 0);
+    QCOMPARE(page->m_count, 1);
+    QVERIFY(page->m_widget);
+    QVERIFY(page->m_pluginParent);
+    QVERIFY(page->m_widget->parent() == page->m_pluginParent);
     delete page;
+
 }
 
@@ -603 +772 @@
 void QWEBKIT_EXPORT qt_webpage_setGroupName(QWebPage* page, const QString& groupName);
 QString QWEBKIT_EXPORT qt_webpage_groupName(QWebPage* page);
-void QWEBKIT_EXPORT qt_websettings_setLocalStorageDatabasePath(QWebSettings* settings, const QString& path);
 
 void tst_QWebPage::multiplePageGroupsAndLocalStorage()
@@ -614 +782 @@
     QWebView view2;
 
-    qt_websettings_setLocalStorageDatabasePath(view1.page()->settings(), QDir::toNativeSeparators(QDir::currentPath() + "/path1"));
+    view1.page()->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
+    view1.page()->settings()->setLocalStoragePath(QDir::toNativeSeparators(QDir::currentPath() + "/path1"));
     qt_webpage_setGroupName(view1.page(), "group1");
-    qt_websettings_setLocalStorageDatabasePath(view2.page()->settings(), QDir::toNativeSeparators(QDir::currentPath() + "/path2"));
+    view2.page()->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);    
+    view2.page()->settings()->setLocalStoragePath(QDir::toNativeSeparators(QDir::currentPath() + "/path2"));
     qt_webpage_setGroupName(view2.page(), "group2");
     QCOMPARE(qt_webpage_groupName(view1.page()), QString("group1"));
@@ -833 +1003 @@
     page->triggerAction(QWebPage::MoveToStartOfBlock);
     QVERIFY(page->isSelectionCollapsed());
-    QCOMPARE(page->selectionStartOffset(), 2);
+    QCOMPARE(page->selectionStartOffset(), );
 
     // cursor will be after the word "you!"
@@ -870 +1040 @@
         "<p>May the source<br/>be with you!</p></body></html>");
     page->mainFrame()->setHtml(content);
-
-    // this will select the first paragraph
-    QString script = "var range = document.createRange(); " \
-        "var node = document.getElementById(\"one\"); " \
-        "range.selectNode(node); " \
-        "getSelection().addRange(range);";
-    page->mainFrame()->evaluateJavaScript(script);
-    QCOMPARE(page->selectedText().trimmed(), QString::fromLatin1("The quick brown fox"));
 
     // these actions must exist
@@ -894 +1056 @@
     QVERIFY(page->action(QWebPage::SelectEndOfDocument) != 0);
 
-    // right now they are disabled because contentEditable is false
+    // right now they are disabled because contentEditable is false and 
+    // there isn't an existing selection to modify
     QCOMPARE(page->action(QWebPage::SelectNextChar)->isEnabled(), false);
     QCOMPARE(page->action(QWebPage::SelectPreviousChar)->isEnabled(), false);
@@ -911 +1074 @@
     QCOMPARE(page->action(QWebPage::SelectAll)->isEnabled(), true);
 
-    // make it editable before navigating the cursor
-    page->setContentEditable(true);
-
-    // here the actions are enabled after contentEditable is true
-    QCOMPARE(page->action(QWebPage::SelectAll)->isEnabled(), true);
+    // this will select the first paragraph
+    QString selectScript = "var range = document.createRange(); " \
+        "var node = document.getElementById(\"one\"); " \
+        "range.selectNode(node); " \
+        "getSelection().addRange(range);";
+    page->mainFrame()->evaluateJavaScript(selectScript);
+    QCOMPARE(page->selectedText().trimmed(), QString::fromLatin1("The quick brown fox"));
+
+    // here the actions are enabled after a selection has been created
     QCOMPARE(page->action(QWebPage::SelectNextChar)->isEnabled(), true);
     QCOMPARE(page->action(QWebPage::SelectPreviousChar)->isEnabled(), true);
@@ -929 +1096 @@
     QCOMPARE(page->action(QWebPage::SelectEndOfDocument)->isEnabled(), true);
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     delete page;
 }
@@ -940 +1129 @@
     page->mainFrame()->setHtml(content);
 
-    // this will select the first paragraph
-    QString script = "var range = document.createRange(); " \
-        "var node = document.getElementById(\"one\"); " \
-        "range.selectNode(node); " \
-        "getSelection().addRange(range);";
-    page->mainFrame()->evaluateJavaScript(script);
-    QCOMPARE(page->selectedText().trimmed(), QString::fromLatin1("The quick brown fox"));
-
     // these actions must exist
+
+
+
     QVERIFY(page->action(QWebPage::DeleteStartOfWord) != 0);
     QVERIFY(page->action(QWebPage::DeleteEndOfWord) != 0);
@@ -959 +1143 @@
     QVERIFY(page->action(QWebPage::InsertParagraphSeparator) != 0);
     QVERIFY(page->action(QWebPage::InsertLineSeparator) != 0);
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     // right now they are disabled because contentEditable is false
+
+
     QCOMPARE(page->action(QWebPage::DeleteStartOfWord)->isEnabled(), false);
     QCOMPARE(page->action(QWebPage::DeleteEndOfWord)->isEnabled(), false);
@@ -971 +1170 @@
     QCOMPARE(page->action(QWebPage::InsertParagraphSeparator)->isEnabled(), false);
     QCOMPARE(page->action(QWebPage::InsertLineSeparator)->isEnabled(), false);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     // make it editable before navigating the cursor
     page->setContentEditable(true);
 
+
+
+
+
+
+
+
+
     // here the actions are enabled after contentEditable is true
+
     QCOMPARE(page->action(QWebPage::DeleteStartOfWord)->isEnabled(), true);
     QCOMPARE(page->action(QWebPage::DeleteEndOfWord)->isEnabled(), true);
@@ -986 +1213 @@
     QCOMPARE(page->action(QWebPage::InsertParagraphSeparator)->isEnabled(), true);
     QCOMPARE(page->action(QWebPage::InsertLineSeparator)->isEnabled(), true);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     delete page;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 QTEST_MAIN(tst_QWebPage)