summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-04-13 02:49:20 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-04-13 05:02:22 (GMT)
commit317f947b4c9822f8a1bfecc4de68117ddabfb9cf (patch)
tree06c3a55c2c5c1de7d2fc3b65a211ffc8786c5564
parent1d26855f7cb061ba3da9db62dbbd92f586931a41 (diff)
downloadQt-317f947b4c9822f8a1bfecc4de68117ddabfb9cf.zip
Qt-317f947b4c9822f8a1bfecc4de68117ddabfb9cf.tar.gz
Qt-317f947b4c9822f8a1bfecc4de68117ddabfb9cf.tar.bz2
Stabilize behaviors test.
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/binding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp14
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
index e982f21..e9fb286 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
@@ -9,7 +9,7 @@ Rectangle {
objectName: "MyRect"
width: 100; height: 100; color: "green"
x: basex
- Behavior on x { NumberAnimation { duration: 500; } }
+ Behavior on x { NumberAnimation { duration: 800; } }
}
MouseArea {
id: clicker
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
index b22441a..795b309 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
@@ -11,6 +11,6 @@ Rectangle {
id: rect
objectName: "MyRect"
width: 100; height: 100; color: "green"
- Behavior on x { NumberAnimation { duration: 500; } }
+ Behavior on x { NumberAnimation { duration: 800; } }
}
}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
index 4c9c9ca..5a06d10 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
+++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -95,7 +95,7 @@ void tst_qdeclarativebehaviors::scriptTriggered()
QVERIFY(rect);
rect->setColor(QColor("red"));
- QTest::qWait(200);
+ QTest::qWait(400);
qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
@@ -175,29 +175,29 @@ void tst_qdeclarativebehaviors::replaceBinding()
QVERIFY(rect);
rect->setState("moved");
- QTest::qWait(200);
+ QTest::qWait(400);
QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
QVERIFY(innerRect);
qreal x = innerRect->x();
QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered
- QTest::qWait(600);
+ QTest::qWait(1000);
QCOMPARE(innerRect->x(), (qreal)200);
rect->setProperty("basex", 10);
QCOMPARE(innerRect->x(), (qreal)200);
rect->setProperty("movedx", 210);
- QTest::qWait(600);
+ QTest::qWait(1400);
QCOMPARE(innerRect->x(), (qreal)210);
rect->setState("");
- QTest::qWait(200);
+ QTest::qWait(400);
x = innerRect->x();
QVERIFY(x > 10 && x < 210); //i.e. the behavior has been triggered
- QTest::qWait(600);
+ QTest::qWait(1000);
QCOMPARE(innerRect->x(), (qreal)10);
rect->setProperty("movedx", 200);
QCOMPARE(innerRect->x(), (qreal)10);
rect->setProperty("basex", 20);
- QTest::qWait(600);
+ QTest::qWait(1400);
QCOMPARE(innerRect->x(), (qreal)20);
delete rect;