From 80cc666f4f3c7cc2fc6aed806951564066011e09 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 10 Nov 2009 10:23:18 +1000 Subject: Fix animation tests. --- tests/auto/declarative/animations/tst_animations.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/declarative/animations/tst_animations.cpp b/tests/auto/declarative/animations/tst_animations.cpp index a4402cb..372658e 100644 --- a/tests/auto/declarative/animations/tst_animations.cpp +++ b/tests/auto/declarative/animations/tst_animations.cpp @@ -134,7 +134,7 @@ void tst_animations::dotProperty() animation.setProperty("border.width"); animation.setTo(10); animation.start(); - QTest::qWait(animation.duration()); + QTest::qWait(animation.duration()+50); QTIMED_COMPARE(rect.border()->width(), 10); rect.border()->setWidth(0); @@ -352,7 +352,7 @@ void tst_animations::propertiesTransition() QmlGraphicsRectangle *myRect = rect->findChild("TheRect"); QVERIFY(myRect); - QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition4.qml:22:9) targets/properties/exclude and target/property are mutually exclusive."); + QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition4.qml:22:9) matchTargets/matchProperties/exclude and target/property are mutually exclusive."); rect->setState("moved"); QCOMPARE(myRect->x(),qreal(200)); } @@ -365,7 +365,7 @@ void tst_animations::propertiesTransition() QmlGraphicsRectangle *myRect = rect->findChild("TheRect"); QVERIFY(myRect); - QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition5.qml:22:9) targets/properties/exclude and target/property are mutually exclusive."); + QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition5.qml:22:9) matchTargets/matchProperties/exclude and target/property are mutually exclusive."); rect->setState("moved"); QCOMPARE(myRect->x(),qreal(200)); } -- cgit v0.12