From ccf706d0bb2d9f70f5a8c18e4aab8ee7e6369817 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 8 Jun 2011 13:18:35 +1000 Subject: Optimized QDeclarativeScriptString constructor for QDeclarativeExpression. When the compiler sees a script string, it will attempt to rewrite it and store the id for the rewrite in the script string. We can then create a QDeclarativeExpression using the id, which saves us a rewrite at runtime. Reviewed-by: Aaron Kennedy --- .../qdeclarativeexpression/data/scriptString.qml | 9 ++ .../qdeclarativeexpression.pro | 17 +++ .../tst_qdeclarativeexpression.cpp | 115 +++++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml create mode 100644 tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro create mode 100644 tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml b/tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml new file mode 100644 index 0000000000..edd4048cc1 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeexpression/data/scriptString.qml @@ -0,0 +1,9 @@ +import QtQuick 1.0 +import Test 1.0 + +TestObject { + property int value1: 10 + property int value2: 5 + scriptString: value1 + value2 + scriptStringError: value3 * 5 +} diff --git a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro new file mode 100644 index 0000000000..8c73a7cb87 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro @@ -0,0 +1,17 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative gui +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativeexpression.cpp + +symbian: { + importFiles.files = data + importFiles.path = . + DEPLOYMENT += importFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp new file mode 100644 index 0000000000..aa8c12e332 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp @@ -0,0 +1,115 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite 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 +#include +#include +#include +#include + +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + +class tst_qdeclarativeexpression : public QObject +{ + Q_OBJECT +public: + tst_qdeclarativeexpression() {} + +private slots: + void scriptString(); +}; + +class TestObject : public QObject +{ + Q_OBJECT + Q_PROPERTY(QDeclarativeScriptString scriptString READ scriptString WRITE setScriptString) + Q_PROPERTY(QDeclarativeScriptString scriptStringError READ scriptStringError WRITE setScriptStringError) +public: + TestObject(QObject *parent = 0) : QObject(parent) {} + + QDeclarativeScriptString scriptString() const { return m_scriptString; } + void setScriptString(QDeclarativeScriptString scriptString) { m_scriptString = scriptString; } + + QDeclarativeScriptString scriptStringError() const { return m_scriptStringError; } + void setScriptStringError(QDeclarativeScriptString scriptString) { m_scriptStringError = scriptString; } + +private: + QDeclarativeScriptString m_scriptString; + QDeclarativeScriptString m_scriptStringError; +}; + +QML_DECLARE_TYPE(TestObject) + +void tst_qdeclarativeexpression::scriptString() +{ + qmlRegisterType("Test", 1, 0, "TestObject"); + + QDeclarativeEngine engine; + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scriptString.qml")); + TestObject *testObj = qobject_cast(c.create()); + QVERIFY(testObj != 0); + + QDeclarativeScriptString script = testObj->scriptString(); + QCOMPARE(script.script(), QLatin1String("value1 + value2")); + + QDeclarativeExpression expression(script); + QVariant value = expression.evaluate(); + QCOMPARE(value.toInt(), 15); + + QDeclarativeScriptString scriptError = testObj->scriptStringError(); + QCOMPARE(scriptError.script(), QLatin1String("value3 * 5")); + + //verify that the expression has the correct error location information + QDeclarativeExpression expressionError(scriptError); + QVariant valueError = expressionError.evaluate(); + QVERIFY(!valueError.isValid()); + QVERIFY(expressionError.hasError()); + QDeclarativeError error = expressionError.error(); + QCOMPARE(error.url(), c.url()); + QCOMPARE(error.line(), 8); +} + +QTEST_MAIN(tst_qdeclarativeexpression) + +#include "tst_qdeclarativeexpression.moc" -- cgit v1.2.3