aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-03-26 15:24:31 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 15:50:09 +0100
commitc5a1a6f77ddc2a7e10d976af470c26ab29c036db (patch)
treeb01022bce3231586fa46be13d949253258b45fa9
parent583bd0073942c9ac017f865057c003c11992b09a (diff)
Attempt to stabilize tst_qquickanimatedsprite
Change-Id: I557f985ca5e68eb75d0b032b1dfa28cc33d56b6a Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--tests/auto/quick/qquickanimatedsprite/data/basic.qml4
-rw-r--r--tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickanimatedsprite/data/basic.qml b/tests/auto/quick/qquickanimatedsprite/data/basic.qml
index b71f79f3db..d903230aef 100644
--- a/tests/auto/quick/qquickanimatedsprite/data/basic.qml
+++ b/tests/auto/quick/qquickanimatedsprite/data/basic.qml
@@ -48,10 +48,10 @@ Rectangle {
AnimatedSprite {
objectName: "sprite"
- loops: 3
+ loops: 30
source: "squarefacesprite.png"
frameCount: 6
- frameDuration: 120
+ frameDuration: 240
width: 160
height: 160
}
diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
index 34a1614ac5..bf46b6eca8 100644
--- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
+++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
@@ -74,10 +74,10 @@ void tst_qquickanimatedsprite::test_properties()
QQuickAnimatedSprite* sprite = window->rootObject()->findChild<QQuickAnimatedSprite*>("sprite");
QVERIFY(sprite);
- QVERIFY(sprite->running());
+ QTRY_VERIFY(sprite->running());
QVERIFY(!sprite->paused());
QVERIFY(sprite->interpolate());
- QCOMPARE(sprite->loops(), 3);
+ QCOMPARE(sprite->loops(), 30);
sprite->setRunning(false);
QVERIFY(!sprite->running());