From 76f47bafb589b41b2dd48d0f54527545bbef4d12 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Sun, 3 Apr 2016 11:19:43 +0200 Subject: Clean up qml tests - Remove superfluous imports of QtWebEngine.experimental - Remove unused waitForViewportReady() - Remove "when: windowShown" from tests where UI is not used for testing Change-Id: I05362596ace44a490417dc61e6d0564b4004537e Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Joerg Bornemann --- tests/auto/quick/qmltests/data/TestWebEngineView.qml | 10 ---------- tests/auto/quick/qmltests/data/tst_favicon.qml | 1 - tests/auto/quick/qmltests/data/tst_faviconDownload.qml | 1 - tests/auto/quick/qmltests/data/tst_geopermission.qml | 1 - tests/auto/quick/qmltests/data/tst_loadFail.qml | 1 - tests/auto/quick/qmltests/data/tst_loadUrl.qml | 1 - tests/auto/quick/qmltests/data/tst_webchannel.qml | 1 - 7 files changed, 16 deletions(-) (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml index 35d321cf2..34fc5fb2f 100644 --- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml +++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml @@ -29,11 +29,9 @@ import QtQuick 2.0 import QtTest 1.0 import QtWebEngine 1.2 -import QtWebEngine.experimental 1.0 WebEngineView { property var loadStatus: null - property var viewportReady: false property bool windowCloseRequestedSignalEmitted: false function waitForLoadSucceeded() { @@ -41,12 +39,6 @@ WebEngineView { loadStatus = null return success } - function waitForViewportReady() { - // Note: You need to have "when: windowShown" in your TestCase for this to work. - // The viewport is locked until the first frame is rendered, and the rendering isn't - // activated until the WebView is visible in a mapped QQuickView. - return _waitFor(function() { return viewportReady }) - } function waitForLoadFailed() { var failure = _waitFor(function() { return loadStatus == WebEngineView.LoadFailedStatus }) loadStatus = null @@ -74,8 +66,6 @@ WebEngineView { onLoadingChanged: { loadStatus = loadRequest.status - if (loadRequest.status == WebEngineView.LoadStartedStatus) - viewportReady = false } onWindowCloseRequested: { diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml index 1619b73b0..26e39f48c 100644 --- a/tests/auto/quick/qmltests/data/tst_favicon.qml +++ b/tests/auto/quick/qmltests/data/tst_favicon.qml @@ -64,7 +64,6 @@ TestWebEngineView { TestCase { id: test name: "WebEngineFavicon" - when: windowShown function init() { if (webEngineView.icon != '') { diff --git a/tests/auto/quick/qmltests/data/tst_faviconDownload.qml b/tests/auto/quick/qmltests/data/tst_faviconDownload.qml index 4cf0edc4d..e4dfb36aa 100644 --- a/tests/auto/quick/qmltests/data/tst_faviconDownload.qml +++ b/tests/auto/quick/qmltests/data/tst_faviconDownload.qml @@ -44,7 +44,6 @@ TestWebEngineView { TestCase { id: test name: "WebEngineFaviconDownload" - when: windowShown function init() { WebEngine.settings.autoLoadIconsForPage = true diff --git a/tests/auto/quick/qmltests/data/tst_geopermission.qml b/tests/auto/quick/qmltests/data/tst_geopermission.qml index 5e5e1a321..a08ec155c 100644 --- a/tests/auto/quick/qmltests/data/tst_geopermission.qml +++ b/tests/auto/quick/qmltests/data/tst_geopermission.qml @@ -70,7 +70,6 @@ TestWebEngineView { TestCase { name: "WebViewGeopermission" - when: windowShown function init() { deniedGeolocation = false diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml index 9b18870e4..9ce70fc96 100644 --- a/tests/auto/quick/qmltests/data/tst_loadFail.qml +++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml @@ -29,7 +29,6 @@ import QtQuick 2.0 import QtTest 1.0 import QtWebEngine 1.2 -import QtWebEngine.experimental 1.0 import QtWebEngine.testsupport 1.0 TestWebEngineView { diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml index 3e91c2683..3ce03df70 100644 --- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml +++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml @@ -29,7 +29,6 @@ import QtQuick 2.0 import QtTest 1.0 import QtWebEngine 1.2 -import QtWebEngine.experimental 1.0 TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_webchannel.qml b/tests/auto/quick/qmltests/data/tst_webchannel.qml index af53033cc..3ca3ccce1 100644 --- a/tests/auto/quick/qmltests/data/tst_webchannel.qml +++ b/tests/auto/quick/qmltests/data/tst_webchannel.qml @@ -28,7 +28,6 @@ import QtQuick 2.0 import QtTest 1.0 import QtWebEngine 1.2 -import QtWebEngine.experimental 1.0 import QtWebChannel 1.0 -- cgit v1.2.3