1 files changed, 28 insertions, 49 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_geopermission.qml b/tests/auto/quick/qmltests/data/tst_geopermission.qml
index c935ac0b4..b99e50acc 100644
--- a/tests/auto/quick/qmltests/data/tst_geopermission.qml
+++ b/tests/auto/quick/qmltests/data/tst_geopermission.qml
@@ -1,34 +1,9 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-import QtQuick 2.2
-import QtTest 1.0
-import QtWebEngine 1.1
+import QtQuick
+import QtTest
+import QtWebEngine
 
 TestWebEngineView {
     id: webEngineView
@@ -37,7 +12,6 @@ TestWebEngineView {
 
     property bool deniedGeolocation: false
     property bool geoPermissionRequested: false
-    signal consoleErrorMessage(string message)
 
     SignalSpy {
         id: featurePermissionSpy
@@ -45,13 +19,7 @@ TestWebEngineView {
         signalName: "featurePermissionRequested"
     }
 
-    SignalSpy {
-        id: consoleErrorMessageSpy
-        target: webEngineView
-        signalName: "consoleErrorMessage"
-    }
-
-    onFeaturePermissionRequested: {
+    onFeaturePermissionRequested: function(securityOrigin, feature) {
         if (feature === WebEngineView.Geolocation) {
             geoPermissionRequested = true
             if (deniedGeolocation) {
@@ -63,19 +31,31 @@ TestWebEngineView {
         }
     }
 
-    onJavaScriptConsoleMessage: {
-        if (level === WebEngineView.ErrorMessageLevel)
-            consoleErrorMessage(message)
-    }
-
     TestCase {
         name: "WebViewGeopermission"
         when: windowShown
 
+        function isHandled() {
+            var handled;
+            runJavaScript("handled", function(result) {
+                handled = result;
+            });
+            tryVerify(function() { return handled != undefined; }, 5000);
+            return handled;
+        }
+
+        function getErrorMessage() {
+            var errorMessage;
+            runJavaScript("errorMessage", function(result) {
+                errorMessage = result;
+            });
+            tryVerify(function() { return errorMessage != undefined; }, 5000);
+            return errorMessage;
+        }
+
         function init() {
             deniedGeolocation = false
             featurePermissionSpy.clear()
-            consoleErrorMessageSpy.clear()
         }
 
         function test_geoPermissionRequest() {
@@ -84,17 +64,16 @@ TestWebEngineView {
             featurePermissionSpy.wait()
             verify(geoPermissionRequested)
             compare(featurePermissionSpy.count, 1)
-            consoleErrorMessageSpy.wait()
-            verify(consoleErrorMessageSpy.signalArguments[0][0] === "Success" ||
-                   consoleErrorMessageSpy.signalArguments[0][0] === "")
+            tryVerify(isHandled, 5000)
+            verify(getErrorMessage() === "")
         }
 
         function test_deniedGeolocationByUser() {
             deniedGeolocation = true
             webEngineView.url = Qt.resolvedUrl("geolocation.html")
             featurePermissionSpy.wait()
-            consoleErrorMessageSpy.wait()
-            compare(consoleErrorMessageSpy.signalArguments[0][0], "User denied Geolocation")
+            tryVerify(isHandled, 5000)
+            compare(getErrorMessage(), "User denied Geolocation")
         }
     }
 }