Add Test for Animating Qml Dynamic Properties using QPropertyAnimation

Test case for calling QQmlVMEMetaObject::metaCall from
QPropertyAnimationPrivate::updateProperty

Task-number: QTBUG-29082
Change-Id: Iecab74132eb3a843e53356effe3b6bbe4d5a8fb2
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/data/MyItem.qml b/tests/auto/quick/qquickdynamicpropertyanimation/data/MyItem.qml
new file mode 100644 (file)
index 0000000..2fc8b90
--- /dev/null
+++ b/tests/auto/quick/qquickdynamicpropertyanimation/data/MyItem.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.0
+
+Item
+{
+  property int testInt: 0
+  property double testDouble: 0.0
+  property real testReal: 0.0
+  property point testPoint: Qt.point(0, 0)
+  property size testSize: Qt.size(0, 0)
+  property rect testRect: Qt.rect(0, 0, 0, 0)
+  property color testColor: Qt.rgba(0.0, 0.0, 0.0, 0.0)
+  property var testVar: 0
+}

diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/qquickdynamicpropertyanimation.pro b/tests/auto/quick/qquickdynamicpropertyanimation/qquickdynamicpropertyanimation.pro
new file mode 100644 (file)
index 0000000..a67daa9
--- /dev/null
+++ b/tests/auto/quick/qquickdynamicpropertyanimation/qquickdynamicpropertyanimation.pro
@@ -0,0 +1,14 @@
+CONFIG += testcase
+TARGET = tst_qquickdynamicpropertyanimation
+SOURCES += tst_qquickdynamicpropertyanimation.cpp
+
+include (../../shared/util.pri)
+
+macx:CONFIG -= app_bundle
+
+TESTDATA = data/*
+
+CONFIG += parallel_test
+
+QT += core gui qml quick testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp b/tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp
new file mode 100644 (file)
index 0000000..78f2d17
--- /dev/null
+++ b/tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlProperty>
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QPoint>
+#include <QtCore/QSize>
+#include <QtCore/QRect>
+#include <QtGui/QColor>
+
+#include "../../shared/util.h"
+
+class tst_qquickdynamicpropertyanimation : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_qquickdynamicpropertyanimation() {}
+
+private:
+    template<class T>
+    void dynamicPropertyAnimation(const QByteArray & propertyName, T toValue)
+    {
+        QQuickView view(testFileUrl("MyItem.qml"));
+        QQuickItem * item = qobject_cast<QQuickItem *>(view.rootObject());
+        QVERIFY(item);
+        QQmlProperty testProp(item, propertyName);
+        QPropertyAnimation animation(item, propertyName, this);
+        animation.setEndValue(toValue);
+        QVERIFY(animation.targetObject() == item);
+        QVERIFY(animation.propertyName() == propertyName);
+        QVERIFY(animation.endValue().value<T>() == toValue);
+        animation.start();
+        QVERIFY(animation.state() == QAbstractAnimation::Running);
+        QTest::qWait(animation.duration());
+        QTRY_COMPARE(testProp.read().value<T>(), toValue);
+    }
+
+private slots:
+    void initTestCase()
+    {
+        QQmlEngine engine;  // ensure types are registered
+        QQmlDataTest::initTestCase();
+    }
+
+    void dynamicIntPropertyAnimation();
+    void dynamicDoublePropertyAnimation();
+    void dynamicRealPropertyAnimation();
+    void dynamicPointPropertyAnimation();
+    void dynamicSizePropertyAnimation();
+    void dynamicRectPropertyAnimation();
+    void dynamicColorPropertyAnimation();
+    void dynamicVarPropertyAnimation();
+};
+
+void tst_qquickdynamicpropertyanimation::dynamicIntPropertyAnimation()
+{
+    dynamicPropertyAnimation("testInt", 1);
+}
+
+void tst_qquickdynamicpropertyanimation::dynamicDoublePropertyAnimation()
+{
+    dynamicPropertyAnimation("testDouble", 1.0);
+}
+
+void tst_qquickdynamicpropertyanimation::dynamicRealPropertyAnimation()
+{
+    dynamicPropertyAnimation("testReal", qreal(1.0));
+}
+
+void tst_qquickdynamicpropertyanimation::dynamicPointPropertyAnimation()
+{
+    dynamicPropertyAnimation("testPoint", QPoint(1, 1));
+}
+
+void tst_qquickdynamicpropertyanimation::dynamicSizePropertyAnimation()
+{
+    dynamicPropertyAnimation("testSize", QSize(1,1));
+}
+
+void tst_qquickdynamicpropertyanimation::dynamicRectPropertyAnimation()
+{
+    dynamicPropertyAnimation("testRect", QRect(1, 1, 1, 1));
+}
+
+void tst_qquickdynamicpropertyanimation::dynamicColorPropertyAnimation()
+{
+    dynamicPropertyAnimation("testColor", QColor::fromRgbF(1.0, 1.0, 1.0, 1.0));
+}
+
+void tst_qquickdynamicpropertyanimation::dynamicVarPropertyAnimation()
+{
+    dynamicPropertyAnimation("testVar", QVariant::fromValue(1));
+}
+
+QTEST_MAIN(tst_qquickdynamicpropertyanimation)
+
+#include "tst_qquickdynamicpropertyanimation.moc"

diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 3ed6ca8..c4a4173 100644 (file)
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -35,6 +35,7 @@ QUICKTESTS =  \
     qquickanchors \
     qquickanimatedimage \
     qquickanimatedsprite \
+    qquickdynamicpropertyanimation \
     qquickborderimage \
     qquickwindow \
     qquickdrag \