Replace FaviconManager with Chromium's Favicon Component

Task-number: QTBUG-51184 Change-Id: Ie050cb23f2c86841a66ec384bfbcdf0713cffa7c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Peter Varga <pvarga@inf.u-szeged.hu> 2020-06-19 11:17:50 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2021-06-04 18:41:41 +0200
commit: 881339e9d9054c46f2621119246de7a13c83761a (patch)
tree: 77db7d7188c4ac61cab939c2ccd7a9610d4a01f4 /tests/auto/quick/qmltests/data
parent: 4d67b9f639114ddec0521980495ba27921800e39 (diff)
3 files changed, 240 insertions, 222 deletions
diff --git a/tests/auto/quick/qmltests/data/favicon-misc.html b/tests/auto/quick/qmltests/data/favicon-misc.html
index 9e788bdf4..03d1086ff 100644
--- a/tests/auto/quick/qmltests/data/favicon-misc.html
+++ b/tests/auto/quick/qmltests/data/favicon-misc.html
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>Favicon Test</title>
-        <link rel="shortcut icon" href="icons/qt32.ico" />
-        <link rel="apple-touch-icon" href="icons/qt144.png" />
+        <link rel="shortcut icon" href="icons/qt32.ico" sizes="32x32" />
+        <link rel="apple-touch-icon" href="icons/qt144.png" sizes="144x144"/>
         <link rel="shortcut icon" href="icons/unavailable.ico" />
     </head>
     <body>
diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index fc8b90542..4d13d1e76 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -26,30 +26,26 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebEngine 1.3
-import QtWebEngine.testsupport 1.0
-import QtQuick.Window 2.0
-import "../../qmltests/data" 1.0
+import QtQuick
+import QtTest
+import QtWebEngine
+import Test.util
+import "../../qmltests/data"
 
 TestWebEngineView {
     id: webEngineView
     width: 200
     height: 400
 
-    testSupport: WebEngineTestSupport {
-        property var errorPageLoadStatus: null
+    TempDir { id: tempDir }
 
-        function waitForErrorPageLoadSucceeded() {
-            var success = _waitFor(function() { return testSupport.errorPageLoadStatus == WebEngineView.LoadSucceededStatus })
-            testSupport.errorPageLoadStatus = null
-            return success
-        }
+    property QtObject defaultProfile: WebEngineProfile {
+        offTheRecord: true
+    }
 
-        errorPage.onLoadingChanged: function(load) {
-            errorPageLoadStatus = load.status
-        }
+    property QtObject nonOTRProfile: WebEngineProfile {
+        persistentStoragePath: tempDir.path() + '/WebEngineFavicon'
+        offTheRecord: false
     }
 
     function removeFaviconProviderPrefix(url) {
@@ -58,10 +54,10 @@ TestWebEngineView {
 
     function getFaviconPixel(faviconImage) {
         var grabImage = Qt.createQmlObject("
-                import QtQuick 2.5\n
+                import QtQuick\n
                 Image { }", testCase)
         var faviconCanvas = Qt.createQmlObject("
-                import QtQuick 2.5\n
+                import QtQuick\n
                 Canvas { }", testCase)
 
         testCase.tryVerify(function() { return faviconImage.status == Image.Ready });
@@ -104,12 +100,22 @@ TestWebEngineView {
 
         function init() {
             // It is worth to restore the initial state with loading a blank page before all test functions.
-            webEngineView.url = 'about:blank'
-            verify(webEngineView.waitForLoadSucceeded())
-            iconChangedSpy.clear()
+            webEngineView.url = 'about:blank';
+            verify(webEngineView.waitForLoadSucceeded());
+            iconChangedSpy.clear();
+            webEngineView.settings.touchIconsEnabled = false;
+            webEngineView.settings.autoLoadIconsForPage = true;
         }
 
-        function test_faviconLoad() {
+        function test_faviconLoad_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_faviconLoad(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("favicon.html")
@@ -119,11 +125,20 @@ TestWebEngineView {
             iconChangedSpy.wait()
             compare(iconChangedSpy.count, 1)
 
-            compare(favicon.width, 48)
-            compare(favicon.height, 48)
+            tryCompare(favicon, "status", Image.Ready)
+            compare(favicon.width, 32)
+            compare(favicon.height, 32)
+        }
+
+        function test_faviconLoadEncodedUrl_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
         }
 
-        function test_faviconLoadEncodedUrl() {
+        function test_faviconLoadEncodedUrl(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("favicon2.html?favicon=load should work with#whitespace!")
@@ -133,11 +148,62 @@ TestWebEngineView {
             iconChangedSpy.wait()
             compare(iconChangedSpy.count, 1)
 
-            compare(favicon.width, 16)
-            compare(favicon.height, 16)
+            tryCompare(favicon, "status", Image.Ready)
+            compare(favicon.width, 32)
+            compare(favicon.height, 32)
         }
 
-        function test_noFavicon() {
+        function test_faviconLoadAfterHistoryNavigation_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_faviconLoadAfterHistoryNavigation(row) {
+            webEngineView.profile = row.profile
+            compare(iconChangedSpy.count, 0)
+
+            var iconUrl
+
+            webEngineView.url = Qt.resolvedUrl("favicon.html")
+            verify(webEngineView.waitForLoadSucceeded())
+            tryCompare(iconChangedSpy, "count", 1)
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
+            compare(iconUrl, Qt.resolvedUrl("icons/favicon.png"))
+
+            iconChangedSpy.clear()
+            webEngineView.url = Qt.resolvedUrl("favicon-shortcut.html")
+            verify(webEngineView.waitForLoadSucceeded())
+            tryCompare(iconChangedSpy, "count", 2)
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
+            compare(iconUrl, Qt.resolvedUrl("icons/qt32.ico"))
+
+            iconChangedSpy.clear()
+            webEngineView.goBack();
+            verify(webEngineView.waitForLoadSucceeded())
+            tryCompare(iconChangedSpy, "count", 2)
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
+            compare(iconUrl, Qt.resolvedUrl("icons/favicon.png"))
+
+            iconChangedSpy.clear()
+            webEngineView.goForward();
+            verify(webEngineView.waitForLoadSucceeded())
+            tryCompare(iconChangedSpy, "count", 2)
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
+            compare(iconUrl, Qt.resolvedUrl("icons/qt32.ico"))
+        }
+
+
+        function test_noFavicon_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_noFavicon(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("test1.html")
@@ -150,7 +216,15 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl(""))
         }
 
-        function test_aboutBlank() {
+        function test_aboutBlank_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_aboutBlank(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("about:blank")
@@ -163,7 +237,15 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl(""))
         }
 
-        function test_unavailableFavicon() {
+        function test_unavailableFavicon_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_unavailableFavicon(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("favicon-unavailable.html")
@@ -176,15 +258,25 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl(""))
         }
 
-        function test_errorPageEnabled() {
-            WebEngine.settings.errorPageEnabled = true
+        function test_errorPageEnabled_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_errorPageEnabled(row) {
+            webEngineView.profile = row.profile
+            webEngineView.settings.errorPageEnabled = true
 
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("http://url.invalid")
             webEngineView.url = url
             verify(webEngineView.waitForLoadFailed(20000))
-            verify(webEngineView.testSupport.waitForErrorPageLoadSucceeded())
+            // FIXME: Wait for error page load to finish.
+            // This should be done without testSupport API.
+            wait(500)
 
             compare(iconChangedSpy.count, 0)
 
@@ -192,8 +284,16 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl(""))
         }
 
-        function test_errorPageDisabled() {
-            WebEngine.settings.errorPageEnabled = false
+        function test_errorPageDisabled_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_errorPageDisabled(row) {
+            webEngineView.profile = row.profile
+            webEngineView.settings.errorPageEnabled = false
 
             compare(iconChangedSpy.count, 0)
 
@@ -207,7 +307,15 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl(""))
         }
 
-        function test_bestFavicon() {
+        function test_bestFavicon_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_bestFavicon(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
             var url, iconUrl
 
@@ -221,6 +329,7 @@ TestWebEngineView {
             iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
             // Touch icon is ignored
             compare(iconUrl, Qt.resolvedUrl("icons/qt32.ico"))
+            tryCompare(favicon, "status", Image.Ready)
             compare(favicon.width, 32)
             compare(favicon.height, 32)
 
@@ -230,23 +339,25 @@ TestWebEngineView {
             webEngineView.url = url
             verify(webEngineView.waitForLoadSucceeded())
 
-            iconChangedSpy.wait()
-            verify(iconChangedSpy.count >= 1)
+            tryCompare(iconChangedSpy, "count", 2)
             iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
 
-            // If the icon URL is empty we have to wait for
-            // the second iconChanged signal that propagates the expected URL
-            if (iconUrl == Qt.resolvedUrl("")) {
-                tryCompare(iconChangedSpy, "count", 2)
-                iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
-            }
+            // If touch icon is disabled, FaviconHandler propagates the icon closest to size 16x16
+            compare(iconUrl, Qt.resolvedUrl("icons/qt32.ico"))
+            tryCompare(favicon, "status", Image.Ready)
+            compare(favicon.width, 32)
+            compare(favicon.height, 32)
+        }
 
-            compare(iconUrl, Qt.resolvedUrl("icons/qt144.png"))
-            compare(favicon.width, 144)
-            compare(favicon.height, 144)
+        function test_touchIcon_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
         }
 
-        function test_touchIcon() {
+        function test_touchIcon(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("favicon-touch.html")
@@ -260,7 +371,7 @@ TestWebEngineView {
             compare(favicon.width, 0)
             compare(favicon.height, 0)
 
-            WebEngine.settings.touchIconsEnabled = true
+            webEngineView.settings.touchIconsEnabled = true
 
             url = Qt.resolvedUrl("favicon-touch.html")
             webEngineView.url = url
@@ -270,11 +381,20 @@ TestWebEngineView {
             iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
             compare(iconUrl, Qt.resolvedUrl("icons/qt144.png"))
             compare(iconChangedSpy.count, 1)
+            tryCompare(favicon, "status", Image.Ready)
             compare(favicon.width, 144)
             compare(favicon.height, 144)
         }
 
-        function test_multiIcon() {
+        function test_multiIcon_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_multiIcon(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
             var url = Qt.resolvedUrl("favicon-multi.html")
@@ -283,61 +403,24 @@ TestWebEngineView {
 
             iconChangedSpy.wait()
             compare(iconChangedSpy.count, 1)
-            compare(favicon.width, 64)
-            compare(favicon.height, 64)
+            tryCompare(favicon, "status", Image.Ready)
+            compare(favicon.width, 32)
+            compare(favicon.height, 32)
         }
 
-        function test_faviconProvider_data() {
+        function test_dynamicFavicon_data() {
             return [
-                   { tag: "multi 8x8", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 8, value: 16 },
-                   { tag: "multi 16x16", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 16, value: 16 },
-                   { tag: "multi 17x17", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 17, value: 32 },
-                   { tag: "multi 31x31", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 31, value: 32 },
-                   { tag: "multi 32x32", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 32, value: 32 },
-                   { tag: "multi 33x33", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 33, value: 64 },
-                   { tag: "multi 64x64", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 64, value: 64 },
-                   { tag: "multi 128x128", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 128, value: 128 },
-                   { tag: "multi 255x255", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 255, value: 255 },
-                   { tag: "multi 256x256", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 256, value: 255 },
-                   { tag: "candidate 8x8", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 8, value: 16 },
-                   { tag: "candidate 16x16", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 16, value: 16 },
-                   { tag: "candidate 17x17", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 17, value: 32 },
-                   { tag: "candidate 31x31", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 31, value: 32 },
-                   { tag: "candidate 32x32", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 32, value: 32 },
-                   { tag: "candidate 33x33", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 33, value: 64 },
-                   { tag: "candidate 64x64", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 64, value: 64 },
-                   { tag: "candidate 128x128", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 128, value: 128 },
-                   { tag: "candidate 255x255", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 255, value: 255 },
-                   { tag: "candidate 256x256", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 256, value: 255 },
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
             ];
         }
 
-        function test_faviconProvider(row) {
-            var faviconImage = Qt.createQmlObject("
-                    import QtQuick 2.5\n
-                    Image { sourceSize: Qt.size(width, height) }", testCase)
-
+        function test_dynamicFavicon(row) {
+            webEngineView.profile = row.profile
             compare(iconChangedSpy.count, 0)
 
-            webEngineView.url = row.url
-            verify(webEngineView.waitForLoadSucceeded())
-
-            iconChangedSpy.wait()
-            compare(iconChangedSpy.count, 1)
-
-            faviconImage.width = row.size / Screen.devicePixelRatio
-            faviconImage.height = row.size  / Screen.devicePixelRatio
-            faviconImage.source = webEngineView.icon
-
-            var pixel = getFaviconPixel(faviconImage);
-            compare(pixel[0], row.value)
-
-            faviconImage.destroy()
-        }
-
-        function test_dynamicFavicon() {
             var faviconImage = Qt.createQmlObject("
-                    import QtQuick 2.5\n
+                    import QtQuick\n
                     Image { width: 16; height: 16; sourceSize: Qt.size(width, height); }", testCase)
             faviconImage.source = Qt.binding(function() { return webEngineView.icon; });
 
@@ -377,9 +460,17 @@ TestWebEngineView {
             faviconImage.destroy()
         }
 
-        function test_touchIconWithSameURL()
+        function test_touchIconWithSameURL_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_touchIconWithSameURL(row)
         {
-            WebEngine.settings.touchIconsEnabled = false;
+            webEngineView.profile = row.profile;
+            compare(iconChangedSpy.count, 0);
 
             var icon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=";
 
@@ -409,5 +500,53 @@ TestWebEngineView {
             tryCompare(iconChangedSpy, "count", 1);
             verify(!webEngineView.icon.toString().replace(/^image:\/\/favicon\//, ''));
         }
+
+        function test_iconsDisabled_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_iconsDisabled(row) {
+            webEngineView.settings.autoLoadIconsForPage = false
+            webEngineView.profile = defaultProfile
+            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_touchIconsEnabled_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_touchIconsEnabled(row) {
+            webEngineView.settings.touchIconsEnabled = true
+            webEngineView.profile = defaultProfile
+            compare(iconChangedSpy.count, 0)
+
+            webEngineView.url = row.url
+            verify(webEngineView.waitForLoadSucceeded())
+
+            iconChangedSpy.wait()
+            compare(iconChangedSpy.count, 1)
+
+            var iconUrl = removeFaviconProviderPrefix(webEngineView.icon)
+            compare(iconUrl, row.expectedIconUrl)
+        }
     }
 }
diff --git a/tests/auto/quick/qmltests/data/tst_faviconDownload.qml b/tests/auto/quick/qmltests/data/tst_faviconDownload.qml
deleted file mode 100644
index 7d9c39814..000000000
--- a/tests/auto/quick/qmltests/data/tst_faviconDownload.qml
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** 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
-import "../../qmltests/data" 1.0
-
-TestWebEngineView {
-    id: webEngineView
-    width: 200
-    height: 400
-
-    function removeFaviconProviderPrefix(url) {
-        return url.toString().substring(16)
-    }
-
-    SignalSpy {
-        id: iconChangedSpy
-        target: webEngineView
-        signalName: "iconChanged"
-    }
-
-    TestCase {
-        id: testCase
-        name: "WebEngineFaviconDownload"
-
-        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 = removeFaviconProviderPrefix(webEngineView.icon)
-            compare(iconUrl, row.expectedIconUrl)
-        }
-    }
-}
-
author	Peter Varga <pvarga@inf.u-szeged.hu>	2020-06-19 11:17:50 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2021-06-04 18:41:41 +0200
commit	881339e9d9054c46f2621119246de7a13c83761a (patch)
tree	77db7d7188c4ac61cab939c2ccd7a9610d4a01f4 /tests/auto/quick/qmltests/data
parent	4d67b9f639114ddec0521980495ba27921800e39 (diff)