diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-20 10:14:55 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-26 08:17:03 +0200 |
| commit | 9692ef52743dc0701555a8a48c34c8761726280f (patch) | |
| tree | f417c607da7a2ca8859c860b56e97df7c691f9a6 /tests | |
| parent | 649b10751ec752725ca7c1d4ca9979fcf9a233c1 (diff) | |
| download | qtlocation-9692ef52743dc0701555a8a48c34c8761726280f.tar.gz | |
Add MediaModel element.
Use a data model for fetching and handling place media.
Change-Id: I4f2951584a912af57723bef4313f56122c9087cf
Reviewed-on: http://codereview.qt.nokia.com/2013
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgeoplace/tst_qgeoplace.cpp | 9 | ||||
| -rw-r--r-- | tests/auto/qplacemediaobject/tst_qplacemediaobject.cpp | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/tests/auto/qgeoplace/tst_qgeoplace.cpp b/tests/auto/qgeoplace/tst_qgeoplace.cpp index a29c5c2c..3b4e2007 100644 --- a/tests/auto/qgeoplace/tst_qgeoplace.cpp +++ b/tests/auto/qgeoplace/tst_qgeoplace.cpp @@ -165,20 +165,23 @@ void tst_QGeoPlace::detailsFetchedTest() void tst_QGeoPlace::mediaTest() { + QUrl thumbnailUrl("testId"); + QUrl mediaUrl("testName2"); + QGeoPlace testObj; QVERIFY2(testObj.media().items() == 0, "Wrong default value"); QPlaceMediaObject sup; - sup.setThumbnailUrl("testId"); + sup.setThumbnailUrl(thumbnailUrl); QList<QPlaceMediaObject> list; list.append(sup); - sup.setUrl("testName2"); + sup.setUrl(mediaUrl); list.append(sup); QPlacePaginationList<QPlaceMediaObject> mediaList; mediaList.setStart(20); mediaList.setData(list); testObj.setMedia(mediaList); QVERIFY2(testObj.media().items() == 2, "Wrong value returned"); - QVERIFY2(testObj.media().data()[1].url() == "testName2", "Wrong value returned"); + QVERIFY2(testObj.media().data().at(1).url() == mediaUrl, "Wrong value returned"); QVERIFY2(testObj.media().stop() == 21, "Wrong value returned"); } diff --git a/tests/auto/qplacemediaobject/tst_qplacemediaobject.cpp b/tests/auto/qplacemediaobject/tst_qplacemediaobject.cpp index 996c288a..d0e392dd 100644 --- a/tests/auto/qplacemediaobject/tst_qplacemediaobject.cpp +++ b/tests/auto/qplacemediaobject/tst_qplacemediaobject.cpp @@ -50,18 +50,22 @@ void tst_QPlaceMediaObject::supplierTest() void tst_QPlaceMediaObject::urlTest() { + QUrl mediaUrl("testText"); + QPlaceMediaObject testObj; QVERIFY2(testObj.url() == QString(), "Wrong default value"); - testObj.setUrl("testText"); - QVERIFY2(testObj.url() == "testText", "Wrong value returned"); + testObj.setUrl(mediaUrl); + QVERIFY2(testObj.url() == mediaUrl, "Wrong value returned"); } void tst_QPlaceMediaObject::thumbnailUrlTest() { + QUrl thumbnailUrl("testText"); + QPlaceMediaObject testObj; QVERIFY2(testObj.thumbnailUrl() == QString(), "Wrong default value"); - testObj.setThumbnailUrl("testText"); - QVERIFY2(testObj.thumbnailUrl() == "testText", "Wrong value returned"); + testObj.setThumbnailUrl(thumbnailUrl); + QVERIFY2(testObj.thumbnailUrl() == thumbnailUrl, "Wrong value returned"); } void tst_QPlaceMediaObject::idTest() |