diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-08 10:23:04 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-15 17:25:37 +0200 |
commit | 75c649276a9bbcb2e593d6c6f78d77417dd05891 (patch) | |
tree | 2e98537cbbb23f589ea236ba8b23d1965ccbe2b5 /tests | |
parent | df0ec196031d33850324dc5eeed2d71f61413885 (diff) | |
download | qtscript-75c649276a9bbcb2e593d6c6f78d77417dd05891.tar.gz |
Remove the use of the QWidgetStar metatypeid.
It is to be removed, and is obsoleted by QMetaType::PointerToQObject.
By using QMetaType::PointerToQObject, we also gain the feature
that all pointers to types derived from QObject return true for
QScriptValue::isQObject().
Change-Id: I18392b5b6cde3a45d060c37612d987a5cf8e8f18
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/auto.pro | 1 | ||||
-rw-r--r-- | tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | 3 | ||||
-rw-r--r-- | tests/auto/qscriptqwidgets/qscriptqwidgets.pro | 12 | ||||
-rw-r--r-- | tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp | 144 |
4 files changed, 158 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 4175dca..b5936c0 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -14,6 +14,7 @@ SUBDIRS=\ qscriptvalue \ qscriptvaluegenerated \ qscriptvalueiterator \ + qscriptqwidgets \ cmake \ # qtipc \ diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp index 9706901..c6fab3d 100644 --- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp +++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp @@ -1533,7 +1533,6 @@ void tst_QScriptExtQObject::callQtInvokable4() QCOMPARE(m_myObject->qtFunctionInvoked(), 63); QCOMPARE(m_myObject->qtFunctionActuals().size(), 1); QVariant v = m_myObject->qtFunctionActuals().at(0); - QCOMPARE(v.userType(), int(QMetaType::QWidgetStar)); QCOMPARE(qvariant_cast<QWidget*>(v), (QObject *)0); } @@ -1702,7 +1701,7 @@ void tst_QScriptExtQObject::callQtInvokable5() { QScriptValue ret = m_engine->evaluate("myObject.myInvokableReturningMyQObject()"); QCOMPARE(m_myObject->qtFunctionInvoked(), 53); - QVERIFY(ret.isVariant()); + QVERIFY(ret.isQObject()); QCOMPARE(*reinterpret_cast<MyQObject* const *>(ret.toVariant().constData()), m_myObject); } diff --git a/tests/auto/qscriptqwidgets/qscriptqwidgets.pro b/tests/auto/qscriptqwidgets/qscriptqwidgets.pro new file mode 100644 index 0000000..4a2f763 --- /dev/null +++ b/tests/auto/qscriptqwidgets/qscriptqwidgets.pro @@ -0,0 +1,12 @@ + +CONFIG += testcase + +TEMPLATE = app +TARGET = tst_qscriptqwidgets +DEPENDPATH += . +INCLUDEPATH += . + +QT += widgets script testlib + +# Input +SOURCES += tst_qscriptqwidgets.cpp diff --git a/tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp b/tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp new file mode 100644 index 0000000..f847d75 --- /dev/null +++ b/tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp @@ -0,0 +1,144 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com> +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/QTest> +#include <QWidget> +#include <QScriptEngine> + +class CustomQObject : public QObject +{ + Q_OBJECT +public: + CustomQObject(QObject *parent = 0) + : QObject(parent) + { + + } +}; + +class tst_QScriptQWidgets : public QObject +{ + Q_OBJECT +public: + explicit tst_QScriptQWidgets(QObject *parent = 0); + virtual ~tst_QScriptQWidgets(); + +private slots: + void testProperty(); + void testSlot(); +}; + +tst_QScriptQWidgets::tst_QScriptQWidgets(QObject *parent) + : QObject(parent) +{ + qRegisterMetaType<QWidget*>(); + qRegisterMetaType<CustomQObject*>(); +} + +tst_QScriptQWidgets::~tst_QScriptQWidgets() +{ + +} + +class ObjectUnderTest : public QObject +{ + Q_OBJECT + Q_PROPERTY(QWidget* widget READ widget CONSTANT) + Q_PROPERTY(CustomQObject* customObject READ customObject CONSTANT) +public: + ObjectUnderTest(QObject *parent = 0) + : QObject(parent), m_widget(new QWidget), m_customObject(new CustomQObject) + { + + } + + QWidget* widget() const + { + return m_widget.data(); + } + + CustomQObject* customObject() const + { + return m_customObject.data(); + } + +public slots: + QWidget* widgetAccessor() const + { + return m_widget.data(); + } + + QWidget* widgetReturner(QWidget* widget) + { + return widget; + } + +private: + QScopedPointer<QWidget> m_widget; + QScopedPointer<CustomQObject> m_customObject; +}; + +void tst_QScriptQWidgets::testProperty() +{ + QScriptEngine engine; + ObjectUnderTest *testObject = new ObjectUnderTest(this); + QCOMPARE(engine.newQObject(testObject).property("widget").toQObject(), testObject->widget()); + + QCOMPARE(engine.newQObject(testObject).property("customObject").toQObject(), testObject->customObject()); +} + +void tst_QScriptQWidgets::testSlot() +{ + { + QScriptEngine engine; + ObjectUnderTest *testObject = new ObjectUnderTest(this); + QCOMPARE(engine.newQObject(testObject).property("widgetAccessor").call(QScriptValue()).toQObject(), testObject->widget()); + } + { + QScriptEngine engine; + ObjectUnderTest *testObject = new ObjectUnderTest(this); + QCOMPARE(engine.newQObject(testObject).property("widgetReturner").call(QScriptValue(), QScriptValueList() << engine.toScriptValue(testObject->widget())).toQObject(), testObject->widget()); + } +} + +QTEST_MAIN(tst_QScriptQWidgets) + +#include "tst_qscriptqwidgets.moc" |