diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-02-17 14:19:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 18:13:00 +0100 |
| commit | 01714ef0c5ee80544e3799ae2a66d9a611c9d71f (patch) | |
| tree | 6484d5f6cc2dbec56e58d9b35ffd1d0831eb97e4 /tests/auto/integration | |
| parent | 54066d2c216e871e3f4c08590f0e010dd2e76e69 (diff) | |
Use QVERIFY2 for elapsed time in tst_QMediaPlayerBackend::seekPauseSeek().
The test has been observed to fail sometimes, try to obtain values.
Change-Id: Id0374b7ad3d593c099500e771bc4d8cc50f26651
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index e5b115bf8..380e344db 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -630,8 +630,9 @@ void tst_QMediaPlayerBackend::seekPauseSeek() QVERIFY(surface->m_frameList.isEmpty()); // frame must not appear until we call pause() or play() positionSpy.clear(); - player.setPosition((qint64)7000); - QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - (qint64)7000) < (qint64)500); + qint64 position = 7000; + player.setPosition(position); + QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - position) < (qint64)500); QCOMPARE(player.state(), QMediaPlayer::StoppedState); QTest::qWait(250); // wait a bit to ensure the frame is not rendered QVERIFY(surface->m_frameList.isEmpty()); // still no frame, we must call pause() or play() to see a frame @@ -642,7 +643,8 @@ void tst_QMediaPlayerBackend::seekPauseSeek() { QVideoFrame frame = surface->m_frameList.back(); - QVERIFY(qAbs(frame.startTime() - (qint64)7000) < (qint64)500); + const qint64 elapsed = frame.startTime() - position; + QVERIFY2(qAbs(elapsed) < (qint64)500, QByteArray::number(elapsed).constData()); QCOMPARE(frame.width(), 160); QCOMPARE(frame.height(), 120); @@ -657,14 +659,16 @@ void tst_QMediaPlayerBackend::seekPauseSeek() } positionSpy.clear(); - player.setPosition((qint64)12000); - QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - (qint64)12000) < (qint64)500); + position = 12000; + player.setPosition(position); + QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - position) < (qint64)500); QCOMPARE(player.state(), QMediaPlayer::PausedState); QCOMPARE(surface->m_frameList.size(), 2); { QVideoFrame frame = surface->m_frameList.back(); - QVERIFY(qAbs(frame.startTime() - (qint64)12000) < (qint64)500); + const qint64 elapsed = frame.startTime() - position; + QVERIFY2(qAbs(elapsed) < (qint64)500, QByteArray::number(elapsed).constData()); QCOMPARE(frame.width(), 160); QCOMPARE(frame.height(), 120); |