Clean up FaviconManager and fix icon url in NavigationEntry

Change-Id: I56a109c9071ef581c6a51b5b7b8ce5a2464c6a76
Task-number: QTBUG-51179
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

1 files changed, 67 insertions, 3 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index 022ed3af3..95059fad1 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
@@ -56,6 +56,11 @@ TestWebEngineView {
         signalName: "iconChanged"
     }
 
+    Image {
+        id: favicon
+        source: webEngineView.icon
+    }
+
     TestCase {
         id: test
         name: "WebEngineFavicon"
@@ -72,6 +77,34 @@ TestWebEngineView {
             iconChangedSpy.clear()
         }
 
+        function test_faviconLoad() {
+            compare(iconChangedSpy.count, 0)
+
+            var url = Qt.resolvedUrl("favicon.html")
+            webEngineView.url = url
+            verify(webEngineView.waitForLoadSucceeded())
+
+            iconChangedSpy.wait()
+            compare(iconChangedSpy.count, 1)
+
+            compare(favicon.width, 48)
+            compare(favicon.height, 48)
+        }
+
+        function test_faviconLoadEncodedUrl() {
+            compare(iconChangedSpy.count, 0)
+
+            var url = Qt.resolvedUrl("favicon2.html?favicon=load should work with#whitespace!")
+            webEngineView.url = url
+            verify(webEngineView.waitForLoadSucceeded())
+
+            iconChangedSpy.wait()
+            compare(iconChangedSpy.count, 1)
+
+            compare(favicon.width, 16)
+            compare(favicon.height, 16)
+        }
+
         function test_noFavicon() {
             compare(iconChangedSpy.count, 0)
 
@@ -105,11 +138,10 @@ TestWebEngineView {
             webEngineView.url = url
             verify(webEngineView.waitForLoadSucceeded())
 
-            iconChangedSpy.wait()
-            compare(iconChangedSpy.count, 1)
+            compare(iconChangedSpy.count, 0)
 
             var iconUrl = webEngineView.icon
-            compare(iconUrl, Qt.resolvedUrl("icons/unavailable.ico"))
+            compare(iconUrl, Qt.resolvedUrl(""))
         }
 
         function test_errorPageEnabled() {
@@ -142,6 +174,38 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl(""))
         }
 
+        function test_bestFavicon() {
+            compare(iconChangedSpy.count, 0)
+            var url, iconUrl
+
+            url = Qt.resolvedUrl("favicon-misc.html")
+            webEngineView.url = url
+            verify(webEngineView.waitForLoadSucceeded())
+
+            iconChangedSpy.wait()
+            compare(iconChangedSpy.count, 1)
+
+            iconUrl = webEngineView.icon
+            // Touch icon is ignored
+            compare(iconUrl, Qt.resolvedUrl("icons/qt32.ico"))
+            compare(favicon.width, 32)
+            compare(favicon.height, 32)
+
+            iconChangedSpy.clear()
+
+            url = Qt.resolvedUrl("favicon-shortcut.html")
+            webEngineView.url = url
+            verify(webEngineView.waitForLoadSucceeded())
+
+            iconChangedSpy.wait()
+            verify(iconChangedSpy.count >= 1)
+
+            iconUrl = webEngineView.icon
+            compare(iconUrl, Qt.resolvedUrl("icons/qt144.png"))
+            compare(favicon.width, 144)
+            compare(favicon.height, 144)
+        }
+
         function test_touchIcon() {
             compare(iconChangedSpy.count, 0)