aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qtquick2/qdeclarativesmoothedanimation
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qtquick2/qdeclarativesmoothedanimation')
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/deleteOnUpdate.qml27
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/simpleanimation.qml12
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml3
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml5
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml6
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml24
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml13
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro15
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp242
9 files changed, 0 insertions, 347 deletions
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/deleteOnUpdate.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/deleteOnUpdate.qml
deleted file mode 100644
index ff8dfaa846..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/deleteOnUpdate.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- width: 300; height: 300;
-
- Rectangle {
- color: "red"
- width: 60; height: 60;
- x: 100; y: 100;
-
- property real prevX: 100
- onXChanged: {
- if (x - prevX > 10) {
- anim.to += 5
- anim.restart(); //this can cause deletion of backend animation classes
- prevX = x;
- }
- }
-
- SmoothedAnimation on x {
- id: anim
- objectName: "anim"
- velocity: 100
- to: 150
- }
- }
-}
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/simpleanimation.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/simpleanimation.qml
deleted file mode 100644
index b2be63ec94..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/simpleanimation.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- width: 300; height: 300;
- Rectangle {
- objectName: "rect"
- color: "red"
- width: 60; height: 60;
- x: 100; y: 100;
- }
- SmoothedAnimation { objectName: "anim"}
-} \ No newline at end of file
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml
deleted file mode 100644
index 3631f971f0..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import QtQuick 2.0
-
-SmoothedAnimation {}
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml
deleted file mode 100644
index b07120234a..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-SmoothedAnimation {
- to: 10; duration: 300; reversingMode: SmoothedAnimation.Immediate
-}
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml
deleted file mode 100644
index 8d5dc4a92b..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-SmoothedAnimation {
- to: 10; velocity: 250; reversingMode: SmoothedAnimation.Sync
- maximumEasingTime: 150
-}
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml
deleted file mode 100644
index 81d36bf015..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- width: 400; height: 400; color: "blue"
-
- Rectangle {
- id: rect1
- color: "red"
- width: 60; height: 60;
- x: 100; y: 100;
- SmoothedAnimation on x { to: 200; velocity: 500 }
- SmoothedAnimation on y { to: 200; velocity: 500 }
- }
-
- Rectangle {
- objectName: "theRect"
- color: "green"
- width: 60; height: 60;
- x: rect1.x; y: rect1.y;
- // id are needed for SmoothedAnimation in order to avoid deferred creation
- Behavior on x { SmoothedAnimation { id: anim1; objectName: "easeX"; velocity: 400 } }
- Behavior on y { SmoothedAnimation { id: anim2; objectName: "easeY"; velocity: 400 } }
- }
- }
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml
deleted file mode 100644
index e136df84f6..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- width: 300; height: 300;
- Rectangle {
- objectName: "theRect"
- color: "red"
- width: 60; height: 60;
- x: 100; y: 100;
- SmoothedAnimation on x { objectName: "easeX"; to: 200; velocity: 500 }
- SmoothedAnimation on y { objectName: "easeY"; to: 200; duration: 250; velocity: 500 }
- }
-}
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro
deleted file mode 100644
index 41650c523f..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qdeclarativesmoothedanimation
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qdeclarativesmoothedanimation.cpp
-
-include (../../shared/util.pri)
-
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
-
-CONFIG += parallel_test
-
-QT += core-private gui-private v8-private declarative-private quick-private testlib
diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
deleted file mode 100644
index 09bde4ad76..0000000000
--- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** 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 <qtest.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtQuick/private/qdeclarativesmoothedanimation_p.h>
-#include <QtQuick/private/qquickrectangle_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include "../../shared/util.h"
-
-class tst_qdeclarativesmoothedanimation : public QDeclarativeDataTest
-{
- Q_OBJECT
-public:
- tst_qdeclarativesmoothedanimation();
-
-private slots:
- void defaultValues();
- void values();
- void disabled();
- void simpleAnimation();
- void valueSource();
- void behavior();
- void deleteOnUpdate();
-
-private:
- QDeclarativeEngine engine;
-};
-
-tst_qdeclarativesmoothedanimation::tst_qdeclarativesmoothedanimation()
-{
-}
-
-void tst_qdeclarativesmoothedanimation::defaultValues()
-{
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, testFileUrl("smoothedanimation1.qml"));
- QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create());
-
- QVERIFY(obj != 0);
-
- QCOMPARE(obj->to(), 0.);
- QCOMPARE(obj->velocity(), 200.);
- QCOMPARE(obj->duration(), -1);
- QCOMPARE(obj->maximumEasingTime(), -1);
- QCOMPARE(obj->reversingMode(), QDeclarativeSmoothedAnimation::Eased);
-
- delete obj;
-}
-
-void tst_qdeclarativesmoothedanimation::values()
-{
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, testFileUrl("smoothedanimation2.qml"));
- QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create());
-
- QVERIFY(obj != 0);
-
- QCOMPARE(obj->to(), 10.);
- QCOMPARE(obj->velocity(), 200.);
- QCOMPARE(obj->duration(), 300);
- QCOMPARE(obj->maximumEasingTime(), -1);
- QCOMPARE(obj->reversingMode(), QDeclarativeSmoothedAnimation::Immediate);
-
- delete obj;
-}
-
-void tst_qdeclarativesmoothedanimation::disabled()
-{
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, testFileUrl("smoothedanimation3.qml"));
- QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create());
-
- QVERIFY(obj != 0);
-
- QCOMPARE(obj->to(), 10.);
- QCOMPARE(obj->velocity(), 250.);
- QCOMPARE(obj->maximumEasingTime(), 150);
- QCOMPARE(obj->reversingMode(), QDeclarativeSmoothedAnimation::Sync);
-
- delete obj;
-}
-
-void tst_qdeclarativesmoothedanimation::simpleAnimation()
-{
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, testFileUrl("simpleanimation.qml"));
- QObject *obj = c.create();
- QVERIFY(obj);
-
- QQuickRectangle *rect = obj->findChild<QQuickRectangle*>("rect");
- QVERIFY(rect);
-
- QDeclarativeSmoothedAnimation *animation = obj->findChild<QDeclarativeSmoothedAnimation*>("anim");
- QVERIFY(animation);
-
- animation->setTargetObject(rect);
- animation->setProperty("x");
- animation->setTo(200);
- animation->setDuration(250);
- QVERIFY(animation->target() == rect);
- QVERIFY(animation->property() == "x");
- QVERIFY(animation->to() == 200);
- animation->start();
- QVERIFY(animation->isRunning());
- QTest::qWait(animation->duration());
- QTRY_COMPARE(rect->x(), qreal(200));
- QTest::qWait(100); //smoothed animation doesn't report stopped until delayed timer fires
-
- QVERIFY(!animation->isRunning());
- rect->setX(0);
- animation->start();
- QVERIFY(animation->isRunning());
- animation->pause();
- QVERIFY(animation->isRunning());
- QVERIFY(animation->isPaused());
- animation->setCurrentTime(125);
- QVERIFY(animation->currentTime() == 125);
- QCOMPARE(rect->x(), qreal(100));
-}
-
-void tst_qdeclarativesmoothedanimation::valueSource()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, testFileUrl("smoothedanimationValueSource.qml"));
-
- QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
- QVERIFY(rect);
-
- QQuickRectangle *theRect = rect->findChild<QQuickRectangle*>("theRect");
- QVERIFY(theRect);
-
- QDeclarativeSmoothedAnimation *easeX = rect->findChild<QDeclarativeSmoothedAnimation*>("easeX");
- QVERIFY(easeX);
- QVERIFY(easeX->isRunning());
-
- QDeclarativeSmoothedAnimation *easeY = rect->findChild<QDeclarativeSmoothedAnimation*>("easeY");
- QVERIFY(easeY);
- QVERIFY(easeY->isRunning());
-
- // XXX get the proper duration
- QTest::qWait(100);
-
- QTRY_VERIFY(!easeX->isRunning());
- QTRY_VERIFY(!easeY->isRunning());
-
- QTRY_COMPARE(theRect->x(), qreal(200));
- QTRY_COMPARE(theRect->y(), qreal(200));
-
- delete rect;
-}
-
-void tst_qdeclarativesmoothedanimation::behavior()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, testFileUrl("smoothedanimationBehavior.qml"));
-
- QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
- QVERIFY(rect);
-
- QQuickRectangle *theRect = rect->findChild<QQuickRectangle*>("theRect");
- QVERIFY(theRect);
-
- QDeclarativeSmoothedAnimation *easeX = rect->findChild<QDeclarativeSmoothedAnimation*>("easeX");
- QVERIFY(easeX);
-
- QDeclarativeSmoothedAnimation *easeY = rect->findChild<QDeclarativeSmoothedAnimation*>("easeY");
- QVERIFY(easeY);
-
- // XXX get the proper duration
- QTest::qWait(400);
-
- QTRY_VERIFY(!easeX->isRunning());
- QTRY_VERIFY(!easeY->isRunning());
-
- QTRY_COMPARE(theRect->x(), qreal(200));
- QTRY_COMPARE(theRect->y(), qreal(200));
-
- delete rect;
-}
-
-void tst_qdeclarativesmoothedanimation::deleteOnUpdate()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, testFileUrl("deleteOnUpdate.qml"));
-
- QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarativeSmoothedAnimation *anim = rect->findChild<QDeclarativeSmoothedAnimation*>("anim");
- QVERIFY(anim);
-
- //don't crash
- QTest::qWait(500);
-
- delete rect;
-}
-
-QTEST_MAIN(tst_qdeclarativesmoothedanimation)
-
-#include "tst_qdeclarativesmoothedanimation.moc"