From 34200418832bb608c97d0e63cf59d13204b76665 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Sat, 17 Sep 2016 14:45:11 +0200 Subject: Blacklist testSetSourceWhileLoading on all Linux distros (cherry picked from ccb985990880717f29fdec16f119b0c02b93d643) Change-Id: I94d970cb51202d35d894503b1fa5c342b8e8ae44 Reviewed-by: Christian Stromme --- tests/auto/integration/qsoundeffect/BLACKLIST | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST index abf85ae93..8edfcd8e9 100644 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ b/tests/auto/integration/qsoundeffect/BLACKLIST @@ -1,3 +1,6 @@ #QTBUG-55735 [testSetSourceWhilePlaying] linux + +[testSetSourceWhileLoading] +linux -- cgit v1.2.3 From 5415e94d8a7bcfb71d74e7c8d1183e54d410609e Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 18 Oct 2016 11:31:51 +0300 Subject: Increase margin of error in tst_QMediaObject::notifySignals() From 30% to 50%. Change-Id: I4a7720ebb9e1a5cdfb58b6cf92b6de2bebf56aed Reviewed-by: Christian Stromme --- tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index e79d9b586..f4377f96e 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -304,7 +304,7 @@ void tst_QMediaObject::notifySignals() QTRY_COMPARE(spy.count(), count); qint64 elapsed = timer.elapsed(); - int expectedElapsed = count * interval * 1.3; // give it some margin of error + int expectedElapsed = count * interval * 1.5; // give it some margin of error QVERIFY2(elapsed < expectedElapsed, QString("elapsed: %1, expected: %2").arg(elapsed).arg(expectedElapsed).toLocal8Bit().constData()); } -- cgit v1.2.3 From 596480a0e59b9598fb3dd2bd2576b74ddfe1c32d Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Wed, 5 Oct 2016 22:01:24 +0300 Subject: Blacklist all media player integration tests on OpenSuse The media player plugin is not built at the moment on that platform. Change-Id: I47c6c0291853e997bd70d0c7be9942dfd00ee4af Reviewed-by: Milla Pohjanheimo Reviewed-by: Yoann Lopes --- tests/auto/integration/qmediaplayerbackend/BLACKLIST | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index b55c167ac..431a98bdc 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -7,44 +7,31 @@ osx-10.11 windows 32bit developer-build windows 64bit developer-build -[construction] +# Media player plugin not built at the moment on this platform opensuse-13.1 64bit [loadMedia] -opensuse-13.1 64bit windows 64bit developer-build [unloadMedia] -opensuse-13.1 64bit windows 64bit developer-build [playPauseStop] -opensuse-13.1 64bit redhatenterpriselinuxworkstation-6.6 rhel-7.1 ubuntu-14.04 64bit windows 64bit developer-build [processEOS] -opensuse-13.1 64bit windows 64bit developer-build [deleteLaterAtEOS] -opensuse-13.1 64bit windows 64bit developer-build -[volumeAndMuted] -opensuse-13.1 64bit - -[volumeAcrossFiles] -opensuse-13.1 64bit - [initialVolume] -opensuse-13.1 64bit windows 64bit developer-build [playlist] -opensuse-13.1 64bit redhatenterpriselinuxworkstation-6.6 [seekPauseSeek] -- cgit v1.2.3 From ea9326a162c7c3b450fce8ed78ed296f0c6de9b8 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 25 Jul 2016 14:55:35 +0200 Subject: Improve playlist tests in tst_QMediaPlayerBackend Check media status changes when playing a playlist. Add a new test that checks constructed QMediaPlaylists. Task-number: QTBUG-49578 Change-Id: Ifbb7ee45b9633b684bd6a6fc653f96f391af130a Reviewed-by: Christian Stromme --- .../tst_qmediaplayerbackend.cpp | 156 ++++++++++++++++++++- 1 file changed, 154 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index 81fa3dd21..256f9fafe 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -76,6 +76,7 @@ private slots: void subsequentPlayback(); void probes(); void playlist(); + void playlistObject(); void surfaceTest_data(); void surfaceTest(); void metadata(); @@ -994,6 +995,7 @@ void tst_QMediaPlayerBackend::playlist() QSignalSpy mediaSpy(&player, SIGNAL(mediaChanged(QMediaContent))); QSignalSpy currentMediaSpy(&player, SIGNAL(currentMediaChanged(QMediaContent))); QSignalSpy stateSpy(&player, SIGNAL(stateChanged(QMediaPlayer::State))); + QSignalSpy mediaStatusSpy(&player, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus))); QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error))); QFileInfo fileInfo(QFINDTESTDATA("testdata/sample.m3u")); @@ -1002,8 +1004,8 @@ void tst_QMediaPlayerBackend::playlist() player.play(); QTRY_COMPARE_WITH_TIMEOUT(player.state(), QMediaPlayer::StoppedState, 10000); - if (player.mediaStatus() == QMediaPlayer::InvalidMedia) - QSKIP("Media player does not support M3U playlists"); + if (player.mediaStatus() == QMediaPlayer::InvalidMedia || mediaSpy.count() == 1) + QSKIP("QMediaPlayer does not support loading M3U playlists as QMediaPlaylist"); QCOMPARE(mediaSpy.count(), 2); // sample.m3u -> sample.m3u resolved -> test.wav -> @@ -1016,10 +1018,12 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(currentMediaSpy.count(), 11); QCOMPARE(stateSpy.count(), 2); QCOMPARE(errorSpy.count(), 0); + QCOMPARE(mediaStatusSpy.count(), 19); // 6 x (LoadingMedia -> BufferedMedia -> EndOfMedia) + NoMedia mediaSpy.clear(); currentMediaSpy.clear(); stateSpy.clear(); + mediaStatusSpy.clear(); errorSpy.clear(); player.play(); @@ -1028,10 +1032,12 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(currentMediaSpy.count(), 8); QCOMPARE(stateSpy.count(), 2); QCOMPARE(errorSpy.count(), 0); + QCOMPARE(mediaStatusSpy.count(), 19); // 6 x (LoadingMedia -> BufferedMedia -> EndOfMedia) + NoMedia mediaSpy.clear(); currentMediaSpy.clear(); stateSpy.clear(); + mediaStatusSpy.clear(); errorSpy.clear(); // <<< Invalid - 1st pass >>> @@ -1046,10 +1052,12 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(currentMediaSpy.count(), 4); QCOMPARE(stateSpy.count(), 2); QCOMPARE(errorSpy.count(), 1); + QCOMPARE(mediaStatusSpy.count(), 3); // LoadingMedia -> InvalidMedia -> NoMedia mediaSpy.clear(); currentMediaSpy.clear(); stateSpy.clear(); + mediaStatusSpy.clear(); errorSpy.clear(); // <<< Invalid - 2nd pass >>> @@ -1061,10 +1069,12 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(currentMediaSpy.count(), 3); QCOMPARE(stateSpy.count(), 2); QCOMPARE(errorSpy.count(), 1); + QCOMPARE(mediaStatusSpy.count(), 3); // LoadingMedia -> InvalidMedia -> NoMedia mediaSpy.clear(); currentMediaSpy.clear(); stateSpy.clear(); + mediaStatusSpy.clear(); errorSpy.clear(); // <<< Invalid2 - 1st pass >>> @@ -1079,10 +1089,12 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(currentMediaSpy.count(), 6); QCOMPARE(stateSpy.count(), 2); QCOMPARE(errorSpy.count(), 1); + QCOMPARE(mediaStatusSpy.count(), 9); // 3 x LoadingMedia + 2 x (BufferedMedia -> EndOfMedia) + InvalidMedia + NoMedia (not in this order) mediaSpy.clear(); currentMediaSpy.clear(); stateSpy.clear(); + mediaStatusSpy.clear(); errorSpy.clear(); // <<< Invalid2 - 2nd pass >>> @@ -1094,10 +1106,12 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(currentMediaSpy.count(), 5); QCOMPARE(stateSpy.count(), 2); QCOMPARE(errorSpy.count(), 1); + QCOMPARE(mediaStatusSpy.count(), 9); // 3 x LoadingMedia + 2 x (BufferedMedia -> EndOfMedia) + InvalidMedia + NoMedia (not in this order) mediaSpy.clear(); currentMediaSpy.clear(); stateSpy.clear(); + mediaStatusSpy.clear(); errorSpy.clear(); // <<< Recursive - 1st pass >>> @@ -1116,10 +1130,13 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(stateSpy.count(), 2); // there is one invalid media in the master playlist QCOMPARE(errorSpy.count(), 1); + QCOMPARE(mediaStatusSpy.count(), 6); // LoadingMedia -> InvalidMedia -> LoadingMedia -> BufferedMedia + // -> EndOfMedia -> NoMedia mediaSpy.clear(); currentMediaSpy.clear(); stateSpy.clear(); + mediaStatusSpy.clear(); errorSpy.clear(); // <<< Recursive - 2nd pass >>> @@ -1134,6 +1151,141 @@ void tst_QMediaPlayerBackend::playlist() QCOMPARE(stateSpy.count(), 2); // there is one invalid media in the master playlist QCOMPARE(errorSpy.count(), 1); + QCOMPARE(mediaStatusSpy.count(), 6); // LoadingMedia -> InvalidMedia -> LoadingMedia -> BufferedMedia + // -> EndOfMedia -> NoMedia +} + +void tst_QMediaPlayerBackend::playlistObject() +{ + QMediaPlayer player; + + QSignalSpy mediaSpy(&player, SIGNAL(mediaChanged(QMediaContent))); + QSignalSpy currentMediaSpy(&player, SIGNAL(currentMediaChanged(QMediaContent))); + QSignalSpy stateSpy(&player, SIGNAL(stateChanged(QMediaPlayer::State))); + QSignalSpy mediaStatusSpy(&player, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus))); + QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error))); + + // --- empty playlist + QMediaPlaylist emptyPlaylist; + player.setPlaylist(&emptyPlaylist); + + player.play(); + QTRY_COMPARE_WITH_TIMEOUT(player.state(), QMediaPlayer::StoppedState, 10000); + + QCOMPARE(mediaSpy.count(), 1); + QCOMPARE(currentMediaSpy.count(), 1); // Empty media + QCOMPARE(stateSpy.count(), 0); + QCOMPARE(errorSpy.count(), 0); + QCOMPARE(mediaStatusSpy.count(), 0); + + mediaSpy.clear(); + currentMediaSpy.clear(); + stateSpy.clear(); + mediaStatusSpy.clear(); + errorSpy.clear(); + + // --- Valid playlist + QMediaPlaylist playlist; + playlist.addMedia(QUrl::fromLocalFile(QFileInfo(QFINDTESTDATA("testdata/test.wav")).absoluteFilePath())); + playlist.addMedia(QUrl::fromLocalFile(QFileInfo(QFINDTESTDATA("testdata/_test.wav")).absoluteFilePath())); + player.setPlaylist(&playlist); + + player.play(); + QTRY_COMPARE_WITH_TIMEOUT(player.state(), QMediaPlayer::StoppedState, 10000); + + QCOMPARE(mediaSpy.count(), 1); + QCOMPARE(currentMediaSpy.count(), 3); // test.wav -> _test.wav -> NoMedia + QCOMPARE(stateSpy.count(), 2); + QCOMPARE(errorSpy.count(), 0); + QCOMPARE(mediaStatusSpy.count(), 7); // 2 x (LoadingMedia -> BufferedMedia -> EndOfMedia) + NoMedia + + mediaSpy.clear(); + currentMediaSpy.clear(); + stateSpy.clear(); + mediaStatusSpy.clear(); + errorSpy.clear(); + + player.play(); + QTRY_COMPARE_WITH_TIMEOUT(player.state(), QMediaPlayer::StoppedState, 10000); + + QCOMPARE(mediaSpy.count(), 0); + QCOMPARE(currentMediaSpy.count(), 4); // playlist -> test.wav -> _test.wav -> NoMedia + QCOMPARE(stateSpy.count(), 2); + QCOMPARE(errorSpy.count(), 0); + QCOMPARE(mediaStatusSpy.count(), 7); // 2 x (LoadingMedia -> BufferedMedia -> EndOfMedia) + NoMedia + + player.setPlaylist(Q_NULLPTR); + + mediaSpy.clear(); + currentMediaSpy.clear(); + stateSpy.clear(); + mediaStatusSpy.clear(); + errorSpy.clear(); + + // --- Nested playlist + QMediaPlaylist nestedPlaylist; + nestedPlaylist.addMedia(QUrl::fromLocalFile(QFileInfo(QFINDTESTDATA("testdata/_test.wav")).absoluteFilePath())); + nestedPlaylist.addMedia(QUrl::fromLocalFile(QFileInfo(QFINDTESTDATA("testdata/test.wav")).absoluteFilePath())); + nestedPlaylist.addMedia(&playlist); + player.setPlaylist(&nestedPlaylist); + + player.play(); + QTRY_COMPARE_WITH_TIMEOUT(player.state(), QMediaPlayer::StoppedState, 10000); + + QCOMPARE(mediaSpy.count(), 1); + QCOMPARE(currentMediaSpy.count(), 6); // _test.wav -> test.wav -> nested playlist + // -> test.wav -> _test.wav -> NoMedia + QCOMPARE(stateSpy.count(), 2); + QCOMPARE(errorSpy.count(), 0); + QCOMPARE(mediaStatusSpy.count(), 13); // 4 x (LoadingMedia -> BufferedMedia -> EndOfMedia) + NoMedia + + player.setPlaylist(Q_NULLPTR); + + mediaSpy.clear(); + currentMediaSpy.clear(); + stateSpy.clear(); + mediaStatusSpy.clear(); + errorSpy.clear(); + + // --- playlist with invalid media + QMediaPlaylist invalidPlaylist; + invalidPlaylist.addMedia(QUrl("invalid")); + invalidPlaylist.addMedia(QUrl::fromLocalFile(QFileInfo(QFINDTESTDATA("testdata/test.wav")).absoluteFilePath())); + + player.setPlaylist(&invalidPlaylist); + + player.play(); + QTRY_COMPARE_WITH_TIMEOUT(player.state(), QMediaPlayer::StoppedState, 10000); + + QCOMPARE(mediaSpy.count(), 1); + QCOMPARE(currentMediaSpy.count(), 3); // invalid -> test.wav -> NoMedia + QCOMPARE(stateSpy.count(), 2); + QCOMPARE(errorSpy.count(), 1); + QCOMPARE(mediaStatusSpy.count(), 6); // Loading -> Invalid -> Loading -> Buffered -> EndOfMedia -> NoMedia + + player.setPlaylist(Q_NULLPTR); + + mediaSpy.clear(); + currentMediaSpy.clear(); + stateSpy.clear(); + mediaStatusSpy.clear(); + errorSpy.clear(); + + // --- playlist with only invalid media + QMediaPlaylist invalidPlaylist2; + invalidPlaylist2.addMedia(QUrl("invalid")); + invalidPlaylist2.addMedia(QUrl("invalid2")); + + player.setPlaylist(&invalidPlaylist2); + + player.play(); + QTRY_COMPARE_WITH_TIMEOUT(player.state(), QMediaPlayer::StoppedState, 10000); + + QCOMPARE(mediaSpy.count(), 1); + QCOMPARE(currentMediaSpy.count(), 3); // invalid -> invalid2 -> NoMedia + QCOMPARE(stateSpy.count(), 2); + QCOMPARE(errorSpy.count(), 2); + QCOMPARE(mediaStatusSpy.count(), 5); // Loading -> Invalid -> Loading -> Invalid -> NoMedia } void tst_QMediaPlayerBackend::surfaceTest_data() -- cgit v1.2.3 From 4e5eb169891fb52abe5683cb2d50f3ef280f1695 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Fri, 28 Oct 2016 16:49:53 +0300 Subject: Blacklist tst_QAudioDecoderBackend on Windows There are several issues in the WMF audio decoder implementation. Blacklist the test on the CI for now. Task-number: QTBUG-56796 Change-Id: I9284845e5f8caab8b11c86c086c7118125e4f043 Reviewed-by: Christian Stromme --- tests/auto/integration/qaudiodecoderbackend/BLACKLIST | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tests/auto/integration/qaudiodecoderbackend/BLACKLIST (limited to 'tests') diff --git a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST new file mode 100644 index 000000000..316c5a083 --- /dev/null +++ b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST @@ -0,0 +1,2 @@ +# QTBUG-56796 +windows -- cgit v1.2.3