Long Page To Scroll

From 5c89832668288db79ed0c79d3dda68af62285d18 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Wed, 30 Jul 2014 16:10:26 +0200 Subject: Add findText to Quick API Change-Id: Ic0de45c1fe2a5537d61ad446c96fe8fda7c30966 Reviewed-by: Jocelyn Turcotte --- tests/auto/quick/qmltests/data/test4.html | 118 ++++++++++++++++++++++ tests/auto/quick/qmltests/data/tst_findText.qml | 125 ++++++++++++++++++++++++ tests/quicktestbrowser/quickwindow.qml | 47 +++++++++ 3 files changed, 290 insertions(+) create mode 100644 tests/auto/quick/qmltests/data/test4.html create mode 100644 tests/auto/quick/qmltests/data/tst_findText.qml (limited to 'tests') diff --git a/tests/auto/quick/qmltests/data/test4.html b/tests/auto/quick/qmltests/data/test4.html new file mode 100644 index 000000000..8f75af606 --- /dev/null +++ b/tests/auto/quick/qmltests/data/test4.html @@ -0,0 +1,118 @@ + + + Long Page To Scroll + + + + +

+ bla00
+ bla01
+ bla02
+ bla03
+ bla04
+ bla05
+ bla06
+ bla07
+ bla08
+ bla09
+ bla10
+ bla11
+ bla12
+ bla13
+ bla14
+ bla15
+ bla16
+ bla17
+ bla18
+ bla19
+ bla20
+ bla21
+ bla22
+ bla23
+ bla24
+ bla25
+ bla26
+ bla27
+ bla28
+ bla29
+ bla30
+ bla31
+ bla32
+ bla33
+ bla34
+ bla35
+ bla36
+ bla37
+ bla38
+ bla39
+ bla40
+ bla41
+ bla42
+ bla43
+ bla44
+ bla45
+ bla46
+ bla47
+ bla48
+ bla49
+ bla50
+ bla51
+ bla52
+ bla53
+ bla54
+ bla55
+ bla56
+ bla57
+ bla58
+ bla59
+ bla60
+ bla61
+ bla62
+ bla63
+ bla64
+ bla65
+ bla66
+ bla67
+ bla68
+ bla69
+ bla70
+ bla71
+ bla72
+ bla73
+ bla74
+ bla75
+ bla76
+ bla77
+ bla78
+ bla79
+ bla80
+ bla81
+ bla82
+ bla83
+ bla84
+ bla85
+ bla86
+ bla87
+ bla88
+ bla89
+ bla90
+ bla91
+ bla92
+ bla93
+ bla94
+ bla95
+ bla96
+ bla97
+ bla98
+ bla99
+

+ + diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml new file mode 100644 index 000000000..d3a922df6 --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_findText.qml @@ -0,0 +1,125 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtWebEngine 0.9 +import QtWebEngine.experimental 1.0 + +TestWebEngineView { + id: webEngineView + width: 400 + height: 300 + + property int matchCount: 0 + property bool findFailed: false + + function clear() { + findFailed = false + matchCount = -1 + } + + function findTextCallback(matchCount) { + webEngineView.matchCount = matchCount + findFailed = matchCount == 0 + } + + + TestCase { + name: "WebViewFindText" + + function test_findText() { + var findFlags = WebEngineViewExperimental.FindCaseSensitively + webEngineView.url = Qt.resolvedUrl("test1.html") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.experimental.findText("Hello", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 1) + verify(!findFailed) + } + + function test_findTextCaseInsensitive() { + var findFlags = 0 + webEngineView.url = Qt.resolvedUrl("test1.html") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.experimental.findText("heLLo", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 1) + verify(!findFailed) + } + + function test_findTextManyMatches() { + var findFlags = 0 + webEngineView.url = Qt.resolvedUrl("test4.html") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.experimental.findText("bla", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 100) + verify(!findFailed) + } + + + function test_findTextFailCaseSensitive() { + var findFlags = WebEngineViewExperimental.FindCaseSensitively + webEngineView.url = Qt.resolvedUrl("test1.html") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.experimental.findText("heLLo", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 0) + verify(findFailed) + } + + function test_findTextNotFound() { + var findFlags = 0 + webEngineView.url = Qt.resolvedUrl("test1.html") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.experimental.findText("string-that-is-not-threre", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 0) + verify(findFailed) + } + } +} diff --git a/tests/quicktestbrowser/quickwindow.qml b/tests/quicktestbrowser/quickwindow.qml index 1e54bb429..06f18eae7 100644 --- a/tests/quicktestbrowser/quickwindow.qml +++ b/tests/quicktestbrowser/quickwindow.qml @@ -253,6 +253,15 @@ ApplicationWindow { Item { property alias webView: webEngineView property alias title: webEngineView.title + Action { + shortcut: "Ctrl+F" + onTriggered: { + findBar.visible = !findBar.visible + if (findBar.visible) { + findTextField.forceActiveFocus() + } + } + } FeaturePermissionBar { id: permBar view: webEngineView @@ -324,6 +333,44 @@ ApplicationWindow { extraContextMenuEntriesComponent: ContextMenuExtras {} } } + + Rectangle { + id: findBar + anchors.top: webEngineView.top + anchors.right: webEngineView.right + width: 240 + height: 35 + border.color: "lightgray" + border.width: 1 + radius: 5 + visible: false + color: browserWindow.color + + RowLayout { + anchors.centerIn: findBar + TextField { + id: findTextField + onAccepted: { + webEngineView.experimental.findText(text, 0) + } + } + ToolButton { + id: findBackwardButton + iconSource: "icons/go-previous.png" + onClicked: webEngineView.experimental.findText(findTextField.text, WebEngineViewExperimental.FindBackward) + } + ToolButton { + id: findForwardButton + iconSource: "icons/go-next.png" + onClicked: webEngineView.experimental.findText(findTextField.text, 0) + } + ToolButton { + id: findCancelButton + iconSource: "icons/process-stop.png" + onClicked: findBar.visible = false + } + } + } } } } -- cgit v1.2.3