slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use QVERIFY2 for elapsed time in tst_QMediaPlayerBackend::seekPauseSeek().

Browse Source 
The test has been observed to fail sometimes, try to obtain values.

Change-Id: Id0374b7ad3d593c099500e771bc4d8cc50f26651
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Friedemann Kleint
2014-02-17 14:19:44 +01:00
committed by The Qt Project
parent 54066d2c21
commit 01714ef0c5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
View File

@@ -630,8 +630,9 @@ void tst_QMediaPlayerBackend::seekPauseSeek()
QVERIFY(surface->m_frameList.isEmpty()); // frame must not appear until we call pause() or play() QVERIFY(surface->m_frameList.isEmpty()); // frame must not appear until we call pause() or play()
positionSpy.clear(); positionSpy.clear();
player.setPosition((qint64)7000); qint64 position = 7000;
QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - (qint64)7000) < (qint64)500); player.setPosition(position);
QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - position) < (qint64)500);
QCOMPARE(player.state(), QMediaPlayer::StoppedState); QCOMPARE(player.state(), QMediaPlayer::StoppedState);
QTest::qWait(250); // wait a bit to ensure the frame is not rendered 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 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(); 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.width(), 160);
QCOMPARE(frame.height(), 120); QCOMPARE(frame.height(), 120);
@@ -657,14 +659,16 @@ void tst_QMediaPlayerBackend::seekPauseSeek()
} }
positionSpy.clear(); positionSpy.clear();
player.setPosition((qint64)12000); position = 12000;
QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - (qint64)12000) < (qint64)500); player.setPosition(position);
QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - position) < (qint64)500);
QCOMPARE(player.state(), QMediaPlayer::PausedState); QCOMPARE(player.state(), QMediaPlayer::PausedState);
QCOMPARE(surface->m_frameList.size(), 2); QCOMPARE(surface->m_frameList.size(), 2);
{ {
QVideoFrame frame = surface->m_frameList.back(); 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.width(), 160);
QCOMPARE(frame.height(), 120); QCOMPARE(frame.height(), 120);