Add settings for FaviconManager's icon download modes

Change-Id: I8e4b11089de29623ed39ec6b13fe30be734baa3e
Task-number: QTBUG-51179
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

3 files changed, 180 insertions, 1 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_faviconDownload.qml b/tests/auto/quick/qmltests/data/tst_faviconDownload.qml
new file mode 100644
index 000000000..4cf0edc4d
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_faviconDownload.qml
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebEngine 1.3
+
+TestWebEngineView {
+    id: webEngineView
+    width: 200
+    height: 400
+
+    SignalSpy {
+        id: iconChangedSpy
+        target: webEngineView
+        signalName: "iconChanged"
+    }
+
+    TestCase {
+        id: test
+        name: "WebEngineFaviconDownload"
+        when: windowShown
+
+        function init() {
+            WebEngine.settings.autoLoadIconsForPage = true
+            WebEngine.settings.touchIconsEnabled = false
+
+            if (webEngineView.icon != '') {
+                // If this is not the first test, then load a blank page without favicon, restoring the initial state.
+                webEngineView.url = 'about:blank'
+                verify(webEngineView.waitForLoadSucceeded())
+                iconChangedSpy.wait()
+            }
+
+            iconChangedSpy.clear()
+        }
+
+        function cleanupTestCase() {
+            WebEngine.settings.autoLoadIconsForPage = true
+            WebEngine.settings.touchIconsEnabled = false
+        }
+
+        function test_downloadIconsDisabled_data() {
+            return [
+                   { tag: "misc", url: Qt.resolvedUrl("favicon-misc.html") },
+                   { tag: "shortcut", url: Qt.resolvedUrl("favicon-shortcut.html") },
+                   { tag: "single", url: Qt.resolvedUrl("favicon-single.html") },
+                   { tag: "touch", url: Qt.resolvedUrl("favicon-touch.html") },
+                   { tag: "unavailable", url: Qt.resolvedUrl("favicon-unavailable.html") },
+            ];
+        }
+
+        function test_downloadIconsDisabled(row) {
+            WebEngine.settings.autoLoadIconsForPage = false
+
+            compare(iconChangedSpy.count, 0)
+
+            webEngineView.url = row.url
+            verify(webEngineView.waitForLoadSucceeded())
+
+            compare(iconChangedSpy.count, 0)
+
+            var iconUrl = webEngineView.icon
+            compare(iconUrl, Qt.resolvedUrl(""))
+        }
+
+        function test_downloadTouchIconsEnabled_data() {
+            return [
+                   { tag: "misc", url: Qt.resolvedUrl("favicon-misc.html"), expectedIconUrl: Qt.resolvedUrl("icons/qt144.png") },
+                   { tag: "shortcut", url: Qt.resolvedUrl("favicon-shortcut.html"), expectedIconUrl: Qt.resolvedUrl("icons/qt144.png") },
+                   { tag: "single", url: Qt.resolvedUrl("favicon-single.html"), expectedIconUrl: Qt.resolvedUrl("icons/qt32.ico") },
+                   { tag: "touch", url: Qt.resolvedUrl("favicon-touch.html"), expectedIconUrl: Qt.resolvedUrl("icons/qt144.png") },
+            ];
+        }
+
+        function test_downloadTouchIconsEnabled(row) {
+            WebEngine.settings.touchIconsEnabled = true
+
+            compare(iconChangedSpy.count, 0)
+
+            webEngineView.url = row.url
+            verify(webEngineView.waitForLoadSucceeded())
+
+            iconChangedSpy.wait()
+            compare(iconChangedSpy.count, 1)
+
+            var iconUrl = webEngineView.icon
+            compare(iconUrl, row.expectedIconUrl)
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index d3307a339..2086e88cf 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -39,6 +39,7 @@ OTHER_FILES += \
     $$PWD/data/tst_desktopBehaviorLoadHtml.qml \
     $$PWD/data/tst_download.qml \
     $$PWD/data/tst_favicon.qml \
+    $$PWD/data/tst_faviconDownload.qml \
     $$PWD/data/tst_filePicker.qml \
     $$PWD/data/tst_formValidation.qml \
     $$PWD/data/tst_geopermission.qml \
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp b/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp
index a0f864a6f..9f14a4219 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp
+++ b/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp
@@ -54,6 +54,10 @@ private Q_SLOTS:
     void errorPageDisabled();
     void bestFavicon();
     void touchIcon();
+    void downloadIconsDisabled_data();
+    void downloadIconsDisabled();
+    void downloadTouchIconsEnabled_data();
+    void downloadTouchIconsEnabled();
 
 private:
     QWebEngineView* m_view;
@@ -267,11 +271,68 @@ void tst_QWebEngineFaviconManager::touchIcon()
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 0);
+    QCOMPARE(iconUrlChangedSpy.count(), 0);
+
+    QVERIFY(m_page->iconUrl().isEmpty());
+}
+
+void tst_QWebEngineFaviconManager::downloadIconsDisabled_data()
+{
+    QTest::addColumn<QUrl>("url");
+    QTest::newRow("misc") << QUrl("qrc:/resources/favicon-misc.html");
+    QTest::newRow("shortcut") << QUrl("qrc:/resources/favicon-shortcut.html");
+    QTest::newRow("single") << QUrl("qrc:/resources/favicon-single.html");
+    QTest::newRow("touch") << QUrl("qrc:/resources/favicon-touch.html");
+    QTest::newRow("unavailable") << QUrl("qrc:/resources/favicon-unavailable.html");
+}
+
+void tst_QWebEngineFaviconManager::downloadIconsDisabled()
+{
+    QFETCH(QUrl, url);
+
+    m_page->settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
+
+    QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
+    QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
+
+    m_page->load(url);
+
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QCOMPARE(iconUrlChangedSpy.count(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
 }
 
+void tst_QWebEngineFaviconManager::downloadTouchIconsEnabled_data()
+{
+    QTest::addColumn<QUrl>("url");
+    QTest::addColumn<QUrl>("expectedIconUrl");
+    QTest::newRow("misc") << QUrl("qrc:/resources/favicon-misc.html") << QUrl("qrc:/resources/icons/qt144.png");
+    QTest::newRow("shortcut") << QUrl("qrc:/resources/favicon-shortcut.html") << QUrl("qrc:/resources/icons/qt144.png");
+    QTest::newRow("single") << QUrl("qrc:/resources/favicon-single.html") << QUrl("qrc:/resources/icons/qt32.ico");
+    QTest::newRow("touch") << QUrl("qrc:/resources/favicon-touch.html") << QUrl("qrc:/resources/icons/qt144.png");
+}
+
+void tst_QWebEngineFaviconManager::downloadTouchIconsEnabled()
+{
+    QFETCH(QUrl, url);
+    QFETCH(QUrl, expectedIconUrl);
+
+    m_page->settings()->setAttribute(QWebEngineSettings::TouchIconsEnabled, true);
+
+    QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
+    QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
+
+    m_page->load(url);
+
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
+
+    QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
+    QCOMPARE(m_page->iconUrl(), iconUrl);
+    QCOMPARE(iconUrl, expectedIconUrl);
+}
+
 QTEST_MAIN(tst_QWebEngineFaviconManager)
 
 #include "tst_qwebenginefaviconmanager.moc"