diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-02-05 08:40:38 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 19:31:25 +0100 |
| commit | f2cd2e0a32e8da3a0fbff6271dd9c257d8e8867f (patch) | |
| tree | 191ffa3d55e4edbd7a1dce46a17328b4997830a0 /tests/auto/quick | |
| parent | 45e3f34fba7f499d58352951d8e8777c47c229d2 (diff) | |
Implement loadHtml function for QQuickWebEngineView
Implement unreachableUrl support for WebContentsAdapter::setContent
and add loadProgressAfterLoadHtml QML test case.
Change-Id: I2d0d7834cbbf8f508de4fa9cb72240f2ac6ebf83
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_loadHtml.qml | 61 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 1 |
2 files changed, 62 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_loadHtml.qml b/tests/auto/quick/qmltests/data/tst_loadHtml.qml new file mode 100644 index 000000000..0bc0cbcaf --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_loadHtml.qml @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** 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: 200 + height: 400 + + TestCase { + name: "WebEngineViewLoadHtml" + + function test_loadProgressAfterLoadHtml() { + compare(webEngineView.loadProgress, 0) + webEngineView.loadHtml("<html><head><title>Test page 1</title></head><body>Hello.</body></html>") + verify(webEngineView.waitForLoadSucceeded()) + compare(webEngineView.loadProgress, 100) + } + } +} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 2fa124d25..ee8c0362c 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -10,6 +10,7 @@ OTHER_FILES += \ $$PWD/data/TestWebEngineView.qml \ $$PWD/data/test1.html \ $$PWD/data/test3.html \ + $$PWD/data/tst_loadHtml.qml \ $$PWD/data/tst_loadProgress.qml \ $$PWD/data/tst_loadProgressSignal.qml \ $$PWD/data/tst_loadUrl.qml \ |