From 85b6b4006609914733461e777b0e051b6946344f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 6 Jun 2011 18:02:22 +0200 Subject: Rename qdeclarativescriptdebugging autotest directory Align it with the other qdeclarativedebug* tests. Change-Id: Idde1c0948daa10bf4cc893bcd08c99b5c743553a --- .../qdeclarativedebugjs/data/backtrace1.js | 11 ++ .../qdeclarativedebugjs/data/backtrace1.qml | 27 ++++ .../qdeclarativedebugjs/qdeclarativedebugjs.pro | 20 +++ .../tst_qdeclarativedebugjs.cpp | 154 +++++++++++++++++++++ .../qdeclarativescriptdebugging/data/backtrace1.js | 11 -- .../data/backtrace1.qml | 27 ---- .../qdeclarativescriptdebugging.pro | 20 --- .../tst_qdeclarativescriptdebugging.cpp | 154 --------------------- 8 files changed, 212 insertions(+), 212 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.js create mode 100644 tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.qml create mode 100644 tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro create mode 100644 tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp delete mode 100644 tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js delete mode 100644 tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml delete mode 100644 tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro delete mode 100644 tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.js b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.js new file mode 100644 index 0000000..8decbf0 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.js @@ -0,0 +1,11 @@ + +function function2InScript(a) +{ + mainRectangle.foo = a; +} + + +function functionInScript(a , b) +{ + function2InScript(a + b); +} diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.qml b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.qml new file mode 100644 index 0000000..9096c32 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.qml @@ -0,0 +1,27 @@ +import QtQuick 1.0 +import Qt.test 1.0 +import "backtrace1.js" as Script + +Rectangle { + id: mainRectangle + + property string foo: "Default"; + width: 200 + height: 200 + + + MyTestObject { + + function append(a, b) { + return a + " " + b; + } + + + id: testObject; + someProperty: append("Hello", mainRectangle.foo) + + onSignaled: { + Script.functionInScript(value , "b"); + } + } +} diff --git a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro new file mode 100644 index 0000000..0a33c27 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro @@ -0,0 +1,20 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative script +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativedebugjs.cpp +INCLUDEPATH += ../shared + +# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage +# LIBS += -lgcov + +symbian: { + importFiles.files = data + importFiles.path = . + DEPLOYMENT += importFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} + +CONFIG += parallel_test + diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp new file mode 100644 index 0000000..92f9c6e --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -0,0 +1,154 @@ +/**************************************************************************** +** +** 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 +#include +#include +#include + +class MyTestObject : public QObject { + Q_OBJECT + Q_PROPERTY(QString someProperty READ someProperty WRITE setSomeProperty NOTIFY somePropertyChanged) + +public: + QString someProperty() { return _someProperty; } + void setSomeProperty(const QString &p) { _someProperty = p; } + QString _someProperty; + + void emitSignal(const QString &value) { emit signaled(value); } + +signals: + void signaled(const QString &value); + void somePropertyChanged(); +}; + + +class BtAgent : public QScriptEngineAgent { +public: + BtAgent(QScriptEngine *engine) : QScriptEngineAgent(engine) + { count = 0; engine->setAgent(this); } + + QStringList bt; + int count; + int breakpoint; + void positionChange(qint64 , int lineNumber, int ) + { + if(lineNumber == breakpoint) { + count++; + bt = engine()->currentContext()->backtrace(); + } + } +}; + + + +/* +This test covers evaluation of ECMAScript expressions and bindings from within +QML. This does not include static QML language issues. + +Static QML language issues are covered in qmllanguage +*/ +inline QUrl TEST_FILE(const QString &filename) +{ + QFileInfo fileInfo(__FILE__); + return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename)); +} + +inline QUrl TEST_FILE(const char *filename) +{ + return TEST_FILE(QLatin1String(filename)); +} + +class tst_QDeclarativeDebugJS : public QObject +{ + Q_OBJECT +public: + tst_QDeclarativeDebugJS() {} + +private slots: + void initTestCase(); + void backtrace1(); +}; + +void tst_QDeclarativeDebugJS::initTestCase() +{ + qmlRegisterType("Qt.test", 1,0, "MyTestObject"); +} + +void tst_QDeclarativeDebugJS::backtrace1() +{ + { + QDeclarativeEngine engine; + QUrl file = TEST_FILE("backtrace1.qml"); + QDeclarativeComponent component(&engine, file); + QDeclarativeItem *item = qobject_cast(component.create()); + QVERIFY(item); + MyTestObject *obj = item->findChild(); + QVERIFY(obj); + QCOMPARE(obj->someProperty(), QString("Hello Default")); + + QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(&engine); + BtAgent agent(&ep->scriptEngine); + agent.breakpoint = 16; + + obj->emitSignal("blah"); + QCOMPARE(obj->someProperty(), QString("Hello blahb")); + QCOMPARE(agent.count, 1); + + QStringList expected; + expected << "append(a = 'Hello', b = 'blahb') at @PREFIX@/backtrace1.qml:16" + << "$someProperty() at @PREFIX@/backtrace1.qml:21" + << "function2InScript(a = 'blahb') at @PREFIX@/backtrace1.js:4" + << "functionInScript(a = 'blah', b = 'b') at @PREFIX@/backtrace1.js:10" + << "onSignaled() at @PREFIX@/backtrace1.qml:24" + << "() at -1"; + expected.replaceInStrings("@PREFIX@", file.toString().section('/', 0, -2)); + QCOMPARE(agent.bt, expected); + } +} + + +QTEST_MAIN(tst_QDeclarativeDebugJS) + +#include "tst_qdeclarativedebugjs.moc" diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js deleted file mode 100644 index 8decbf0..0000000 --- a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js +++ /dev/null @@ -1,11 +0,0 @@ - -function function2InScript(a) -{ - mainRectangle.foo = a; -} - - -function functionInScript(a , b) -{ - function2InScript(a + b); -} diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml deleted file mode 100644 index 9096c32..0000000 --- a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 1.0 -import Qt.test 1.0 -import "backtrace1.js" as Script - -Rectangle { - id: mainRectangle - - property string foo: "Default"; - width: 200 - height: 200 - - - MyTestObject { - - function append(a, b) { - return a + " " + b; - } - - - id: testObject; - someProperty: append("Hello", mainRectangle.foo) - - onSignaled: { - Script.functionInScript(value , "b"); - } - } -} diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro b/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro deleted file mode 100644 index 171f308..0000000 --- a/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro +++ /dev/null @@ -1,20 +0,0 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative script -macx:CONFIG -= app_bundle - -SOURCES += tst_qdeclarativescriptdebugging.cpp -INCLUDEPATH += ../shared - -# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -# LIBS += -lgcov - -symbian: { - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} - -CONFIG += parallel_test - diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp b/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp deleted file mode 100644 index 4301174..0000000 --- a/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/**************************************************************************** -** -** 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 -#include -#include -#include - -class MyTestObject : public QObject { - Q_OBJECT - Q_PROPERTY(QString someProperty READ someProperty WRITE setSomeProperty NOTIFY somePropertyChanged) - -public: - QString someProperty() { return _someProperty; } - void setSomeProperty(const QString &p) { _someProperty = p; } - QString _someProperty; - - void emitSignal(const QString &value) { emit signaled(value); } - -signals: - void signaled(const QString &value); - void somePropertyChanged(); -}; - - -class BtAgent : public QScriptEngineAgent { -public: - BtAgent(QScriptEngine *engine) : QScriptEngineAgent(engine) - { count = 0; engine->setAgent(this); } - - QStringList bt; - int count; - int breakpoint; - void positionChange(qint64 , int lineNumber, int ) - { - if(lineNumber == breakpoint) { - count++; - bt = engine()->currentContext()->backtrace(); - } - } -}; - - - -/* -This test covers evaluation of ECMAScript expressions and bindings from within -QML. This does not include static QML language issues. - -Static QML language issues are covered in qmllanguage -*/ -inline QUrl TEST_FILE(const QString &filename) -{ - QFileInfo fileInfo(__FILE__); - return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename)); -} - -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} - -class tst_qdeclarativescriptdebugging : public QObject -{ - Q_OBJECT -public: - tst_qdeclarativescriptdebugging() {} - -private slots: - void initTestCase(); - void backtrace1(); -}; - -void tst_qdeclarativescriptdebugging::initTestCase() -{ - qmlRegisterType("Qt.test", 1,0, "MyTestObject"); -} - -void tst_qdeclarativescriptdebugging::backtrace1() -{ - { - QDeclarativeEngine engine; - QUrl file = TEST_FILE("backtrace1.qml"); - QDeclarativeComponent component(&engine, file); - QDeclarativeItem *item = qobject_cast(component.create()); - QVERIFY(item); - MyTestObject *obj = item->findChild(); - QVERIFY(obj); - QCOMPARE(obj->someProperty(), QString("Hello Default")); - - QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(&engine); - BtAgent agent(&ep->scriptEngine); - agent.breakpoint = 16; - - obj->emitSignal("blah"); - QCOMPARE(obj->someProperty(), QString("Hello blahb")); - QCOMPARE(agent.count, 1); - - QStringList expected; - expected << "append(a = 'Hello', b = 'blahb') at @PREFIX@/backtrace1.qml:16" - << "$someProperty() at @PREFIX@/backtrace1.qml:21" - << "function2InScript(a = 'blahb') at @PREFIX@/backtrace1.js:4" - << "functionInScript(a = 'blah', b = 'b') at @PREFIX@/backtrace1.js:10" - << "onSignaled() at @PREFIX@/backtrace1.qml:24" - << "() at -1"; - expected.replaceInStrings("@PREFIX@", file.toString().section('/', 0, -2)); - QCOMPARE(agent.bt, expected); - } -} - - -QTEST_MAIN(tst_qdeclarativescriptdebugging) - -#include "tst_qdeclarativescriptdebugging.moc" -- cgit v0.12