diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
index 2b89ef17d2e84dd29c7369e6040bd601b3d95268..baf6474e5495f0cbbe1a5d550f2561fd19ff1c8b 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
@@ -82,8 +82,6 @@ void QMediaNetworkPlaylistProviderPrivate::_q_handleParserError(QPlaylistFilePar
break;
}
- parser.stop();
-
emit q->loadFailed(playlistError, errorMessage);
}
diff --git a/tests/auto/unit/qmediaplaylist/testdata/test.pls b/tests/auto/unit/qmediaplaylist/testdata/test.pls
deleted file mode 100644
index 42a14f39574d51314c49bd75096370eecfc4b264..0000000000000000000000000000000000000000
--- a/tests/auto/unit/qmediaplaylist/testdata/test.pls
+++ /dev/null
@@ -1,27 +0,0 @@
-[playlist]
-
-File1=http://test.host/path
-Title1=First
-Length1=-1
-File2= http://test.host/path
-Title2=Second
-Length2=-1
-File3=testfile
-Title3=Third
-Length3=-1
-
-
-
-File4=testdir/testfile
-Title4=Fourth
-Length4=-1
-File5=/testdir/testfile
-Title5=Fifth
-Length5=-1
-File6=file://path/name#suffix
-Title6=Sixth
-Length6=-1
-File7=testfile2#suffix
-Title7=Seventh
-Length7=-1
-NumberOfEntries=7
diff --git a/tests/auto/unit/qmediaplaylist/testdata/totem-pl-example.pls b/tests/auto/unit/qmediaplaylist/testdata/totem-pl-example.pls
deleted file mode 100644
index 385fe2a30eff8ac061a57e9c97ee97788c79a74c..0000000000000000000000000000000000000000
--- a/tests/auto/unit/qmediaplaylist/testdata/totem-pl-example.pls
+++ /dev/null
@@ -1,5 +0,0 @@
-[playlist]
-X-GNOME-Title=totem-pl-file-example
-NumberOfEntries=1
-File1=http://test.host/path
-Title1=Silence
diff --git a/tests/auto/unit/qmediaplaylist/testdata/trash.pls b/tests/auto/unit/qmediaplaylist/testdata/trash.pls
deleted file mode 100644
index 639c22b0c2b9eeb7839697b5f867200132163149..0000000000000000000000000000000000000000
--- a/tests/auto/unit/qmediaplaylist/testdata/trash.pls
+++ /dev/null
@@ -1,2 +0,0 @@
-[playlist]
-NumberOfEntries=100
diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
index a1250e59e7d5c492ce92b752bfc92bac14e53f89..08d63c858fbb95e639d87d0562e25a788d617838 100644
--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
+++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
@@ -78,7 +78,6 @@ private slots:
void currentItem();
void saveAndLoad();
void loadM3uFile();
- void loadPLSFile();
void playbackMode();
void playbackMode_data();
void shuffle();
@@ -349,10 +348,8 @@ void tst_QMediaPlaylist::saveAndLoad()
QVERIFY(playlist.error() == QMediaPlaylist::FormatNotSupportedError);
QVERIFY(!playlist.errorString().isEmpty());
- QSignalSpy loadedSignal(&playlist, SIGNAL(loaded()));
QSignalSpy errorSignal(&playlist, SIGNAL(loadFailed()));
playlist.load(&buffer, "unsupported_format");
- QTRY_VERIFY(loadedSignal.isEmpty());
QCOMPARE(errorSignal.size(), 1);
QVERIFY(playlist.error() != QMediaPlaylist::NoError);
QVERIFY(!playlist.errorString().isEmpty());
@@ -362,10 +359,8 @@ void tst_QMediaPlaylist::saveAndLoad()
QVERIFY(playlist.error() != QMediaPlaylist::NoError);
QVERIFY(!playlist.errorString().isEmpty());
- loadedSignal.clear();
errorSignal.clear();
playlist.load(QUrl::fromLocalFile(QLatin1String("tmp.unsupported_format")), "unsupported_format");
- QTRY_VERIFY(loadedSignal.isEmpty());
QCOMPARE(errorSignal.size(), 1);
QVERIFY(playlist.error() == QMediaPlaylist::FormatNotSupportedError);
QVERIFY(!playlist.errorString().isEmpty());
@@ -377,11 +372,7 @@ void tst_QMediaPlaylist::saveAndLoad()
buffer.seek(0);
QMediaPlaylist playlist2;
- QSignalSpy loadedSignal2(&playlist2, SIGNAL(loaded()));
- QSignalSpy errorSignal2(&playlist2, SIGNAL(loadFailed()));
playlist2.load(&buffer, "m3u");
- QCOMPARE(loadedSignal2.size(), 1);
- QTRY_VERIFY(errorSignal2.isEmpty());
QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
QCOMPARE(playlist.mediaCount(), playlist2.mediaCount());
@@ -391,13 +382,9 @@ void tst_QMediaPlaylist::saveAndLoad()
res = playlist.save(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u");
QVERIFY(res);
- loadedSignal2.clear();
- errorSignal2.clear();
playlist2.clear();
QVERIFY(playlist2.isEmpty());
playlist2.load(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u");
- QCOMPARE(loadedSignal2.size(), 1);
- QTRY_VERIFY(errorSignal2.isEmpty());
QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
QCOMPARE(playlist.mediaCount(), playlist2.mediaCount());
@@ -411,20 +398,12 @@ void tst_QMediaPlaylist::loadM3uFile()
QMediaPlaylist playlist;
// Try to load playlist that does not exist in the testdata folder
- QSignalSpy loadSpy(&playlist, SIGNAL(loaded()));
- QSignalSpy loadFailedSpy(&playlist, SIGNAL(loadFailed()));
QString testFileName = QFINDTESTDATA("testdata");
playlist.load(QUrl::fromLocalFile(testFileName + "/missing_file.m3u"));
- QTRY_VERIFY(loadSpy.isEmpty());
- QVERIFY(!loadFailedSpy.isEmpty());
QVERIFY(playlist.error() != QMediaPlaylist::NoError);
- loadSpy.clear();
- loadFailedSpy.clear();
testFileName = QFINDTESTDATA("testdata/test.m3u");
playlist.load(QUrl::fromLocalFile(testFileName));
- QTRY_VERIFY(!loadSpy.isEmpty());
- QVERIFY(loadFailedSpy.isEmpty());
QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
QCOMPARE(playlist.mediaCount(), 7);
@@ -441,79 +420,10 @@ void tst_QMediaPlaylist::loadM3uFile()
//ensure #2 suffix is not stripped from path
testFileName = QFINDTESTDATA("testdata/testfile2#suffix");
QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName));
-
// check ability to load from QNetworkRequest
- loadSpy.clear();
- loadFailedSpy.clear();
- playlist.load(QNetworkRequest(QUrl::fromLocalFile(QFINDTESTDATA("testdata/test.m3u"))));
- QTRY_VERIFY(!loadSpy.isEmpty());
- QVERIFY(loadFailedSpy.isEmpty());
-}
-
-void tst_QMediaPlaylist::loadPLSFile()
-{
- QMediaPlaylist playlist;
-
- // Try to load playlist that does not exist in the testdata folder
QSignalSpy loadSpy(&playlist, SIGNAL(loaded()));
QSignalSpy loadFailedSpy(&playlist, SIGNAL(loadFailed()));
- QString testFileName = QFINDTESTDATA("testdata");
- playlist.load(QUrl::fromLocalFile(testFileName + "/missing_file.pls"));
- QTRY_VERIFY(loadSpy.isEmpty());
- QVERIFY(!loadFailedSpy.isEmpty());
- QVERIFY(playlist.error() != QMediaPlaylist::NoError);
-
- // Try to load bogus playlist
- loadSpy.clear();
- loadFailedSpy.clear();
- testFileName = QFINDTESTDATA("testdata/trash.pls");
- playlist.load(QUrl::fromLocalFile(testFileName));
- QTRY_VERIFY(loadSpy.isEmpty());
- QVERIFY(!loadFailedSpy.isEmpty());
- QVERIFY(playlist.error() == QMediaPlaylist::FormatError);
-
- // Try to load regular playlist
- loadSpy.clear();
- loadFailedSpy.clear();
- testFileName = QFINDTESTDATA("testdata/test.pls");
- playlist.load(QUrl::fromLocalFile(testFileName));
- QTRY_VERIFY(!loadSpy.isEmpty());
- QVERIFY(loadFailedSpy.isEmpty());
- QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
- QCOMPARE(playlist.mediaCount(), 7);
-
- QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path")));
- QCOMPARE(playlist.media(1).canonicalUrl(), QUrl(QLatin1String("http://test.host/path")));
- testFileName = QFINDTESTDATA("testdata/testfile");
- QEXPECT_FAIL("", "See QTBUG-40515", Continue);
- QCOMPARE(playlist.media(2).canonicalUrl(),
- QUrl::fromLocalFile(testFileName));
- testFileName = QFINDTESTDATA("testdata");
- QEXPECT_FAIL("", "See QTBUG-40515", Continue);
- QCOMPARE(playlist.media(3).canonicalUrl(),
- QUrl::fromLocalFile(testFileName + "/testdir/testfile"));
- QEXPECT_FAIL("", "See QTBUG-40515", Continue);
- QCOMPARE(playlist.media(4).canonicalUrl(), QUrl(QLatin1String("file:///testdir/testfile")));
- QCOMPARE(playlist.media(5).canonicalUrl(), QUrl(QLatin1String("file://path/name#suffix")));
- //ensure #2 suffix is not stripped from path
- testFileName = QFINDTESTDATA("testdata/testfile2#suffix");
- QEXPECT_FAIL("", "See QTBUG-40515", Continue);
- QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName));
-
- // Try to load a totem-pl generated playlist
- loadSpy.clear();
- loadFailedSpy.clear();
- testFileName = QFINDTESTDATA("testdata/totem-pl-example.pls");
- playlist.load(QUrl::fromLocalFile(testFileName));
- QEXPECT_FAIL("", "See QTBUG-40515", Continue);
- QTRY_VERIFY(!loadSpy.isEmpty());
- QEXPECT_FAIL("", "See QTBUG-40515", Continue);
- QVERIFY(loadFailedSpy.isEmpty());
-
- // check ability to load from QNetworkRequest
- loadSpy.clear();
- loadFailedSpy.clear();
- playlist.load(QNetworkRequest(QUrl::fromLocalFile(QFINDTESTDATA("testdata/test.pls"))));
+ playlist.load(QNetworkRequest(QUrl::fromLocalFile(QFINDTESTDATA("testdata/test.m3u"))));
QTRY_VERIFY(!loadSpy.isEmpty());
QVERIFY(loadFailedSpy.isEmpty());
}