diff options
author | Lev Zelenskiy <lev.zelenskiy@nokia.com> | 2012-03-05 12:25:50 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 05:29:56 +0100 |
commit | 87de0979e5ac91c7489c34b254de502d071bb72f (patch) | |
tree | eed477b964f33d34c9e091afa8e42a1cac82bcaa /tests/auto/unit/qmediacontent/tst_qmediacontent.cpp | |
parent | e2eaa283fb0494284304c12285c0d3c10086dfe6 (diff) | |
download | qtmultimedia-87de0979e5ac91c7489c34b254de502d071bb72f.tar.gz |
Added playlist property to QMediaContent
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>
Diffstat (limited to 'tests/auto/unit/qmediacontent/tst_qmediacontent.cpp')
-rw-r--r-- | tests/auto/unit/qmediacontent/tst_qmediacontent.cpp | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp index 12ecf835a..f4260cc57 100644 --- a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp +++ b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp @@ -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" |