summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick')
-rw-r--r--tests/auto/quick/qmltests/BLACKLIST3
-rw-r--r--tests/auto/quick/qmltests/data/tst_mouseMove.qml98
-rw-r--r--tests/auto/quick/qmltests/data/tst_viewSource.qml9
-rw-r--r--tests/auto/quick/qmltests/qmltests.pro13
-rw-r--r--tests/auto/quick/qquickwebengineview/qquickwebengineview.pro2
-rw-r--r--tests/auto/quick/quick.pro2
-rw-r--r--tests/auto/quick/tests.pri2
7 files changed, 115 insertions, 14 deletions
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST
index b7cd7042e..54a3185d6 100644
--- a/tests/auto/quick/qmltests/BLACKLIST
+++ b/tests/auto/quick/qmltests/BLACKLIST
@@ -13,3 +13,6 @@ osx
[WebEngineViewSingleFileUpload::test_acceptSingleFileSelection]
*
+
+[WebViewFindText::test_findTextInterruptedByLoad]
+*
diff --git a/tests/auto/quick/qmltests/data/tst_mouseMove.qml b/tests/auto/quick/qmltests/data/tst_mouseMove.qml
new file mode 100644
index 000000000..adfa3941c
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_mouseMove.qml
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 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.4
+
+Rectangle {
+ id: root
+ width: 200
+ height: 200
+
+ Column {
+ anchors.fill: parent
+ Rectangle {
+ id: placeHolder
+ width: parent.width
+ height: 100
+ color: "red"
+ }
+
+ TestWebEngineView {
+ id: webEngineView
+ width: parent.width
+ height: 100
+
+ function getInnerText(element) {
+ var innerText;
+ runJavaScript("document.getElementById('" + element + "').innerText", function(result) {
+ innerText = result;
+ });
+ testCase.tryVerify(function() { return innerText != undefined; });
+ return innerText;
+ }
+ }
+ }
+
+ TestCase {
+ id: testCase
+ name: "WebEngineViewMouseMove"
+ when: windowShown
+
+ function test_mouseLeave() {
+ mouseMove(root, 0, 0);
+ webEngineView.loadHtml(
+ "<html>" +
+ "<head><script>" +
+ "function init() {" +
+ " var div = document.getElementById('testDiv');" +
+ " div.onmouseenter = function(e) { div.innerText = 'Mouse IN' };" +
+ " div.onmouseleave = function(e) { div.innerText = 'Mouse OUT' };" +
+ "}" +
+ "</script></head>" +
+ "<body onload='init()' style='margin: 0px; padding: 0px'>" +
+ " <div id='testDiv' style='width: 100%; height: 100%; background-color: green' />" +
+ "</body>" +
+ "</html>");
+ verify(webEngineView.waitForLoadSucceeded());
+ // Make sure the testDiv text is empty.
+ webEngineView.runJavaScript("document.getElementById('testDiv').innerText = ''");
+ tryVerify(function() { return !webEngineView.getInnerText("testDiv") });
+
+ for (var i = 90; i < 110; ++i)
+ mouseMove(root, 50, i);
+ tryVerify(function() { return webEngineView.getInnerText("testDiv") == "Mouse IN" });
+
+ for (var i = 110; i > 90; --i)
+ mouseMove(root, 50, i);
+ tryVerify(function() { return webEngineView.getInnerText("testDiv") == "Mouse OUT" });
+ }
+ }
+}
+
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml
index 22c3947d3..576035ef2 100644
--- a/tests/auto/quick/qmltests/data/tst_viewSource.qml
+++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml
@@ -63,7 +63,7 @@ TestWebEngineView {
name: "WebEngineViewSource"
function init() {
- webEngineView.url = Qt.resolvedUrl("about:blank");
+ webEngineView.url = Qt.resolvedUrl("test1.html");
verify(webEngineView.waitForLoadSucceeded());
newViewRequestedSpy.clear();
@@ -103,8 +103,8 @@ TestWebEngineView {
{ tag: "view-source:about:blank", userInputUrl: "view-source:about:blank", loadSucceed: true, url: "view-source:about:blank", title: "view-source:about:blank" },
{ tag: testLocalUrl, userInputUrl: testLocalUrl, loadSucceed: true, url: testLocalUrl, title: "test1.html" },
{ tag: testLocalUrlWithoutScheme, userInputUrl: testLocalUrlWithoutScheme, loadSucceed: true, url: testLocalUrl, title: "test1.html" },
- { tag: "view-source:http://non.existent", userInputUrl: "view-source:http://non.existent", loadSucceed: false, url: "view-source:http://non.existent/", title: "non.existent" },
- { tag: "view-source:non.existent", userInputUrl: "view-source:non.existent", loadSucceed: false, url: "view-source:http://non.existent/", title: "non.existent" },
+ { tag: "view-source:http://non.existent", userInputUrl: "view-source:http://non.existent", loadSucceed: false, url: "http://non.existent/", title: "non.existent" },
+ { tag: "view-source:non.existent", userInputUrl: "view-source:non.existent", loadSucceed: false, url: "http://non.existent/", title: "non.existent" },
];
}
@@ -114,11 +114,10 @@ TestWebEngineView {
if (row.loadSucceed) {
verify(webEngineView.waitForLoadSucceeded());
- tryVerify(function() { return titleChangedSpy.count >= 1; });
} else {
verify(webEngineView.waitForLoadFailed());
- tryVerify(function() { return titleChangedSpy.count >= 2; });
}
+ tryVerify(function() { return titleChangedSpy.count == 1; });
compare(webEngineView.url, row.url);
tryCompare(webEngineView, "title", row.title);
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index 9530e115c..5014fd6e3 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -62,6 +62,7 @@ OTHER_FILES += \
$$PWD/data/tst_loadRecursionCrash.qml \
$$PWD/data/tst_loadUrl.qml \
$$PWD/data/tst_mouseClick.qml \
+ $$PWD/data/tst_mouseMove.qml \
$$PWD/data/tst_navigationHistory.qml \
$$PWD/data/tst_navigationRequested.qml \
$$PWD/data/tst_newViewRequest.qml \
@@ -88,11 +89,11 @@ OTHER_FILES += \
$$PWD/data/icons/qt144.png \
$$PWD/data/icons/qt32.ico \
$$PWD/data/icons/qtmulti.ico \
- $$PWD/mock-delegates/QtWebEngine/UIDelegates/AlertDialog.qml \
- $$PWD/mock-delegates/QtWebEngine/UIDelegates/ConfirmDialog.qml \
- $$PWD/mock-delegates/QtWebEngine/UIDelegates/FilePicker.qml \
- $$PWD/mock-delegates/QtWebEngine/UIDelegates/PromptDialog.qml \
- $$PWD/mock-delegates/QtWebEngine/UIDelegates/qmldir \
+ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml \
+ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml \
+ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml \
+ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml \
+ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/qmldir \
$$PWD/mock-delegates/TestParams/FilePickerParams.qml \
$$PWD/mock-delegates/TestParams/JSDialogParams.qml \
$$PWD/mock-delegates/TestParams/qmldir \
@@ -100,7 +101,7 @@ OTHER_FILES += \
load(qt_build_paths)
DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\"
-!qtConfig(testsupport) {
+!qtConfig(webengine-testsupport) {
PLUGIN_EXTENSION = .so
PLUGIN_PREFIX = lib
osx: PLUGIN_PREFIX = .dylib
diff --git a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
index 0f62ec21d..25bf44597 100644
--- a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
+++ b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
@@ -5,7 +5,7 @@ QT_PRIVATE += webengine-private gui-private
HEADERS += ../shared/util.h
-qtConfig(printing-and-pdf) {
+qtConfig(webengine-printing-and-pdf) {
DEFINES += ENABLE_PDF
}
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 2e6343469..e67cf0ed0 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -8,7 +8,7 @@ SUBDIRS += \
qquickwebenginedefaultsurfaceformat \
qquickwebengineview
-qtConfig(testsupport) {
+qtConfig(webengine-testsupport) {
SUBDIRS += \
qmltests \
qquickwebengineviewgraphics
diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri
index 15f6517a4..7983a248f 100644
--- a/tests/auto/quick/tests.pri
+++ b/tests/auto/quick/tests.pri
@@ -19,7 +19,7 @@ QT += testlib network quick webengine
# This define is used by some tests to look up resources in the source tree
DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
-qtConfig(testsupport) {
+qtConfig(webengine-testsupport) {
DEFINES += ENABLE_QML_TESTSUPPORT_API
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 14:47:00 +0000