summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qmltests/data
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2014-01-27 09:10:33 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-28 12:23:24 +0100
commitcf50b2f77f7b0f38c1f3bfd5efe8dbf0a779ecb0 (patch)
treef206b7444540161364a27c6fbb7d8b97b658a25e /tests/auto/quick/qmltests/data
parenta963b8ca3f93cef8bfd52d9a716389996bd8fd7a (diff)
Add loadIgnoreEmptyUrl test case to loadUrl QML test.
Change-Id: I56c78aa7e60194888123d372c6dbbb60624856c5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests/auto/quick/qmltests/data')
-rw-r--r--tests/auto/quick/qmltests/data/tst_loadUrl.qml50
1 files changed, 50 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
index 68326dae6..b49b5b571 100644
--- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
@@ -48,9 +48,59 @@ TestWebEngineView {
width: 400
height: 300
+ property bool watchProgress: false
+ property int numLoadStarted: 0
+ property int numLoadSucceeded: 0
+
+ onLoadProgressChanged: {
+ if (watchProgress && webEngineView.loadProgress != 100) {
+ watchProgress = false
+ url = ''
+ }
+ }
+
+ onLoadingStateChanged: {
+ if (loadRequest.status == WebEngineView.LoadStartedStatus)
+ ++numLoadStarted
+ if (loadRequest.status == WebEngineView.LoadSucceededStatus)
+ ++numLoadSucceeded
+ }
+
TestCase {
name: "WebEngineViewLoadUrl"
+ function test_loadIgnoreEmptyUrl() {
+ var url = Qt.resolvedUrl("test1.html")
+
+ webEngineView.url = url
+ verify(webEngineView.waitForLoadSucceeded())
+ compare(numLoadStarted, 1)
+ compare(numLoadSucceeded, 1)
+ compare(webEngineView.url, url)
+
+ var lastUrl = webEngineView.url
+ webEngineView.url = ''
+ wait(1000)
+ compare(numLoadStarted, 1)
+ compare(numLoadSucceeded, 1)
+ compare(webEngineView.url, lastUrl)
+
+ webEngineView.url = 'about:blank'
+ verify(webEngineView.waitForLoadSucceeded())
+ compare(numLoadStarted, 2)
+ compare(numLoadSucceeded, 2)
+ compare(webEngineView.url, 'about:blank')
+
+ // It shouldn't interrupt any ongoing load when an empty url is used.
+ watchProgress = true
+ webEngineView.url = url
+ webEngineView.waitForLoadSucceeded()
+ compare(numLoadStarted, 3)
+ compare(numLoadSucceeded, 3)
+ verify(!watchProgress)
+ compare(webEngineView.url, url)
+ }
+
function test_stopStatus() {
var url = Qt.resolvedUrl("test1.html")