diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
| commit | 34d15785600f98faa4a51827b452d6c488e4c10c (patch) | |
| tree | e4dd1b11602f0b13bedd895df254a69fa9187fc0 /tests/auto/integration | |
| parent | 46b10ce610cfa3957ed4be719b9a7f3f1f39dcf0 (diff) | |
| parent | 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5394a9d75850771068d43d2509b14a3ac4efcf83
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index 76b791e21..25430a189 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -308,13 +308,17 @@ void tst_QMediaPlayerBackend::unloadMedia() void tst_QMediaPlayerBackend::loadMediaInLoadingState() { - const QUrl url("http://unavailable.media/"); + if (!isWavSupported()) + QSKIP("Sound format is not supported"); + QMediaPlayer player; - player.setMedia(QMediaContent(url)); + player.setMedia(localWavFile); player.play(); + QCOMPARE(player.mediaStatus(), QMediaPlayer::LoadingMedia); // Sets new media while old has not been finished. - player.setMedia(QMediaContent(url)); - QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::InvalidMedia); + player.setMedia(localWavFile); + QCOMPARE(player.mediaStatus(), QMediaPlayer::LoadingMedia); + QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); } void tst_QMediaPlayerBackend::playPauseStop() |