diff options
8 files changed, 167 insertions, 2 deletions
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index 4a7c8b3..d6961b0 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -55,7 +55,7 @@ class QmlSpringFollowPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QmlSpringFollow) public: QmlSpringFollowPrivate() - : sourceValue(0), maxVelocity(0), lastTime(0) + : currentValue(0), sourceValue(0), maxVelocity(0), lastTime(0) , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01) , modulus(0.0), useMass(false), haveModulus(false), enabled(true), mode(Track), clock(this) {} diff --git a/src/declarative/util/qmlspringfollow_p.h b/src/declarative/util/qmlspringfollow_p.h index b81539a..b7989e4 100644 --- a/src/declarative/util/qmlspringfollow_p.h +++ b/src/declarative/util/qmlspringfollow_p.h @@ -64,7 +64,6 @@ class Q_DECLARATIVE_EXPORT QmlSpringFollow : public QObject, Q_PROPERTY(qreal spring READ spring WRITE setSpring) Q_PROPERTY(qreal damping READ damping WRITE setDamping) Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon) - Q_PROPERTY(qreal modulus READ modulus WRITE setModulus) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled) Q_PROPERTY(qreal value READ value NOTIFY valueChanged) Q_PROPERTY(qreal modulus READ modulus WRITE setModulus NOTIFY modulusChanged) diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 3106f90..6b2e39e 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -41,6 +41,7 @@ SUBDIRS += \ qmlpixmapcache \ # Cover qmlpropertymap \ # Cover qmlqt \ # Cover + qmlspringfollow \ # Cover qmlsystempalette \ # Cover qmltimer \ # Cover qmlxmllistmodel \ # Cover diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml b/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml new file mode 100644 index 0000000..959d206 --- /dev/null +++ b/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml @@ -0,0 +1,4 @@ +import Qt 4.6 + +SpringFollow { +} diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml b/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml new file mode 100644 index 0000000..7c81fb5 --- /dev/null +++ b/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml @@ -0,0 +1,8 @@ +import Qt 4.6 + +SpringFollow { + source: 1.44; velocity: 0.9 + spring: 1.0; damping: 0.5 + epsilon: 0.25; modulus: 360.0 + mass: 2.0; enabled: true +} diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml b/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml new file mode 100644 index 0000000..6fec55b --- /dev/null +++ b/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml @@ -0,0 +1,8 @@ +import Qt 4.6 + +SpringFollow { + source: 1.44; velocity: 0.9 + spring: 1.0; damping: 0.5 + epsilon: 0.25; modulus: 360.0 + mass: 2.0; enabled: false +} diff --git a/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro b/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro new file mode 100644 index 0000000..ffaa97f --- /dev/null +++ b/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro @@ -0,0 +1,8 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative gui +macx:CONFIG -= app_bundle + +SOURCES += tst_qmlspringfollow.cpp + +# Define SRCDIR equal to test's source directory +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp b/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp new file mode 100644 index 0000000..fe3a53a --- /dev/null +++ b/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp @@ -0,0 +1,137 @@ +/**************************************************************************** +** +** Copyright (C) 2009 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$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, 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. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <qtest.h> +#include <QtDeclarative/qmlengine.h> +#include <QtDeclarative/qmlcomponent.h> +#include <private/qmlspringfollow_p.h> +#include <private/qmlvaluetype_p.h> +#include "../../../shared/util.h" + +class tst_qmlspringfollow : public QObject +{ + Q_OBJECT +public: + tst_qmlspringfollow(); + +private slots: + void defaultValues(); + void values(); + void disabled(); + +private: + QmlEngine engine; +}; + +tst_qmlspringfollow::tst_qmlspringfollow() +{ +} + +void tst_qmlspringfollow::defaultValues() +{ + QmlEngine engine; + QmlComponent c(&engine, QUrl("file://" SRCDIR "/data/springfollow1.qml")); + QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create()); + + QVERIFY(obj != 0); + + QCOMPARE(obj->sourceValue(), 0.); + QCOMPARE(obj->velocity(), 0.); + QCOMPARE(obj->spring(), 0.); + QCOMPARE(obj->damping(), 0.); + QCOMPARE(obj->epsilon(), 0.01); + QCOMPARE(obj->modulus(), 0.); + QCOMPARE(obj->value(), 0.); + QCOMPARE(obj->mass(), 1.); + QCOMPARE(obj->enabled(), true); + QCOMPARE(obj->inSync(), true); + + delete obj; +} + +void tst_qmlspringfollow::values() +{ + QmlEngine engine; + QmlComponent c(&engine, QUrl("file://" SRCDIR "/data/springfollow2.qml")); + QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create()); + + QVERIFY(obj != 0); + + QCOMPARE(obj->sourceValue(), 1.44); + QCOMPARE(obj->velocity(), 0.9); + QCOMPARE(obj->spring(), 1.0); + QCOMPARE(obj->damping(), 0.5); + QCOMPARE(obj->epsilon(), 0.25); + QCOMPARE(obj->modulus(), 360.0); + QCOMPARE(obj->mass(), 2.0); + QCOMPARE(obj->enabled(), true); + + QTRY_COMPARE(obj->value(), 1.44); + QTRY_COMPARE(obj->inSync(), true); + + delete obj; +} + +void tst_qmlspringfollow::disabled() +{ + QmlEngine engine; + QmlComponent c(&engine, QUrl("file://" SRCDIR "/data/springfollow3.qml")); + QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create()); + + QVERIFY(obj != 0); + + QCOMPARE(obj->sourceValue(), 1.44); + QCOMPARE(obj->velocity(), 0.9); + QCOMPARE(obj->spring(), 1.0); + QCOMPARE(obj->damping(), 0.5); + QCOMPARE(obj->epsilon(), 0.25); + QCOMPARE(obj->modulus(), 360.0); + QCOMPARE(obj->mass(), 2.0); + QCOMPARE(obj->enabled(), false); + + QCOMPARE(obj->value(), 0.0); + QCOMPARE(obj->inSync(), false); + + delete obj; +} + +QTEST_MAIN(tst_qmlspringfollow) + +#include "tst_qmlspringfollow.moc" |