diff options
| author | Kalle Juhani Lehtonen <kalle.ju.lehtonen@nokia.com> | 2012-03-09 13:18:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 05:53:03 +0100 |
| commit | d6cc6e393f69892fffaa47861bcb4e8e638eef9b (patch) | |
| tree | ec1838bb878b72c769160be750d656d9006e0fbc /tests/auto | |
| parent | 87de0979e5ac91c7489c34b254de502d071bb72f (diff) | |
Update Qt Multimedia tests to use TESTDATA
Qt5 brought support for general for test data install and find. This
change replaces old Qt4 time deployment supported in WinCE and Symbian
with the new general solution using TESTDATA in .pro files and
QFINDTESTDATA in source code.
Change-Id: I5dbe3ca22e2259f249ebb4df570ea91f17d23526
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/unit/qmediaplaylist/qmediaplaylist.pro | 2 | ||||
| -rw-r--r-- | tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp | 16 | ||||
| -rw-r--r-- | tests/auto/unit/qwavedecoder/qwavedecoder.pro | 5 |
3 files changed, 14 insertions, 9 deletions
diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro index c6b28a7cf..ba51c6501 100644 --- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -16,3 +16,5 @@ SOURCES += \ $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.cpp INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u + +TESTDATA += testdata/* diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index 4d00560e8..018db83f3 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -411,23 +411,29 @@ void tst_QMediaPlaylist::loadM3uFile() { QMediaPlaylist playlist; - playlist.load(QUrl::fromLocalFile(QLatin1String(TESTDATA_DIR "testdata/missing_file.m3u"))); + // Try to load playlist that does not exist in the testdata folder + QString testFileName = QFINDTESTDATA("testdata"); + playlist.load(QUrl::fromLocalFile(testFileName + "/missing_file.m3u")); QVERIFY(playlist.error() != QMediaPlaylist::NoError); - playlist.load(QUrl::fromLocalFile(QLatin1String(TESTDATA_DIR "testdata/test.m3u"))); + testFileName = QFINDTESTDATA("testdata/test.m3u"); + playlist.load(QUrl::fromLocalFile(testFileName)); 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"); QCOMPARE(playlist.media(2).canonicalUrl(), - QUrl(QLatin1String("file://" TESTDATA_DIR "testdata/testfile"))); + QUrl(QString("file://") + testFileName)); + testFileName = QFINDTESTDATA("testdata"); QCOMPARE(playlist.media(3).canonicalUrl(), - QUrl(QLatin1String("file://" TESTDATA_DIR "testdata/testdir/testfile"))); + QUrl(QString("file://") + testFileName + "/testdir/testfile")); 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 - QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(TESTDATA_DIR "testdata/testfile2#suffix")); + testFileName = QFINDTESTDATA("testdata/testfile2#suffix"); + QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName)); } void tst_QMediaPlaylist::playbackMode_data() diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro index 172a6de54..ce9762b76 100644 --- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro +++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro @@ -6,7 +6,4 @@ SOURCES += tst_qwavedecoder.cpp \ QT += multimedia-private testlib network CONFIG += no_private_qt_headers_warning testcase -data.files = data/* -data.path = data -DEPLOYMENT += data - +TESTDATA += data/* |