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

Added playlist property to QMediaContent

Browse Source 
This is a part of changes to QMediaPlayer related to playlist handling.
Updated unit test.

Change-Id: Ic2460dc4d3121788cd5eb08df71e6d45aac032bc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Lev Zelenskiy
2012-03-05 12:25:50 +10:00
committed by Qt by Nokia
parent e2eaa283fb
commit 87de0979e5
3 changed files with 100 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
View File

@@ -43,6 +43,7 @@
#include <QtNetwork/qnetworkrequest.h>
#include <qmediacontent.h>
#include <qmediaplaylist.h>
//TESTED_COMPONENT=src/multimedia
@@ -61,6 +62,7 @@ private slots:
void testAssignment();
void testEquality();
void testResources();
void testPlaylist();
};
void tst_QMediaContent::testNull()
@@ -172,6 +174,42 @@ void tst_QMediaContent::testResources()
QCOMPARE(res[1], QMediaResource(QUrl("http://example.com/movie-big.mov")));
}
void tst_QMediaContent::testPlaylist()
{
QMediaContent media(QUrl("http://example.com/movie.mov"));
QVERIFY(media.canonicalUrl().isValid());
QVERIFY(!media.playlist());
{
QWeakPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
media = QMediaContent(playlist.data(), QUrl("http://example.com/sample.m3u"), true);
QVERIFY(media.canonicalUrl().isValid());
QCOMPARE(media.playlist(), playlist.data());
media = QMediaContent();
// Make sure playlist is destroyed by QMediaContent
QTRY_VERIFY(!playlist);
}
{
QMediaPlaylist *playlist = new QMediaPlaylist;
media = QMediaContent(playlist, QUrl("http://example.com/sample.m3u"), true);
// Delete playlist outside QMediaContent
delete playlist;
QVERIFY(!media.playlist());
media = QMediaContent();
}
{
QWeakPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
media = QMediaContent(playlist.data(), QUrl(), false);
QVERIFY(!media.canonicalUrl().isValid());
QCOMPARE(media.playlist(), playlist.data());
media = QMediaContent();
QVERIFY(playlist);
delete playlist.data();
}
}
QTEST_MAIN(tst_QMediaContent)
#include "tst_qmediacontent.moc"