diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-11 16:29:52 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-27 09:07:06 +0200 |
commit | 56194f7467f592e3476be1cda9e6f40b00eef12a (patch) | |
tree | 775ab4b04b588c0c0e56f53dc4e525e057fef39f /src/qmltest | |
parent | cc1a604c704f848927b3fa0a97b0a50b0b79d2a4 (diff) |
Move QuickTestUtil into qmltest
This way we can provide a header for it and use it for automatic type
registration.
Change-Id: Ic78e63ff071a75fac051ae35dfc1ea150079bcb0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmltest')
-rw-r--r-- | src/qmltest/qmltest.pro | 5 | ||||
-rw-r--r-- | src/qmltest/quicktestutil.cpp | 111 | ||||
-rw-r--r-- | src/qmltest/quicktestutil_p.h | 89 |
3 files changed, 204 insertions, 1 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index 0bf05093be..d6e4669769 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -18,12 +18,15 @@ qtHaveModule(widgets) { SOURCES += \ $$PWD/quicktest.cpp \ $$PWD/quicktestevent.cpp \ - $$PWD/quicktestresult.cpp + $$PWD/quicktestresult.cpp \ + $$PWD/quicktestutil.cpp + HEADERS += \ $$PWD/quicktestglobal.h \ $$PWD/quicktest.h \ $$PWD/quicktestevent_p.h \ $$PWD/quicktestresult_p.h \ + $$PWD/quicktestutil_p.h \ $$PWD/qtestoptions_p.h qtConfig(qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING diff --git a/src/qmltest/quicktestutil.cpp b/src/qmltest/quicktestutil.cpp new file mode 100644 index 0000000000..682c56400e --- /dev/null +++ b/src/qmltest/quicktestutil.cpp @@ -0,0 +1,111 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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: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 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "quicktestutil_p.h" + +#include <QtQuickTest/private/qtestoptions_p.h> +#include <QtQml/private/qqmltype_p.h> +#include <QtQml/private/qqmlmetatype_p.h> +#include <QtQml/private/qv4engine_p.h> +#include <QtQml/private/qv4scopedvalue_p.h> + +#include <QtGui/qguiapplication.h> +#include <QtGui/qstylehints.h> +#include <QtQml/qqmlengine.h> + +QT_BEGIN_NAMESPACE + +bool QuickTestUtil::printAvailableFunctions() const +{ + return QTest::printAvailableFunctions; +} + +int QuickTestUtil::dragThreshold() const +{ + return QGuiApplication::styleHints()->startDragDistance(); +} + +QJSValue QuickTestUtil::typeName(const QVariant &v) const +{ + QString name(v.typeName()); + if (v.canConvert<QObject*>()) { + QQmlType type; + const QMetaObject *mo = v.value<QObject*>()->metaObject(); + while (!type.isValid() && mo) { + type = QQmlMetaType::qmlType(mo); + mo = mo->superClass(); + } + if (type.isValid()) { + name = type.qmlTypeName(); + } + } + + QQmlEngine *engine = qmlEngine(this); + QV4::ExecutionEngine *v4 = engine->handle(); + return QJSValue(v4, v4->newString(name)->asReturnedValue()); +} + +bool QuickTestUtil::compare(const QVariant &act, const QVariant &exp) const { + return act == exp; +} + +QJSValue QuickTestUtil::callerFile(int frameIndex) const +{ + QQmlEngine *engine = qmlEngine(this); + QV4::ExecutionEngine *v4 = engine->handle(); + QV4::Scope scope(v4); + + QVector<QV4::StackFrame> stack = v4->stackTrace(frameIndex + 2); + return (stack.size() > frameIndex + 1) + ? QJSValue(v4, v4->newString(stack.at(frameIndex + 1).source)->asReturnedValue()) + : QJSValue(); +} + +int QuickTestUtil::callerLine(int frameIndex) const +{ + QQmlEngine *engine = qmlEngine(this); + QV4::ExecutionEngine *v4 = engine->handle(); + + QVector<QV4::StackFrame> stack = v4->stackTrace(frameIndex + 2); + if (stack.size() > frameIndex + 1) + return stack.at(frameIndex + 1).line; + return -1; +} + +QT_END_NAMESPACE diff --git a/src/qmltest/quicktestutil_p.h b/src/qmltest/quicktestutil_p.h new file mode 100644 index 0000000000..74d315df7d --- /dev/null +++ b/src/qmltest/quicktestutil_p.h @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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: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 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QUICKTESTUTIL_P_H +#define QUICKTESTUTIL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtQuickTest/quicktestglobal.h> +#include <QtCore/qobject.h> +#include <QtQml/qqml.h> +#include <QtQml/qjsvalue.h> + +QT_BEGIN_NAMESPACE + +class Q_QUICK_TEST_EXPORT QuickTestUtil : public QObject +{ + Q_OBJECT + Q_PROPERTY(bool printAvailableFunctions READ printAvailableFunctions NOTIFY printAvailableFunctionsChanged) + Q_PROPERTY(int dragThreshold READ dragThreshold NOTIFY dragThresholdChanged) + QML_NAMED_ELEMENT(TestUtil) +public: + QuickTestUtil(QObject *parent = nullptr) :QObject(parent) {} + ~QuickTestUtil() override {} + + bool printAvailableFunctions() const; + int dragThreshold() const; + +Q_SIGNALS: + void printAvailableFunctionsChanged(); + void dragThresholdChanged(); + +public Q_SLOTS: + + QJSValue typeName(const QVariant& v) const; + bool compare(const QVariant& act, const QVariant& exp) const; + + QJSValue callerFile(int frameIndex = 0) const; + int callerLine(int frameIndex = 0) const; +}; + +QT_END_NAMESPACE + +#endif // QUICKTESTUTIL_P_H |