From a963b8ca3f93cef8bfd52d9a716389996bd8fd7a Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Mon, 27 Jan 2014 08:28:40 -0800
Subject: Add loadUrl QML test with stopStatus test case.

Fix the webEngineView.stop() function in the WebContentsAdapter.

Change-Id: I82c5000fb3cbc5aff59dd0c4c7c86ca7755a6329
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 tests/auto/quick/qmltests/data/tst_loadUrl.qml | 71 ++++++++++++++++++++++++++
 tests/auto/quick/qmltests/qmltests.pro         |  1 +
 2 files changed, 72 insertions(+)
 create mode 100644 tests/auto/quick/qmltests/data/tst_loadUrl.qml

(limited to 'tests/auto/quick')

diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
new file mode 100644
index 000000000..68326dae6
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** 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 1.0
+
+TestWebEngineView {
+    id: webEngineView
+    width: 400
+    height: 300
+
+    TestCase {
+        name: "WebEngineViewLoadUrl"
+
+        function test_stopStatus() {
+            var url = Qt.resolvedUrl("test1.html")
+
+            webEngineView.loadingStateChanged.connect(function(loadRequest) {
+                if (loadRequest.status == WebEngineView.LoadStoppedStatus) {
+                    compare(webEngineView.url, url)
+                    compare(loadRequest.url, url)
+                }
+            })
+
+            webEngineView.url = url
+            compare(webEngineView.url, url)
+            webEngineView.stop()
+            verify(webEngineView.waitForLoadStopped())
+            compare(webEngineView.url, url)
+        }
+    }
+}
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index f1c7ec485..2fa124d25 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -12,6 +12,7 @@ OTHER_FILES += \
     $$PWD/data/test3.html \
     $$PWD/data/tst_loadProgress.qml \
     $$PWD/data/tst_loadProgressSignal.qml \
+    $$PWD/data/tst_loadUrl.qml \
     $$PWD/data/tst_properties.qml \
     $$PWD/data/tst_titleChanged.qml
 
-- 
cgit v1.2.3