From 0d85992198886cfb2b55087bcf9fe2acb9da84de Mon Sep 17 00:00:00 2001 From: Adam Kallai Date: Thu, 16 Jan 2014 09:09:25 -0800 Subject: Add QML test framework and titleChanged test case Change-Id: Ie38ee02e485702d10d0c171f2168f2685c2de2a6 Reviewed-by: Peter Varga Reviewed-by: Jocelyn Turcotte Reviewed-by: Andras Becsi --- .../auto/quick/qmltests/data/TestWebEngineView.qml | 90 ++++++++++++++++++++++ tests/auto/quick/qmltests/data/test3.html | 18 +++++ .../auto/quick/qmltests/data/tst_titleChanged.qml | 75 ++++++++++++++++++ tests/auto/quick/qmltests/qmltests.pro | 16 ++++ tests/auto/quick/qmltests/tst_qmltests.cpp | 44 +++++++++++ tests/auto/quick/quick.pro | 1 + tests/auto/quick/shared/qt_webengine_quicktest.h | 79 +++++++++++++++++++ 7 files changed, 323 insertions(+) create mode 100644 tests/auto/quick/qmltests/data/TestWebEngineView.qml create mode 100644 tests/auto/quick/qmltests/data/test3.html create mode 100644 tests/auto/quick/qmltests/data/tst_titleChanged.qml create mode 100644 tests/auto/quick/qmltests/qmltests.pro create mode 100644 tests/auto/quick/qmltests/tst_qmltests.cpp create mode 100644 tests/auto/quick/shared/qt_webengine_quicktest.h (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml new file mode 100644 index 000000000..910ecbd7d --- /dev/null +++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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 + +WebEngineView { + property var loadStatus: null + property var viewportReady: false + + function waitForLoadSucceeded() { + var success = _waitFor(function() { return loadStatus == WebEngineView.LoadSucceededStatus }) + loadStatus = null + return success + } + function waitForViewportReady() { + // Note: You need to have "when: windowShown" in your TestCase for this to work. + // The viewport is locked until the first frame is rendered, and the rendering isn't + // activated until the WebView is visible in a mapped QQuickView. + return _waitFor(function() { return viewportReady }) + } + function waitForLoadFailed() { + var failure = _waitFor(function() { return loadStatus == WebEngineView.LoadFailedStatus }) + loadStatus = null + return failure + } + function waitForLoadStopped() { + var stop = _waitFor(function() { return loadStatus == WebEngineView.LoadStoppedStatus }) + loadStatus = null + return stop + } + function _waitFor(predicate) { + var timeout = 5000 + var i = 0 + while (i < timeout && !predicate()) { + testResult.wait(50) + i += 50 + } + return predicate() + } + + TestResult { id: testResult } + + onLoadingStateChanged: { + loadStatus = loadRequest.status + if (loadRequest.status == WebEngineView.LoadStartedStatus) + viewportReady = false + } + +} + diff --git a/tests/auto/quick/qmltests/data/test3.html b/tests/auto/quick/qmltests/data/test3.html new file mode 100644 index 000000000..0c0e4eebf --- /dev/null +++ b/tests/auto/quick/qmltests/data/test3.html @@ -0,0 +1,18 @@ + + +Test page 3 + + + +Hello. + + diff --git a/tests/auto/quick/qmltests/data/tst_titleChanged.qml b/tests/auto/quick/qmltests/data/tst_titleChanged.qml new file mode 100644 index 000000000..7eb4b63b5 --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_titleChanged.qml @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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 + + + SignalSpy { + id: spyTitle + target: webEngineView + signalName: "titleChanged" + } + + + TestCase { + name: "WebEngineViewTitleChangedSignal" + + function test_titleFirstLoad() { + compare(spyTitle.count, 0) + + var testUrl = Qt.resolvedUrl("test3.html") + webEngineView.url = testUrl + verify(webEngineView.waitForLoadSucceeded()) + compare(webEngineView.title, "Test page 3") + spyTitle.clear() + + spyTitle.wait() + compare(webEngineView.title, "New Title") + } + } +} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro new file mode 100644 index 000000000..32cef0986 --- /dev/null +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -0,0 +1,16 @@ +include(../tests.pri) + +QT += webengine qmltest + +IMPORTPATH += $$PWD/data + +INCLUDEPATH += $$PWD/../shared + +OTHER_FILES += \ + $$PWD/data/TestWebEngineView.qml \ + $$PWD/data/test3.html \ + $$PWD/data/tst_titleChanged.qml + +load(qt_build_paths) +DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}data\\\"\" +DEFINES += QWP_PATH=\"\\\"$${MODULE_BASE_OUTDIR}$${QMAKE_DIR_SEP}libexec$${QMAKE_DIR_SEP}$${QTWEBENGINEPROCESS_NAME}\\\"\" diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp new file mode 100644 index 000000000..afea594fc --- /dev/null +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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$ +** +****************************************************************************/ + +#include +#include "qt_webengine_quicktest.h" +QT_WEBENGINE_TEST_MAIN(qmltests); diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 51d6454b9..de26bb2e9 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -2,5 +2,6 @@ TEMPLATE = subdirs SUBDIRS += \ qquickwebviewgraphics/qquickwebviewgraphics_software.pro \ + qmltests/qmltests.pro \ equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 1): SUBDIRS += qquickwebviewgraphics/qquickwebviewgraphics.pro diff --git a/tests/auto/quick/shared/qt_webengine_quicktest.h b/tests/auto/quick/shared/qt_webengine_quicktest.h new file mode 100644 index 000000000..d3ce305fd --- /dev/null +++ b/tests/auto/quick/shared/qt_webengine_quicktest.h @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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$ +** +****************************************************************************/ + +#ifndef QT_WEBENGINE_QUICKTEST_H +#define QT_WEBENGINE_QUICKTEST_H + +#include + +#ifdef QT_WIDGETS_LIB +#include +#else +#include +#endif + +QT_BEGIN_NAMESPACE + +#ifndef QUICK_TEST_SOURCE_DIR +#define QUICK_TEST_SOURCE_DIR 0 +#endif + +#ifdef QT_WIDGETS_LIB +#define Application QApplication +#else +#define Application QGuiApplication +#endif + +#define QT_WEBENGINE_TEST_MAIN(name) \ + int main(int argc, char **argv) \ + { \ + Application* app = 0; \ + qputenv("QTWEBENGINEPROCESS_PATH", QWP_PATH); \ + if (!QCoreApplication::instance()) \ + app = new Application(argc, argv); \ + int i = quick_test_main(argc, argv, #name, QUICK_TEST_SOURCE_DIR); \ + delete app; \ + return i; \ + } + +QT_END_NAMESPACE + +#endif // QT_WEBENGINE_QUICKTEST_H -- cgit v1.2.3