Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

7 files changed, 167 insertions, 1 deletions

diff --git a/tests/auto/declarative/anchors/data/anchors.qml b/tests/auto/declarative/anchors/data/anchors.qml
index b3fba30..b880762 100644
--- a/tests/auto/declarative/anchors/data/anchors.qml
+++ b/tests/auto/declarative/anchors/data/anchors.qml
@@ -97,7 +97,7 @@ Rectangle {
         id: rect18; objectName: "rect18"
         x: 180; width: 10
         anchors.top: masterRect.bottom
-        anchors.bottom: Rect12.top
+        anchors.bottom: rect12.top
     }
     Rectangle {
         id: rect19; objectName: "rect19"
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"