diff options
Diffstat (limited to 'tests/auto')
8 files changed, 86 insertions, 155 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml index fab2e9755..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,16 +77,43 @@ TestWebEngineView { iconChangedSpy.clear() } - function test_noFavicon() { + function test_faviconLoad() { compare(iconChangedSpy.count, 0) - var url = Qt.resolvedUrl("test1.html") + 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) + + var url = Qt.resolvedUrl("test1.html") + webEngineView.url = url + verify(webEngineView.waitForLoadSucceeded()) + + compare(iconChangedSpy.count, 0) + var iconUrl = webEngineView.icon compare(iconUrl, Qt.resolvedUrl("")) } @@ -93,8 +125,7 @@ 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("")) @@ -107,27 +138,22 @@ 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() { - skip("Error page does not work properly: QTBUG-48995") WebEngine.settings.errorPageEnabled = true compare(iconChangedSpy.count, 0) - var url = Qt.resolvedUrl("http://non.existent/url") + var url = Qt.resolvedUrl("invalid://url") webEngineView.url = url verify(webEngineView.testSupport.waitForErrorPageLoadSucceeded()) - iconChangedSpy.wait() - // Icon is reseted at load start. - // Load is started twice: once for unavailale page then error page - compare(iconChangedSpy.count, 2) + compare(iconChangedSpy.count, 0) var iconUrl = webEngineView.icon compare(iconUrl, Qt.resolvedUrl("")) @@ -138,27 +164,57 @@ TestWebEngineView { compare(iconChangedSpy.count, 0) - var url = Qt.resolvedUrl("http://non.existent/url") + var url = Qt.resolvedUrl("invalid://url") webEngineView.url = url verify(webEngineView.waitForLoadFailed()) - iconChangedSpy.wait() - compare(iconChangedSpy.count, 1) + compare(iconChangedSpy.count, 0) var iconUrl = webEngineView.icon compare(iconUrl, Qt.resolvedUrl("")) } - function test_touchIcon() { + function test_bestFavicon() { compare(iconChangedSpy.count, 0) + var url, iconUrl - var url = Qt.resolvedUrl("favicon-touch.html") + 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) + + var url = Qt.resolvedUrl("favicon-touch.html") + webEngineView.url = url + verify(webEngineView.waitForLoadSucceeded()) + + compare(iconChangedSpy.count, 0) + var iconUrl = webEngineView.icon compare(iconUrl, Qt.resolvedUrl("")) } diff --git a/tests/auto/quick/qmltests/data/tst_faviconImage.qml b/tests/auto/quick/qmltests/data/tst_faviconImage.qml deleted file mode 100644 index 603f76954..000000000 --- a/tests/auto/quick/qmltests/data/tst_faviconImage.qml +++ /dev/null @@ -1,125 +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 - -TestWebEngineView { - id: webEngineView - width: 200 - height: 400 - - SignalSpy { - id: iconChangedSpy - target: webEngineView - signalName: "iconChanged" - } - - Image { - id: faviconImage - source: webEngineView.icon - } - - TestCase { - id: test - name: "WebEngineFaviconImage" - when: windowShown - - function init() { - 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 test_faviconImageLoad() { - compare(iconChangedSpy.count, 0) - - var url = Qt.resolvedUrl("favicon.html") - webEngineView.url = url - verify(webEngineView.waitForLoadSucceeded()) - - iconChangedSpy.wait() - compare(iconChangedSpy.count, 1) - - compare(faviconImage.width, 48) - compare(faviconImage.height, 48) - } - - function test_faviconImageLoadEncodedUrl() { - 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(faviconImage.width, 16) - compare(faviconImage.height, 16) - } - - function test_bestFaviconImage() { - 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(faviconImage.width, 32) - compare(faviconImage.height, 32) - - iconChangedSpy.clear() - - url = Qt.resolvedUrl("favicon-shortcut.html") - webEngineView.url = url - verify(webEngineView.waitForLoadSucceeded()) - - iconChangedSpy.wait() - compare(iconChangedSpy.count, 1) - - iconUrl = webEngineView.icon - compare(iconUrl, Qt.resolvedUrl("icons/qt144.png")) - compare(faviconImage.width, 144) - compare(faviconImage.height, 144) - } - } -} diff --git a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml index 7d0cc47b4..117df5776 100644 --- a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml +++ b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml @@ -110,6 +110,7 @@ TestWebEngineView { webEngineView.reload() verify(webEngineView.waitForLoadSucceeded()) compare(JSDialogParams.dialogCount, 2) + expectFail("", "QTBUG-51749") compare(webEngineView.title, "prompt.html") } } diff --git a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml index ae60e5f5e..86fb9281c 100644 --- a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml +++ b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml @@ -53,6 +53,7 @@ TestWebEngineView { } function test_keyboardModifierMapping() { + skip("runJavaScript bug: QTBUG-51746") webEngineView.url = Qt.resolvedUrl("keyboardModifierMapping.html") waitForLoadSucceeded(); titleSpy.wait() diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml index 0da9e841b..9b18870e4 100644 --- a/tests/auto/quick/qmltests/data/tst_loadFail.qml +++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml @@ -140,7 +140,7 @@ TestWebEngineView { verify(loadRequest.isErrorPage) compare(webEngineView.url, unavailableUrl) - compare(webEngineView.title, unavailableUrl + " is not found") + compare(webEngineView.title, unavailableUrl + " failed to load") } } } diff --git a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml index beeebc049..2011d2a5c 100644 --- a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml +++ b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml @@ -44,6 +44,7 @@ TestWebEngineView { TestCase { name: "WebEngineViewRunJavaScript" function test_runJavaScript() { + skip("runJavaScript bug: QTBUG-51746") var testTitle = "Title to test runJavaScript"; runJavaScript("document.title = \"" + testTitle +"\""); _waitFor(function() { spy.count > 0; }); diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index d1849d020..d3307a339 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -39,7 +39,6 @@ OTHER_FILES += \ $$PWD/data/tst_desktopBehaviorLoadHtml.qml \ $$PWD/data/tst_download.qml \ $$PWD/data/tst_favicon.qml \ - $$PWD/data/tst_faviconImage.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 f435288f7..89a33134f 100644 --- a/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp +++ b/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp @@ -105,7 +105,7 @@ void tst_QWebEngineFaviconManager::faviconLoadFromResources() QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool))); QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl))); - QUrl url = QUrl("qrc:/resources/favicon-single.html"); + QUrl url("qrc:/resources/favicon-single.html"); m_page->load(url); QTRY_COMPARE(loadFinishedSpy.count(), 1); @@ -124,7 +124,7 @@ void tst_QWebEngineFaviconManager::faviconLoadEncodedUrl() QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl))); QString urlString = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-single.html")).toString(); - QUrl url = QUrl(urlString + QLatin1String("?favicon=load should work with#whitespace!")); + QUrl url(urlString + QLatin1String("?favicon=load should work with#whitespace!")); m_page->load(url); QTRY_COMPARE(loadFinishedSpy.count(), 1); @@ -157,11 +157,11 @@ void tst_QWebEngineFaviconManager::aboutBlank() QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool))); QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl))); - QUrl url = QUrl("about:blank"); + QUrl url("about:blank"); m_page->load(url); QTRY_COMPARE(loadFinishedSpy.count(), 1); - QTRY_COMPARE(iconUrlChangedSpy.count(), 0); + QCOMPARE(iconUrlChangedSpy.count(), 0); QVERIFY(m_page->iconUrl().isEmpty()); } @@ -178,11 +178,9 @@ void tst_QWebEngineFaviconManager::unavailableFavicon() m_page->load(url); QTRY_COMPARE(loadFinishedSpy.count(), 1); - QTRY_COMPARE(iconUrlChangedSpy.count(), 1); + QCOMPARE(iconUrlChangedSpy.count(), 0); - QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString(); - QCOMPARE(m_page->iconUrl(), iconUrl); - QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/icons/unavailable.ico"))); + QVERIFY(m_page->iconUrl().isEmpty()); } void tst_QWebEngineFaviconManager::errorPageEnabled() @@ -192,7 +190,7 @@ void tst_QWebEngineFaviconManager::errorPageEnabled() QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool))); QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl))); - QUrl url = QUrl(QUrl("http://non.existent/url")); + QUrl url("invalid://url"); m_page->load(url); QTRY_COMPARE(loadFinishedSpy.count(), 1); @@ -208,7 +206,7 @@ void tst_QWebEngineFaviconManager::errorPageDisabled() QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool))); QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl))); - QUrl url = QUrl(QUrl("http://non.existent/url")); + QUrl url("invalid://url"); m_page->load(url); QTRY_COMPARE(loadFinishedSpy.count(), 1); |