aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-05-10 20:26:13 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-12 05:25:30 +0200
commit754905afb1d16f9cec274b3ce3ff2b937bc13e84 (patch)
tree2d0a92c8ecb919023ec0fff206d8c8f9e918b7a0 /tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
parente8206bf6ab6ef62b5dd24bf002aa56edecbcec97 (diff)
Emit currentFrameChanged signal when needed
Task-number: QTBUG-25039 Change-Id: I8bd5fd40a5fee1314f0401ed4708d73ed1cfad94 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp')
-rw-r--r--tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp34
1 files changed, 34 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
index 37625cfed6..b45b5d53be 100644
--- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
+++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
@@ -41,6 +41,7 @@
#include <QtTest/QtTest>
#include "../../shared/util.h"
#include <QtQuick/qquickview.h>
+#include <private/qabstractanimation_p.h>
#include <private/qquickanimatedsprite_p.h>
class tst_qquickanimatedsprite : public QQmlDataTest
@@ -50,9 +51,17 @@ public:
tst_qquickanimatedsprite(){}
private slots:
+ void initTestCase();
void test_properties();
+ void test_frameChangedSignal();
};
+void tst_qquickanimatedsprite::initTestCase()
+{
+ QQmlDataTest::initTestCase();
+ QUnifiedTimer::instance()->setConsistentTiming(true);
+}
+
void tst_qquickanimatedsprite::test_properties()
{
QQuickView *canvas = new QQuickView(0);
@@ -78,6 +87,31 @@ void tst_qquickanimatedsprite::test_properties()
delete canvas;
}
+void tst_qquickanimatedsprite::test_frameChangedSignal()
+{
+ QQuickView *canvas = new QQuickView(0);
+
+ canvas->setSource(testFileUrl("frameChange.qml"));
+ canvas->show();
+ QTest::qWaitForWindowShown(canvas);
+
+ QVERIFY(canvas->rootObject());
+ QQuickAnimatedSprite* sprite = canvas->rootObject()->findChild<QQuickAnimatedSprite*>("sprite");
+ QVERIFY(sprite);
+
+ QVERIFY(!sprite->running());
+ QVERIFY(!sprite->paused());
+ QCOMPARE(sprite->loops(), 3);
+ QCOMPARE(sprite->frameCount(), 6);
+
+ QSignalSpy frameChangedSpy(sprite, SIGNAL(currentFrameChanged(int)));
+ sprite->setRunning(true);
+ QTRY_COMPARE(frameChangedSpy.count(), 3*6);
+ QTRY_VERIFY(!sprite->running());
+
+ delete canvas;
+}
+
QTEST_MAIN(tst_qquickanimatedsprite)
#include "tst_qquickanimatedsprite.moc"