diff -r 45e72b57a2fd -r e3cecb93e76a videocollection/videofiledetailsview/tsrc/testplugin/src/testvideofiledetails.cpp --- a/videocollection/videofiledetailsview/tsrc/testplugin/src/testvideofiledetails.cpp Tue Jul 06 14:17:50 2010 +0300 +++ b/videocollection/videofiledetailsview/tsrc/testplugin/src/testvideofiledetails.cpp Wed Aug 18 09:50:14 2010 +0300 @@ -31,6 +31,7 @@ #include #include #include +#include #include "videodetailslabel.h" #include "hbmessagebox.h" @@ -83,7 +84,7 @@ // void TestVideoFileDetails::cleanupTestCase() { - disconnect(this, SIGNAL(shortDetailsReady(int)), mDummyModel, SIGNAL(shortDetailsReady(int))); + disconnect(this, SIGNAL(shortDetailsReady(TMPXItemId)), mDummyModel, SIGNAL(shortDetailsReady(TMPXItemId))); disconnect(this, SIGNAL(fullDetailsReady(QVariant&)),mDummyModel, SIGNAL(fullVideoDetailsReady(QVariant&))); disconnect(this, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), mDummyModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&))); @@ -483,24 +484,6 @@ QVERIFY( detail->text().contains(expected) ); } - // for coverity sake, retest without star-rating - variant = QVariant(createDummyMetadata()); - emit fullDetailsReady(variant); - - int ii = 0; - for(int i = 0; iitem(ii); - QVERIFY( detail != 0 ); - QVERIFY( detail->text().contains(expected) ); - } - ++ii; - } - cleanup(); } @@ -548,7 +531,6 @@ // void TestVideoFileDetails::testSendVideoSlot() { -// QFAIL("Feature not yet implemented!"); mDummyModel->reset(); init(); @@ -579,6 +561,10 @@ QCOMPARE( ShareUi::mFileList.count(), 1 ); QCOMPARE( ShareUi::mFileList.at(0), filePath ); + mPlugin->deactivateView(); + + QVERIFY(!mPlugin->mShareUi); + cleanup(); } @@ -623,14 +609,14 @@ QString expectedText = hbTrId("txt_videos_info_do_you_want_to_delete_1").arg( display.first()); deleteAction->trigger(); - msgBox->emitDialogFinished(mPlugin, SLOT(deleteVideoDialogFinished(HbAction *)), 0); // Yes selected + msgBox->emitDialogFinished(mPlugin, SLOT(deleteVideoDialogFinished(int)), HbMessageBox::Yes); // Yes selected QCOMPARE( mDummyModel->dataAccessCount(), 3 ); QVERIFY( mDummyModel->lastIndex() == expected ); QCOMPARE( mDummyModel->deleteFileIndex(), expected.row() ); QCOMPARE( HbMessageBox::mLatestTxt, expectedText ); deleteAction->trigger(); - msgBox->emitDialogFinished(mPlugin, SLOT(deleteVideoDialogFinished(HbAction *)), 1); // No selected + msgBox->emitDialogFinished(mPlugin, SLOT(deleteVideoDialogFinished(int)), HbMessageBox::No); // No selected QCOMPARE( mDummyModel->dataAccessCount(), 4 ); QVERIFY( mDummyModel->lastIndex() == expected ); QCOMPARE( mDummyModel->deleteFileIndex(), expected.row() ); @@ -639,7 +625,7 @@ mDummyModel->reset(); deleteAction->trigger(); - msgBox->emitDialogFinished(mPlugin, SLOT(deleteVideoDialogFinished(HbAction *)), 1); // No selected + msgBox->emitDialogFinished(mPlugin, SLOT(deleteVideoDialogFinished(int)), HbMessageBox::No); // No selected QCOMPARE( mDummyModel->dataAccessCount(), 1 ); QVERIFY( mDummyModel->lastIndex() == expected ); QCOMPARE( mDummyModel->deleteFileIndex(), -1 ); // verify that no file was deleted. @@ -720,7 +706,8 @@ QString txt = "testdata"; additional = txt; emit testErrorSignal( VideoCollectionCommon::statusSingleDeleteFail , additional); - QCOMPARE(HbMessageBox::mLatestTxt, hbTrId("txt_videos_info_unable_to_delete_1_it_is_current").arg(txt)); + QString expected = HbParameterLengthLimiter(hbTrId("txt_videos_info_unable_to_delete_1_it_is_current")).arg(txt); + QCOMPARE(HbMessageBox::mLatestTxt, expected); HbMessageBox::mLatestTxt = ""; // VideoCollectionCommon::statusMultipleDeleteFail @@ -732,7 +719,6 @@ cleanup(); } - // --------------------------------------------------------------------------- // Slot: test for the testThumbnailReadySlot // ---------------------------------------------------------------------------