Fix qmediaplayerbackend tests

Some tests were failing on Windows due to timing issues that were not
being considered by the tests themselves.

Change-Id: I89dfbbe901a043f7e4ed543a754e8ccd9f6e4b86
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 83c25233565418ab3cb30036d18499a66b2d61f1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 6 insertions, 5 deletions

diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 263904028..cce89fc2e 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -418,8 +418,11 @@ void tst_QMediaPlayerBackend::playPauseStop()
     QCOMPARE(stateSpy.count(), 0);
 
     player.play();
+    QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::BufferedMedia);
 
-    QTRY_VERIFY(player.position() > 100);
+    QTRY_VERIFY(positionSpy.count() > 0 && positionSpy.last()[0].value<qint64>() > 100);
+    QVERIFY(player.position() > 100);
+    positionSpy.clear();
 
     player.setSource(localWavFile);
 
@@ -429,9 +432,8 @@ void tst_QMediaPlayerBackend::playPauseStop()
     QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState);
     QTRY_VERIFY(stateSpy.count() > 0);
     QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::StoppedState);
-    QTRY_VERIFY(positionSpy.count() > 0);
+    QTRY_VERIFY(positionSpy.count() > 0 && positionSpy.last()[0].value<qint64>() == 0);
     QCOMPARE(player.position(), 0);
-    QCOMPARE(positionSpy.last()[0].value<qint64>(), 0);
 
     stateSpy.clear();
     statusSpy.clear();
@@ -509,8 +511,7 @@ void tst_QMediaPlayerBackend::processEOS()
 
     positionSpy.clear();
     QTRY_VERIFY(player.position() > 100);
-    QTRY_VERIFY(positionSpy.count() > 0);
-    QVERIFY(positionSpy.last()[0].value<qint64>() > 100);
+    QTRY_VERIFY(positionSpy.count() > 0 && positionSpy.last()[0].value<qint64>() > 100);
     player.setPosition(900);
     //wait up to 5 seconds for EOS
     QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::EndOfMedia);