diff -r 79c49924ae23 -r af3740e3753f mpdata/tsrc/unittest_mpplaybackdata/src/unittest_mpplaybackdata.cpp --- a/mpdata/tsrc/unittest_mpplaybackdata/src/unittest_mpplaybackdata.cpp Tue Jul 06 14:13:36 2010 +0300 +++ b/mpdata/tsrc/unittest_mpplaybackdata/src/unittest_mpplaybackdata.cpp Wed Aug 18 09:46:20 2010 +0300 @@ -102,7 +102,6 @@ QCOMPARE(mTest->mThumbnailManager->getInitCounter(), 1); QVERIFY(mTest->mDuration == 0); QVERIFY(mTest->mPosition == 0); - QVERIFY(mTest->mDefaultAlbumArt != 0); } @@ -228,18 +227,6 @@ void TestMpPlaybackData::testSetAlbumArtUri() { QSignalSpy spy(mTest, SIGNAL(albumArtReady())); - //Empty string - mTest->setAlbumArtUri(QString("")); - QCOMPARE(mTest->mAlbumArt, mTest->mDefaultAlbumArt); - QCOMPARE(spy.count(),1); - spy.clear(); - - //Request failed - mTest->mThumbnailManager->mGetThumbFails = true; - mTest->setAlbumArtUri(QString("AlbumArt")); - QCOMPARE(mTest->mAlbumArt, mTest->mDefaultAlbumArt); - QCOMPARE(spy.count(),1); - spy.clear(); //Succesful requests mTest->mThumbnailManager->mGetThumbFails = false; @@ -269,21 +256,6 @@ QSignalSpy spy(mTest, SIGNAL(albumArtReady())); QPixmap albumArt(100,100); HbIcon albumArtIcon; - - //Error - mTest->thumbnailReady(albumArt,temp,KUndefined,KUndefined); - QCOMPARE(mTest->mAlbumArt, mTest->mDefaultAlbumArt); - QCOMPARE(mTest->mReqId, KUndefined); - QCOMPARE(spy.count(),1); - spy.clear(); - - //Wrong id - mTest->mReqId = 1; - mTest->thumbnailReady(albumArt,temp,KUndefined,0); - QCOMPARE(mTest->mAlbumArt, mTest->mDefaultAlbumArt); - QCOMPARE(mTest->mReqId, KUndefined); - QCOMPARE(spy.count(),1); - spy.clear(); //Update album art mTest->mReqId = 1;