From c260d3062de83d7f051e531007771455915285e5 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 19 Jan 2018 09:02:39 +0100 Subject: Add QUICK_TEST_MAIN_WITH_SETUP to allow executing C++ before a QML test This macro is the same as QUICK_TEST_MAIN, but takes the user's QObject subclass as an argument, and calls pre-defined slots/invokable functions on it, similar to how e.g. init() is called for C++ tests. This allows e.g. context properties to be set for the QML tests. By basing the API on invokable functions, we give ourselves the freedom to easily add more functions in the future. [ChangeLog][QtQuickTest] Added QUICK_TEST_MAIN_WITH_SETUP macro to allow executing C++ before a QML test (such as registering context properties). Task-number: QTBUG-50064 Change-Id: Id566e388553811c220871248403d32545f8ae1eb Reviewed-by: Shawn Rutledge --- tests/auto/quicktest/quicktest.pro | 3 +- .../quicktestmainwithsetup/data/tst_setup.qml | 39 ++++++++++++++++ .../quicktestmainwithsetup.pro | 12 +++++ .../tst_quicktestmainwithsetup.cpp | 54 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 tests/auto/quicktest/quicktestmainwithsetup/data/tst_setup.qml create mode 100644 tests/auto/quicktest/quicktestmainwithsetup/quicktestmainwithsetup.pro create mode 100644 tests/auto/quicktest/quicktestmainwithsetup/tst_quicktestmainwithsetup.cpp (limited to 'tests') diff --git a/tests/auto/quicktest/quicktest.pro b/tests/auto/quicktest/quicktest.pro index 3b4ec23a64..9d909f1d16 100644 --- a/tests/auto/quicktest/quicktest.pro +++ b/tests/auto/quicktest/quicktest.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS = \ - signalspy + signalspy \ + quicktestmainwithsetup diff --git a/tests/auto/quicktest/quicktestmainwithsetup/data/tst_setup.qml b/tests/auto/quicktest/quicktestmainwithsetup/data/tst_setup.qml new file mode 100644 index 0000000000..0f5466998a --- /dev/null +++ b/tests/auto/quicktest/quicktestmainwithsetup/data/tst_setup.qml @@ -0,0 +1,39 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.2 + +TestCase { + name: "setup" + + function initTestCase() + { + verify(qmlEngineAvailableCalled) + } +} diff --git a/tests/auto/quicktest/quicktestmainwithsetup/quicktestmainwithsetup.pro b/tests/auto/quicktest/quicktestmainwithsetup/quicktestmainwithsetup.pro new file mode 100644 index 0000000000..a8c1c6d36a --- /dev/null +++ b/tests/auto/quicktest/quicktestmainwithsetup/quicktestmainwithsetup.pro @@ -0,0 +1,12 @@ +CONFIG += qmltestcase +macos:CONFIG -= app_bundle +TARGET = tst_quicktestmainwithsetup + +QT += testlib quick + +include (../../shared/util.pri) + +SOURCES += tst_quicktestmainwithsetup.cpp + +TESTDATA += \ + $$PWD/data/*.qml diff --git a/tests/auto/quicktest/quicktestmainwithsetup/tst_quicktestmainwithsetup.cpp b/tests/auto/quicktest/quicktestmainwithsetup/tst_quicktestmainwithsetup.cpp new file mode 100644 index 0000000000..b0545d1a95 --- /dev/null +++ b/tests/auto/quicktest/quicktestmainwithsetup/tst_quicktestmainwithsetup.cpp @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include +#include + +#include "../../shared/util.h" + +class CustomTestSetup : public QObject +{ + Q_OBJECT + +public: + CustomTestSetup() {} + +public slots: + void qmlEngineAvailable(QQmlEngine *qmlEngine) + { + qmlEngine->rootContext()->setContextProperty("qmlEngineAvailableCalled", true); + } +}; + +QUICK_TEST_MAIN_WITH_SETUP(qquicktestsetup, CustomTestSetup) + +#include "tst_quicktestmainwithsetup.moc" -- cgit v1.2.3