AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve tst_qtimeline::currentTime

Browse Source 
Now the test is less fragile to time and it executes 4s faster

Change-Id: Id3eb8ed2c03317e7d2f2c3cd17f889a8d8e7e5b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Jędrzej Nowacki 2015-12-14 12:28:51 +01:00
parent 229c03cd88
commit 70e290411a
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
View File

@ -114,19 +114,17 @@ void tst_QTimeLine::currentTime()
{
QTimeLine timeLine(2000);
timeLine.setUpdateInterval((timeLine.duration()/2) / 33);
QSignalSpy spy(&timeLine, &QTimeLine::valueChanged);
QVERIFY(spy.isValid());
timeLine.setFrameRange(10, 20);
QCOMPARE(timeLine.currentTime(), 0);
timeLine.start();
QTest::qWait(timeLine.duration()/2);
QCOMPARE(timeLine.state(), QTimeLine::Running);
QVERIFY(timeLine.currentTime() > timeLine.duration()/2 - timeLine.duration()/10);
QVERIFY(timeLine.currentTime() < timeLine.duration()/2 + timeLine.duration()/10);
QTest::qWait(timeLine.duration()/4 + timeLine.duration());
QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
QTRY_COMPARE(timeLine.state(), QTimeLine::Running);
QTRY_VERIFY(timeLine.currentTime() > timeLine.duration()/2 - timeLine.duration()/4);
QVERIFY(timeLine.currentTime() < timeLine.duration()/2 + timeLine.duration()/4);
QTRY_COMPARE(timeLine.state(), QTimeLine::NotRunning);
QCOMPARE(timeLine.currentTime(), timeLine.duration());
QSignalSpy spy(&timeLine, &QTimeLine::valueChanged);
QVERIFY(spy.isValid());
spy.clear();
timeLine.setCurrentTime(timeLine.duration()/2);
timeLine.setCurrentTime(timeLine.duration()/2);
@ -135,24 +133,22 @@ void tst_QTimeLine::currentTime()
QCOMPARE(timeLine.currentTime(), timeLine.duration()/2);
timeLine.resume();
// Let it update on its own
QTest::qWait(timeLine.duration()/4);
QCOMPARE(timeLine.state(), QTimeLine::Running);
QVERIFY(timeLine.currentTime() > timeLine.duration()/2);
QTRY_VERIFY(timeLine.currentTime() > timeLine.duration()/2);
QVERIFY(timeLine.currentTime() < timeLine.duration());
QTest::qWait(timeLine.duration()/4 + timeLine.duration());
QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
QVERIFY(timeLine.currentTime() == timeLine.duration());
QTRY_COMPARE(timeLine.state(), QTimeLine::NotRunning);
QCOMPARE(timeLine.currentTime(), timeLine.duration());
// Reverse should decrease the currentTime
timeLine.setCurrentTime(timeLine.duration()/2);
timeLine.start();
// Let it update on its own
QTest::qWait(timeLine.duration()/4);
QCOMPARE(timeLine.state(), QTimeLine::Running);
int currentTime = timeLine.currentTime();
QTRY_VERIFY(timeLine.currentTime() > currentTime);
QCOMPARE(timeLine.state(), QTimeLine::Running);
currentTime = timeLine.currentTime();
timeLine.setDirection(QTimeLine::Backward);
QTest::qWait(timeLine.duration()/4);
QVERIFY(timeLine.currentTime() < currentTime);
QTRY_VERIFY(timeLine.currentTime() < currentTime);
timeLine.stop();
}