summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2014-07-30 16:10:26 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2014-08-07 17:08:29 +0200
commit5c89832668288db79ed0c79d3dda68af62285d18 (patch)
tree0d12b5bc2322f034ddbf01beb36716c5f980ec0a /tests
parentadcb7979a5f7193d1b8c6b87c0f2c92cfa80a316 (diff)
Add findText to Quick API
Change-Id: Ic0de45c1fe2a5537d61ad446c96fe8fda7c30966 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qmltests/data/test4.html118
-rw-r--r--tests/auto/quick/qmltests/data/tst_findText.qml125
-rw-r--r--tests/quicktestbrowser/quickwindow.qml47
3 files changed, 290 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/data/test4.html b/tests/auto/quick/qmltests/data/test4.html
new file mode 100644
index 00000000..8f75af60
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/test4.html
@@ -0,0 +1,118 @@
+<html>
+ <head>
+ <title>Long Page To Scroll</title>
+ <style>
+ #content {
+ margin: auto;
+ width: 100%;
+ background: #eeeeee;
+ font-size: 50px;
+ }
+ </style>
+ <meta name="viewport" content="initial-scale=2.0"/>
+ </head>
+ <body>
+ <div id="content">
+ bla00<br/>
+ bla01<br/>
+ bla02<br/>
+ bla03<br/>
+ bla04<br/>
+ bla05<br/>
+ bla06<br/>
+ bla07<br/>
+ bla08<br/>
+ bla09<br/>
+ bla10<br/>
+ bla11<br/>
+ bla12<br/>
+ bla13<br/>
+ bla14<br/>
+ bla15<br/>
+ bla16<br/>
+ bla17<br/>
+ bla18<br/>
+ bla19<br/>
+ bla20<br/>
+ bla21<br/>
+ bla22<br/>
+ bla23<br/>
+ bla24<br/>
+ bla25<br/>
+ bla26<br/>
+ bla27<br/>
+ bla28<br/>
+ bla29<br/>
+ bla30<br/>
+ bla31<br/>
+ bla32<br/>
+ bla33<br/>
+ bla34<br/>
+ bla35<br/>
+ bla36<br/>
+ bla37<br/>
+ bla38<br/>
+ bla39<br/>
+ bla40<br/>
+ bla41<br/>
+ bla42<br/>
+ bla43<br/>
+ bla44<br/>
+ bla45<br/>
+ bla46<br/>
+ bla47<br/>
+ bla48<br/>
+ bla49<br/>
+ bla50<br/>
+ bla51<br/>
+ bla52<br/>
+ bla53<br/>
+ bla54<br/>
+ bla55<br/>
+ bla56<br/>
+ bla57<br/>
+ bla58<br/>
+ bla59<br/>
+ bla60<br/>
+ bla61<br/>
+ bla62<br/>
+ bla63<br/>
+ bla64<br/>
+ bla65<br/>
+ bla66<br/>
+ bla67<br/>
+ bla68<br/>
+ bla69<br/>
+ bla70<br/>
+ bla71<br/>
+ bla72<br/>
+ bla73<br/>
+ bla74<br/>
+ bla75<br/>
+ bla76<br/>
+ bla77<br/>
+ bla78<br/>
+ bla79<br/>
+ bla80<br/>
+ bla81<br/>
+ bla82<br/>
+ bla83<br/>
+ bla84<br/>
+ bla85<br/>
+ bla86<br/>
+ bla87<br/>
+ bla88<br/>
+ bla89<br/>
+ bla90<br/>
+ bla91<br/>
+ bla92<br/>
+ bla93<br/>
+ bla94<br/>
+ bla95<br/>
+ bla96<br/>
+ bla97<br/>
+ bla98<br/>
+ bla99<br/>
+ </div>
+ </body>
+</html>
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 00000000..d3a922df
--- /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 1e54bb42..06f18eae 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
+ }
+ }
+ }
}
}
}