summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qmltests/data/tst_findText.qml
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick/qmltests/data/tst_findText.qml')
-rw-r--r--tests/auto/quick/qmltests/data/tst_findText.qml76
1 files changed, 25 insertions, 51 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml
index 040d324e6..597cff73e 100644
--- a/tests/auto/quick/qmltests/data/tst_findText.qml
+++ b/tests/auto/quick/qmltests/data/tst_findText.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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebEngine 1.2
+// 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
+import QtTest
+import QtWebEngine
TestWebEngineView {
id: webEngineView
@@ -56,7 +31,7 @@ TestWebEngineView {
// If this starts to fail then either clear was not called before findText
// or unexpected callback was triggered from some search.
// On c++ side callback id can be checked to verify
- testcase.verify(!findCallbackCalled(), 'Unexpected callback call or uncleared state before findText call!')
+ testCase.verify(!findCallbackCalled(), 'Unexpected callback call or uncleared state before findText call!')
webEngineView.matchCount = matchCount
findFailed = matchCount == 0
@@ -64,7 +39,7 @@ TestWebEngineView {
TestCase {
- id: testcase
+ id: testCase
name: "WebViewFindText"
function getBodyInnerHTML() {
@@ -113,7 +88,7 @@ TestWebEngineView {
verify(!findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 1)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 1)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 1)
}
function test_findTextCaseInsensitive() {
@@ -127,7 +102,7 @@ TestWebEngineView {
verify(!findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 1)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 1)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 1)
}
function test_findTextManyMatches() {
@@ -141,7 +116,7 @@ TestWebEngineView {
verify(!findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 100)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 1)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 1)
}
@@ -156,7 +131,7 @@ TestWebEngineView {
verify(findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 0)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 0)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 0)
}
function test_findTextNotFound() {
@@ -170,7 +145,7 @@ TestWebEngineView {
verify(findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 0)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 0)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 0)
}
function test_findTextAfterNotFound() {
@@ -184,7 +159,7 @@ TestWebEngineView {
verify(findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 0)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 0)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 0)
webEngineView.url = Qt.resolvedUrl("test1.html")
verify(webEngineView.waitForLoadSucceeded())
@@ -195,7 +170,7 @@ TestWebEngineView {
verify(!findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 1)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 1)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 1)
}
function test_findTextInModifiedDOMAfterNotFound() {
@@ -212,7 +187,7 @@ TestWebEngineView {
verify(findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 0)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 0)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 0)
runJavaScript("document.body.innerHTML = 'blahellobla'");
tryVerify(function() { return getBodyInnerHTML() == "blahellobla"; }, 20000);
@@ -223,7 +198,7 @@ TestWebEngineView {
verify(!findFailed)
tryCompare(findTextSpy, "count", 1)
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 1)
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 1)
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 1)
}
function test_findTextInterruptedByLoad() {
@@ -231,8 +206,7 @@ TestWebEngineView {
var listItemText = '';
for (var i = 0; i < 100000; ++i)
- listItemText += "bla ";
- listItemText = listItemText.trim();
+ listItemText += "bla";
webEngineView.loadHtml(
"<html><body>" +
@@ -276,7 +250,7 @@ TestWebEngineView {
findTextSpy.wait();
compare(findTextSpy.count, i);
compare(findTextSpy.signalArguments[i-1][0].numberOfMatches, 3);
- compare(findTextSpy.signalArguments[i-1][0].activeMatchOrdinal, i);
+ compare(findTextSpy.signalArguments[i-1][0].activeMatch, i);
}
// The last match is followed by the fist one.
@@ -285,7 +259,7 @@ TestWebEngineView {
findTextSpy.wait();
compare(findTextSpy.count, 1);
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 3);
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 1);
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 1);
// The first match is preceded by the last one.
webEngineView.clear();
@@ -293,23 +267,23 @@ TestWebEngineView {
findTextSpy.wait();
compare(findTextSpy.count, 1);
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 3);
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 3);
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 3);
- // Finding another word resets the activeMatchOrdinal.
+ // Finding another word resets the activeMatch.
webEngineView.clear();
webEngineView.findText("bar");
findTextSpy.wait();
compare(findTextSpy.count, 1);
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 2);
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 1);
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 1);
- // If no match activeMatchOrdinal is 0.
+ // If no match activeMatch is 0.
webEngineView.clear();
webEngineView.findText("bla");
findTextSpy.wait();
compare(findTextSpy.count, 1);
compare(findTextSpy.signalArguments[0][0].numberOfMatches, 0);
- compare(findTextSpy.signalArguments[0][0].activeMatchOrdinal, 0);
+ compare(findTextSpy.signalArguments[0][0].activeMatch, 0);
}
}
}