diff -r 612c4815aebe -r 4cc1412daed0 mpviewplugins/mpdetailsviewplugin/tsrc/unittest_mpdetailsview/src/unittest_mpdetailsview.cpp --- a/mpviewplugins/mpdetailsviewplugin/tsrc/unittest_mpdetailsview/src/unittest_mpdetailsview.cpp Fri Jul 23 17:31:12 2010 -0500 +++ b/mpviewplugins/mpdetailsviewplugin/tsrc/unittest_mpdetailsview/src/unittest_mpdetailsview.cpp Fri Aug 06 16:51:36 2010 -0500 @@ -134,9 +134,6 @@ { mTest->activateView(); QCOMPARE( mTest->mActivated, true ); - - QCOMPARE( mTest->mInspireMeOpen, MpSettingsManager::inspireMe() ); - QCOMPARE( mTest->mSongDetailsGbOpen, MpSettingsManager::songDetailsGb() ); } void TestMpDetailsView::testdeactivateView() @@ -164,77 +161,6 @@ QVERIFY( mTest->mAlbumArt->icon().isNull() == false ); } -void TestMpDetailsView::testHandleNetworkError() -{ - mTest->handleNetworkError(); - QVERIFY( mTest->mInspireMeQueryOngoing == false ); - QVERIFY( mTest->mInspireMeQueryRendered == false ); -} - -void TestMpDetailsView::testCanQueryRecommendations() -{ - mTest->mSongData = new MpSongData(); - mTest->mSongData->mAlbum = QString( "album" ); - mTest->mSongData->mArtist = QString( "artist" ); - mTest->mInspireMeGroupBox->setCollapsed( true ); - QVERIFY( mTest->canQueryRecommendations() == false ); - - mTest->mSongData->mAlbum = QString( "album" ); - mTest->mSongData->mArtist = QString(); - mTest->mInspireMeGroupBox->setCollapsed( true ); - QVERIFY( mTest->canQueryRecommendations() == false ); - - mTest->mSongData->mAlbum = QString(); - mTest->mSongData->mArtist = QString( "artist" ); - mTest->mInspireMeGroupBox->setCollapsed( true ); - QVERIFY( mTest->canQueryRecommendations() == false ); - - mTest->mSongData->mAlbum = QString(); - mTest->mSongData->mArtist = QString(); - mTest->mInspireMeGroupBox->setCollapsed( true ); - QVERIFY( mTest->canQueryRecommendations() == false ); - - mTest->mSongData->mAlbum = QString( "album" ); - mTest->mSongData->mArtist = QString( "artist" ); - mTest->mInspireMeGroupBox->setCollapsed( false ); - QVERIFY( mTest->canQueryRecommendations() == true ); - - mTest->mSongData->mAlbum = QString( "album" ); - mTest->mSongData->mArtist = QString(); - mTest->mInspireMeGroupBox->setCollapsed( false ); - QVERIFY( mTest->canQueryRecommendations() == true ); - - mTest->mSongData->mAlbum = QString(); - mTest->mSongData->mArtist = QString( "artist" ); - mTest->mInspireMeGroupBox->setCollapsed( false ); - QVERIFY( mTest->canQueryRecommendations() == true ); - - mTest->mSongData->mAlbum = QString(); - mTest->mSongData->mArtist = QString(); - mTest->mInspireMeGroupBox->setCollapsed( false ); - QVERIFY( mTest->canQueryRecommendations() == false ); -} - -void TestMpDetailsView::testCanQuerySharePlayerLink() -{ - mTest->mSongData = new MpSongData(); - mTest->mSongData->mTitle = QString( "title" ); - mTest->mSongData->mArtist = QString( "artist" ); - QVERIFY( mTest->canQuerySharePlayerLink() == true ); - - mTest->mSongData->mTitle = QString(); - mTest->mSongData->mArtist = QString( "artist" ); - QVERIFY( mTest->canQuerySharePlayerLink() == false ); - - mTest->mSongData->mTitle = QString( "title" ); - mTest->mSongData->mArtist = QString(); - QVERIFY( mTest->canQuerySharePlayerLink() == false ); - - mTest->mSongData->mTitle = QString(); - mTest->mSongData->mArtist = QString(); - QVERIFY( mTest->canQuerySharePlayerLink() == false ); -} - void TestMpDetailsView::testHandlePlaybackInfoChanged() { mTest->mSongData = new MpSongData(); @@ -257,12 +183,6 @@ QCOMPARE( mTest->mArtistText->plainText(), QString( "txt_mus_other_unknown6" ) ); } -void TestMpDetailsView::testClearInspireMe() -{ - mTest->clearInspireMe(); - QVERIFY( mTest->mInspireList->count() == 0 ); -} - void TestMpDetailsView::testHandleDetailsGroupBoxToggled() { mTest->handleDetailsGroupBoxToggled( false );