FCL/sf/app/videoplayer: comparison videocollection/videocollectionview/tsrc/testlistwidget/src/testlistwidget.cpp

equal deleted inserted replaced

-:3738fe97f027
+:8aed59de29f9
 *
 * Description:   tester for methods in VideoListWidget
 *
 */
+// Version : %version: 46 %
 #include <qmap.h>
 #include <vcxmyvideosdefs.h>
 #include <mpxhbvideocommondefs.h>
 #include "hbglobal.h"
 #include "hblistview.h"
 #include "hbview.h"
-#include "videoservices.h"
 #include "videosortfilterproxymodel.h"
 #include "hbscrollbar.h"
 #include "hbmenu.h"
 #include "hbmessagebox.h"
 #include "hbinstance.h"
 #include "hbmainwindow.h"
 #include "hbstyleloader.h"
+#include "hbinputdialog.h"
 #include "videothumbnaildata.h"
 #include "videocollectioncommon.h"
 #include "videocollectionwrapper.h"
 #include "videocollectionwrapperdata.h"
 #include "hbmenudata.h"
 #include "videothumbnailtestdata.h"
 #include "videolistdatamodel.h"
 #include "videolistdatamodeldata.h"
 #include "videosortfilterproxymodeldata.h"
-#include "videoservices.h"
 #include "videocollectionuiloader.h"
 #include "videocollectionuiloaderdata.h"
 #include "videolistselectiondialog.h"
 #include "videolistselectiondialogdata.h"
 #include "hbmessageboxdata.h"
 #include "testlistwidget.h"
 #define private public
 #include "videolistwidget.h"
+#include "videoservices.h"
 #undef private
 static const int CONTEXT_MENU_COUNT = 8;
 /**
 {
 VideoListWidget::emitActivated(index);
 }
 /**
-* calls longPressGesture
+* calls longPressedSlot
 */
-void callLongPressGesture(const QPointF &point)
+void callLongPressedSlot(HbAbstractViewItem *item, const QPointF &point)
 {
-VideoListWidget::longPressGesture (point);
+VideoListWidget::longPressedSlot(item, point);
+}
+/**
+* calls pangesture
+*/
+void callPanGesture(const QPointF &point)
+{
+VideoListWidget::panGesture(point);
 }
 };
 // ---------------------------------------------------------------------------
 // main
 return res;
 }
 // ---------------------------------------------------------------------------
-//
+// setRowCount
 // ---------------------------------------------------------------------------
 //
-void TestListWidget::setRowCount(int count, int type, VideoListDataModel *model)
+void TestListWidget::setRowCount(int count,
+VideoCollectionCommon::TModelType type,
+VideoListDataModel *model)
 {
 if (!model)
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
 VideoSortFilterProxyModel *model = wrapper.getModel(type);
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testInitialize()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 // succeed case ( new operator cannot be stubbed)
 QVERIFY(mTestWidget->initialize(*model) == 0);
 	QVERIFY(mTestWidget->mModel == model);
 	QVERIFY(mTestWidget->mVideoServices == 0);
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testActivate()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 // no  model: fails
 QVERIFY(mTestWidget->activate() == -1);
 QCOMPARE(HbMenuData::mEnabledSetted, false);
 QCOMPARE(HbListView::mLatestVisibility, false);
 HbMenuData::mEnabledSetted = true;
 HbListView::mLatestVisibility = false;
 HbListView::mLatestEnableValue = false;
 VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = 0;
-// model exists, current view exists, level neither ELevelAlbum nor ELevelDefaultColl,
+// model exists, current view exists, level neither ELevelAlbum nor ELevelDefaultColl
-// no mNavKeyQuitAction
 HbView *tmpView = new HbView();
 hbInstance->allMainWindows().value(0)->addView(tmpView);
-HbAction *tmpAction = mTestWidget->mNavKeyQuitAction;
-mTestWidget->mNavKeyQuitAction = 0;
 QVERIFY(mTestWidget->activate() == 0);
 QCOMPARE(HbMenuData::mEnabledSetted, true);
 QCOMPARE(HbListView::mLatestVisibility, true);
 QCOMPARE(VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled, 1);
-QVERIFY(!tmpView->mNavigationAction);
+QVERIFY(mTestWidget->mNavKeyAction);
+QVERIFY(HbAction::mNavAction == Hb::QuitAction);
 HbMenuData::mEnabledSetted = true;
 HbListView::mLatestVisibility = false;
 HbListView::mLatestEnableValue = false;
 VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = 0;
-mTestWidget->mNavKeyQuitAction = tmpAction;
+// model exists, current view exists, level is ELevelAlbum
-// model exists, current view exists, level neither ELevelAlbum nor ELevelDefaultColl,
+delete mTestWidget;
-// mNavKeyQuitAction exists
+mTestWidget = 0;
-QVERIFY(mTestWidget->activate() == 0);
+mTestWidget = new ListWidgetTester(mTestUiLoader, mTempView);
-QCOMPARE(HbMenuData::mEnabledSetted, true);
+model = wrapper.getModel(VideoCollectionCommon::EModelTypeCollectionContent);
-QCOMPARE(HbListView::mLatestVisibility, true);
-QCOMPARE(VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled, 1);
-QVERIFY(tmpView->mNavigationAction == tmpAction);
-HbMenuData::mEnabledSetted = true;
-HbListView::mLatestVisibility = false;
-HbListView::mLatestEnableValue = false;
-VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = 0;
-// model exists, current view exists, level is ELevelAlbum
-// no mNavKeyBackAction
 tmpView->mNavigationAction = 0;
-tmpAction = mTestWidget->mNavKeyBackAction;
+QVERIFY(mTestWidget->initialize(*model) == 0);
-mTestWidget->mNavKeyBackAction = 0;
 QVERIFY(mTestWidget->activate(VideoCollectionCommon::ELevelAlbum) == 0);
 QCOMPARE(HbMenuData::mEnabledSetted, true);
 QCOMPARE(HbListView::mLatestVisibility, true);
 QCOMPARE(VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled, 1);
-QVERIFY(!tmpView->mNavigationAction);
+QVERIFY(mTestWidget->mNavKeyAction);
+QVERIFY(HbAction::mNavAction == Hb::BackAction);
 HbMenuData::mEnabledSetted = true;
 HbListView::mLatestVisibility = false;
 HbListView::mLatestEnableValue = false;
 VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = 0;
-mTestWidget->mNavKeyBackAction = tmpAction;
+// activate:
-// model exists, current view exists, level neither ELevelAlbum nor ELevelDefaultColl,
+// -is service
-// mNavKeyBackAction exists
+// -current service is browse
-QVERIFY(mTestWidget->activate(VideoCollectionCommon::ELevelAlbum) == 0);
+VideoServices *videoServices = VideoServices::instance();
-QCOMPARE(HbMenuData::mEnabledSetted, true);
+videoServices->mCurrentService = VideoServices::EBrowse;
-QCOMPARE(HbListView::mLatestVisibility, true);
+delete mTestWidget;
-QCOMPARE(VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled, 1);
+mTestWidget = 0;
-QVERIFY(tmpView->mNavigationAction == tmpAction);
+mTestWidget = new ListWidgetTester(mTestUiLoader, mTempView);
+QVERIFY(mTestWidget->initialize(*model, videoServices) == 0);
-HbMenuData::mEnabledSetted = true;
+QVERIFY(mTestWidget->activate(VideoCollectionCommon::ELevelDefaultColl) == 0);
-HbListView::mLatestVisibility = false;
+QVERIFY(mTestWidget->mNavKeyAction);
-HbListView::mLatestEnableValue = false;
+QVERIFY(HbAction::mNavAction == Hb::QuitAction);
-VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = 0;
 hbInstance->allMainWindows().value(0)->removeView(tmpView);
 delete tmpView;
+// final cleanup
+videoServices->mCurrentService = VideoServices::ENoService;
+videoServices->decreaseReferenceCount();
 }
 // ---------------------------------------------------------------------------
 // testDeactivate
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testDeactivate()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 HbListView::mLatestVisibility = true;
 VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = 1;
 mTestWidget->activate();
 mTestWidget->activate();
 mTestWidget->deactivate();
 QCOMPARE(HbListView::mLatestVisibility, false);
 QCOMPARE(VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled, 0);
+// deactivate:
+// -is service
+// -current service is browse
+VideoServices *videoServices = VideoServices::instance();
+videoServices->mCurrentService = VideoServices::EBrowse;
+delete mTestWidget;
+mTestWidget = 0;
+mTestWidget = new ListWidgetTester(mTestUiLoader, mTempView);
+QVERIFY(mTestWidget->initialize(*model, videoServices) == 0);
+QVERIFY(mTestWidget->activate(VideoCollectionCommon::ELevelDefaultColl) == 0);
+mTestWidget->deactivate();
+QCOMPARE(HbListView::mLatestVisibility, false);
+QCOMPARE(VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled, 0);
+// final cleanup
+videoServices->mCurrentService = VideoServices::ENoService;
+videoServices->decreaseReferenceCount();
 }
 // ---------------------------------------------------------------------------
 // testGetLevel
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testGetLevel()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 mTestWidget->initialize(*model);
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelVideos;
 QCOMPARE(mTestWidget->getLevel(), VideoCollectionCommon::ELevelVideos);
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testGetModel()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 QVERIFY(&(mTestWidget->getModel()) == 0);
 HbListView::mVScrollBarIsNull = false;
 HbListView::mReturnNullPrototype = false;
 // testEmitActivated
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testEmitActivated()
 {
-VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
+VideoServices *videoServices = VideoServices::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 QSignalSpy spysignal(mTestWidget, SIGNAL(collectionOpened(bool, const QString&, const QModelIndex&)));
 QSignalSpy spysignalFileUri(mTestWidget, SIGNAL(fileUri(const QString&)));
 QSignalSpy spysignalActivated(mTestWidget, SIGNAL(activated(const QModelIndex&)));
 VideoSortFilterProxyModelData::mLastItemId = TMPXItemId::InvalidId();
 TMPXItemId savedId = TMPXItemId(1,1);
 VideoSortFilterProxyModelData::mItemIds.clear();
 VideoSortFilterProxyModelData::mItemIds.append(savedId);
 QVariant data = QString("test");
-VideoListDataModelData::setData( Qt::DisplayRole, data);
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 setRowCount(2);
 VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0,0));
 QModelIndex fetchIndex = model->index(0, 0, QModelIndex());
 QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 // current level is ELevelCategory
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelCategory;
 // --> variant is not valid
-VideoListDataModelData::setData( Qt::DisplayRole, QVariant());
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, QVariant());
 fetchIndex = model->index(0, 0, QModelIndex());
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 0);
 QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 // --> variant is valid, collectionOpened -signal should be emitted
-VideoListDataModelData::setData( Qt::DisplayRole, data);
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 fetchIndex = model->index(1, 0, QModelIndex());
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 1);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 0);
 spysignalFileUri.clear();
 spysignalActivated.clear();
 // current level is not ELevelCategory
 // mIsService is true, variant gotten is invalid
-VideoListDataModelData::setData( Qt::DisplayRole, QVariant());
+videoServices->mCurrentService = VideoServices::EUriFetcher;
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, QVariant());
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelVideos;
 mTestWidget->mIsService = true;
+mTestWidget->mVideoServices = videoServices;
 fetchIndex = model->index(0, 0, QModelIndex());
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 0);
 QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 // current level is not ELevelCategory
 // mIsService is true, variant gotten is valid
-VideoListDataModelData::setData( VideoCollectionCommon::KeyFilePath, data);
+videoServices->mCurrentService = VideoServices::EUriFetcher;
+VideoListDataModelData::setData(VideoCollectionCommon::KeyFilePath, data);
 fetchIndex = model->index(0, 0, QModelIndex());
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 1);
 QVERIFY(spysignalActivated.count() == 0);
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 0);
 QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
-}
+// final cleanup
+videoServices->decreaseReferenceCount();
-// ---------------------------------------------------------------------------
+}
-// testLongPressGesture
 // ---------------------------------------------------------------------------
-//
+// testLongPressedSlot
-void TestListWidget::testLongPressGesture()
+// ---------------------------------------------------------------------------
-{
+//
-VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
+void TestListWidget::testLongPressedSlot()
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+{
+VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 QVariant data = QString("test");
 // correct data to index 0
-VideoListDataModelData::setData( Qt::DisplayRole, data);
+VideoListDataModelData::setData(Qt::DisplayRole, data);
 setRowCount(2);
 QPointF point(1,1);
 mTestWidget->initialize(*model);
+HbAbstractViewItem *item = new HbAbstractViewItem();
+item->mModelIndex = mTestWidget->mModel->index(0, 0, QModelIndex());
 mTestWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
 // mDetailsReady is false
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint != point);
-QVERIFY(HbListView::mLongPressedPoint != point);
 // multiselection is on
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint != point);
 // selection mode is custom
 mTestWidget->setSelectionMode(-1);
+mTestWidget->callLongPressedSlot(item, point);
-mTestWidget->callLongPressGesture(point);
 QVERIFY(HbMenuData::mExecPoint != point);
-// item at position is null
+// item is null
-HbListViewItem *pTmp = mTestWidget->mItem;
-mTestWidget->mItem = 0;
 mTestWidget->setSelectionMode(HbAbstractItemView::NoSelection);
 HbListView::mCurrentIndex = QModelIndex();
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(0, point);
 QVERIFY(HbMenuData::mExecPoint != point);
-QVERIFY(HbListView::mLongPressedPoint == point);
+// item has invalid index
-// item at position is not null, but returns invalid index
+item->mModelIndex = QModelIndex();
-mTestWidget->mItem = pTmp;
+mTestWidget->callLongPressedSlot(item, point);
-mTestWidget->mItem->mModelIndex = QModelIndex();
-mTestWidget->callLongPressGesture(point);
 QVERIFY(HbMenuData::mExecPoint != point);
-QVERIFY(HbListView::mLongPressedPoint == point);
 // item at position is not null, returns current index is valid
-HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
+item->mModelIndex = model->index(0, 0, QModelIndex());
 mTestWidget->mItem->mModelIndex = HbListView::mCurrentIndex ;
-// model is == 0
+// model is null
 VideoSortFilterProxyModel *tmp = mTestWidget->mModel;
 mTestWidget->mModel = 0;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint != point);
-QVERIFY(HbListView::mLongPressedPoint == point);
 mTestWidget->mModel = tmp;
-HbListView::mLongPressedPoint = QPointF();
+// gotten id != KVcxMvcMediaTypeVideo, service is true and id != KVcxMvcMediaTypeAlbum
-// gotten id != KVcxMvcMediaTypeVideo, service is true and id !=  KVcxMvcMediaTypeAlbum
 VideoSortFilterProxyModelData::mItemIds.clear();
 VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,1));
 mTestWidget->mIsService = true;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
-QVERIFY(HbMenuData::mExecPoint != point);
+QVERIFY(HbMenuData::mExecPoint == point);
-QVERIFY(HbListView::mLongPressedPoint == point);
-HbListView::mLongPressedPoint = QPointF();
 // gotten id != KVcxMvcMediaTypeVideo, service is false and id !=  KVcxMvcMediaTypeAlbum
 VideoSortFilterProxyModelData::mItemIds.clear();
 VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,1));
 mTestWidget->mIsService = false;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
-QVERIFY(HbMenuData::mExecPoint != point);
+QVERIFY(HbMenuData::mExecPoint == point);
-QVERIFY(HbListView::mLongPressedPoint == point);
-HbListView::mLongPressedPoint = QPointF();
 // gotten id != KVcxMvcMediaTypeVideo, service is false and id ==  KVcxMvcMediaTypeAlbum
 VideoSortFilterProxyModelData::mItemIds.clear();
 VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,2));
 mTestWidget->mIsService = false;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint == point);
-QVERIFY(HbListView::mLongPressedPoint == point);
 HbMenuData::mExecPoint = QPointF();
-HbListView::mLongPressedPoint = QPointF();
 // gotten id == KVcxMvcMediaTypeVideo
 VideoSortFilterProxyModelData::mItemIds.clear();
 VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,02));
 mTestWidget->mIsService = false;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint == point);
-QVERIFY(HbListView::mLongPressedPoint == point);
 HbMenuData::mExecPoint = QPointF();
-HbListView::mLongPressedPoint = QPointF();
 // no context menu
 // (context menu setup fails, due invalid amount of correct actions)
-QMap<VideoListWidget::TContextActionIds, HbAction*>::iterator iter = mTestWidget->mContextMenuActions.begin();
+QMap<VideoListWidget::TContextActionIds, HbAction*>::iterator iter =
+mTestWidget->mContextMenuActions.begin();
 iter++;
 HbAction *nullAction = 0;
 iter.value() = nullAction;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint != point);
-QVERIFY(HbListView::mLongPressedPoint == point);
+// long press gesture:
+// -is service
+// -current service is browse
+HbMenuData::mExecPoint = QPointF();
+VideoServices *videoServices = VideoServices::instance();
+videoServices->mCurrentService = VideoServices::EBrowse;
+delete mTestWidget;
+mTestWidget = 0;
+mTestWidget = new ListWidgetTester(mTestUiLoader, mTempView);
+QVERIFY(mTestWidget->initialize(*model, videoServices) == 0);
+QVERIFY(mTestWidget->activate(VideoCollectionCommon::ELevelDefaultColl) == 0);
+mTestWidget->mItem->mModelIndex = model->index(0, 0, QModelIndex());
+mTestWidget->callLongPressedSlot(item, point);
+QCOMPARE(mTestWidget->mContextMenuActions.count(), 3);
+QVERIFY(mTestWidget->mContextMenuActions[VideoListWidget::EActionPlay]->isVisible());
+QVERIFY(mTestWidget->mContextMenuActions[VideoListWidget::EActionDelete]->isVisible());
+QVERIFY(mTestWidget->mContextMenuActions[VideoListWidget::EActionDetails]->isVisible());
+// long press gesture:
+// -is service
+// -current service is EUriFetcher
+HbMenuData::mExecPoint = QPointF();
+videoServices = VideoServices::instance();
+videoServices->mCurrentService = VideoServices::EUriFetcher;
+delete mTestWidget;
+mTestWidget = 0;
+mTestWidget = new ListWidgetTester(mTestUiLoader, mTempView);
+QVERIFY(mTestWidget->initialize(*model, videoServices) == 0);
+QVERIFY(mTestWidget->activate(VideoCollectionCommon::ELevelDefaultColl) == 0);
+mTestWidget->mItem->mModelIndex = model->index(0, 0, QModelIndex());
+mTestWidget->callLongPressedSlot(item, point);
+QCOMPARE(mTestWidget->mContextMenuActions.count(), 2);
+QVERIFY(mTestWidget->mContextMenuActions[VideoListWidget::EActionPlay]->isVisible());
+QVERIFY(mTestWidget->mContextMenuActions[VideoListWidget::EActionDetails]->isVisible());
+// final cleanup
+videoServices->decreaseReferenceCount();
+delete item;
+}
+// ---------------------------------------------------------------------------
+// testPanGesture
+// ---------------------------------------------------------------------------
+//
+void TestListWidget::testPanGesture()
+{
+QPointF point(1,1);
+// no context menu
+mTestWidget->callPanGesture(point);
+QVERIFY(HbListView::mPanGesturePoint == point);
+// create context menu
+VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+mTestWidget->initialize(*model);
+connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(doDelayedsSlot()));
+emit testSignal();
+disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(doDelayedsSlot()));
+HbListView::mPanGesturePoint = QPointF();
+// context menu visible
+mTestWidget->mContextMenu->setVisible(true);
+mTestWidget->callPanGesture(point);
+QVERIFY(HbListView::mPanGesturePoint != point);
+// context menu not visible
+mTestWidget->mContextMenu->setVisible(false);
+mTestWidget->callPanGesture(point);
+QVERIFY(HbListView::mPanGesturePoint == point);
 }
 // ---------------------------------------------------------------------------
 // testSetContextMenu
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testSetContextMenu()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 VideoListDataModel *sourceModel = qobject_cast<VideoListDataModel*>(model->sourceModel());
 VideoSortFilterProxyModelData::mItemIds.clear();
 mTestWidget->initialize(*model);
 setRowCount(1);
 TMPXItemId itemId;
 QPointF point(1,1);
 itemId.iId2 = 0;
 VideoSortFilterProxyModelData::mItemIds.append(itemId);
+HbAbstractViewItem *item = new HbAbstractViewItem();
+item->mModelIndex = model->index(0, 0, QModelIndex());
 // no context menu
 delete mTestWidget->mContextMenu;
 mTestWidget->mContextMenu = 0;
 // mCurrentLevel == ELevelVideos
 int visibleCount = 0;
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelVideos;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QMap<VideoListWidget::TContextActionIds, HbAction*>::iterator iter = mTestWidget->mContextMenuActions.begin();
 QVERIFY(iter != mTestWidget->mContextMenuActions.end());
 while(iter != mTestWidget->mContextMenuActions.end())
 {
-if(iter.value()->mVisible)
+if(iter.value()->isVisible())
 {
 visibleCount++;
 }
 ++iter;
 }
-QVERIFY(visibleCount == 3);
+QVERIFY(visibleCount == 4);
 // invalid amount of actions -> invalid items gets removed
 HbAction *nullAction = 0;
 iter = mTestWidget->mContextMenuActions.begin();
 iter++;
 iter.value() = nullAction;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(!mTestWidget->mContextMenu);
 QVERIFY(mTestWidget->mContextMenuActions.count() == 0);
 // mCurrentLevel == ELevelCategory
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelCategory;
 // mIsService is false
 mTestWidget->mIsService = false;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 iter = mTestWidget->mContextMenuActions.begin();
 QVERIFY(iter != mTestWidget->mContextMenuActions.end());
 visibleCount = 0;
 while(iter != mTestWidget->mContextMenuActions.end())
 {
-if(iter.value()->mVisible)
+if(iter.value()->isVisible())
 {
 visibleCount++;
 }
 ++iter;
 }
-QVERIFY(visibleCount == 2);
+QVERIFY(visibleCount == 1);
-// mIsService is true
+// mIsService is true, mpxId.iId2 != KVcxMvcMediaTypeAlbum
 mTestWidget->mIsService = true;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 iter = mTestWidget->mContextMenuActions.begin();
 QVERIFY(iter != mTestWidget->mContextMenuActions.end());
 visibleCount = 0;
 while(iter != mTestWidget->mContextMenuActions.end())
 {
-if(iter.value()->mVisible)
+if(iter.value()->isVisible())
 {
 visibleCount++;
 }
 ++iter;
 }
-QVERIFY(visibleCount == 0);
+QVERIFY(visibleCount == 1);
+// mIsService is false, mpxId.iId2 == KVcxMvcMediaTypeAlbum
+//VideoSortFilterProxyModelData::mItemIds.clear();
+VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,KVcxMvcMediaTypeAlbum));
+HbListView::mCurrentIndex = model->index(1, 0, QModelIndex());
+item->mModelIndex = model->index(1, 0, QModelIndex());
+mTestWidget->mIsService = false;
+mTestWidget->callLongPressedSlot(item, point);
+iter = mTestWidget->mContextMenuActions.begin();
+QVERIFY(iter != mTestWidget->mContextMenuActions.end());
+visibleCount = 0;
+while(iter != mTestWidget->mContextMenuActions.end())
+{
+if(iter.value()->isVisible())
+{
+visibleCount++;
+}
+++iter;
+}
+QVERIFY(visibleCount == 3);
+HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 // mCurrentLevel == ELevelAlbum
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelAlbum;
 // mIsService is false
 mTestWidget->mIsService = false;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 iter = mTestWidget->mContextMenuActions.begin();
 QVERIFY(iter != mTestWidget->mContextMenuActions.end());
 visibleCount = 0;
 while(iter != mTestWidget->mContextMenuActions.end())
 {
-if(iter.value()->mVisible)
+if(iter.value()->isVisible())
 {
 visibleCount++;
 }
 ++iter;
 }
-QVERIFY(visibleCount == 3);
+QVERIFY(visibleCount == 4);
 // mIsService is true
 // object needs to be resetted for the service use
 cleanup();
 init();
 setRowCount(1);
-model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 mTestWidget->initialize(*model);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 mTestWidget->mItem->mModelIndex = HbListView::mCurrentIndex ;
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelAlbum;
 VideoSortFilterProxyModelData::mItemIds.append(itemId);
 mTestWidget->mIsService = true;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 iter = mTestWidget->mContextMenuActions.begin();
 QVERIFY(iter != mTestWidget->mContextMenuActions.end());
 visibleCount = 0;
 while(iter != mTestWidget->mContextMenuActions.end())
 {
-if(iter.value()->mVisible)
+if(iter.value()->isVisible())
 {
 visibleCount++;
 }
 ++iter;
 }
 QVERIFY(visibleCount == 2);
 //invalid level
 mTestWidget->mCurrentLevel = (VideoCollectionCommon::TCollectionLevels)0;
-mTestWidget->callLongPressGesture(point);
+mTestWidget->callLongPressedSlot(item, point);
 iter = mTestWidget->mContextMenuActions.begin();
 QVERIFY(iter != mTestWidget->mContextMenuActions.end());
 visibleCount = 0;
 while(iter != mTestWidget->mContextMenuActions.end())
 {
-if(iter.value()->mVisible)
+if(iter.value()->isVisible())
 {
 visibleCount++;
 }
 ++iter;
 }
 QVERIFY(visibleCount == 0);
 }
 void TestListWidget::testDoDelayedsSlot()
 {
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(doDelayedsSlot()));
 //dodelayed calls create context menu, which is already tested at
 // testSetContextMenu -method, these tests are just for coverity's sake
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 mTestWidget->initialize(*model);
 delete mTestWidget->mContextMenu;
 mTestWidget->mContextMenu = 0;
 int visibleCount = 0;
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelVideos;
 // no context menu
 emit testSignal();
-QVERIFY(mTestWidget->mContextMenuActions.count() == 6);
+QVERIFY(mTestWidget->mContextMenuActions.count() == 8);
 // context menu exists
 emit testSignal();
-QVERIFY(mTestWidget->mContextMenuActions.count() == 6);
+QVERIFY(mTestWidget->mContextMenuActions.count() == 8);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(scrollingStartedSlot()));
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testDeleteItemSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 HbMessageBoxData::mLatestTxt = "";
 VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
 mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(deleteItemSlot()));
 setRowCount(0);
 // data is valid
 setRowCount(1);
 QVariant data = QString("test");
-VideoListDataModelData::setData( Qt::DisplayRole, data);
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 // messagebox question returns false
 HbMessageBoxData::mQuestionReturnValue = false;
 emit testSignal();
 QVERIFY(!HbMessageBoxData::mLatestTxt.isEmpty());
 QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
 HbMessageBoxData::mLatestTxt = "";
 setRowCount(1);
 data = QString("test");
-VideoListDataModelData::setData( Qt::DisplayRole, data);
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 // messagebox question returns true
 VideoSortFilterProxyModelData::mDeleteItemsFails = false;
 HbMessageBoxData::mQuestionReturnValue = true;
 emit testSignal();
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testRenameSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
-// nothing to test yet
-HbMessageBoxData::mLatestTxt = "";
-mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(renameSlot()));
-emit testSignal();
-QVERIFY(!HbMessageBoxData::mLatestTxt.isEmpty());
+VideoSortFilterProxyModelData::reset();
+VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
+mTestWidget->initialize(*model);
+// Good case
+VideoSortFilterProxyModelData::mLastAlbumNameInRename = "";
+HbInputDialog::mGetTextReturnValue = "renamedVideo";
+HbInputDialog::mGetTextCallCount = 0;
+setRowCount(1);
+VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
+QVariant data = QString("albumName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+QVERIFY(VideoSortFilterProxyModelData::mLastAlbumNameInRename == "renamedVideo");
+QCOMPARE(HbInputDialog::mGetTextCallCount, 1);
+// New name is same as previous
+HbInputDialog::mGetTextReturnValue = QString();
+HbInputDialog::mGetTextCallCount = 0;
+VideoSortFilterProxyModelData::mLastAlbumNameInRename = "";
+data = QString("albumName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+QVERIFY(VideoSortFilterProxyModelData::mLastAlbumNameInRename == "");
+QCOMPARE(HbInputDialog::mGetTextCallCount, 1);
+// Getting name from input dialog fails
+HbInputDialog::mGetTextFails = true;
+VideoSortFilterProxyModelData::mLastAlbumNameInRename = "";
+HbInputDialog::mGetTextReturnValue = QString();
+HbInputDialog::mGetTextCallCount = 0;
+data = QString("albumName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+QVERIFY(VideoSortFilterProxyModelData::mLastAlbumNameInRename == "");
+QCOMPARE(HbInputDialog::mGetTextCallCount, 1);
+// New name is empty.
+HbInputDialog::mGetTextFails = false;
+VideoSortFilterProxyModelData::mLastAlbumNameInRename = "";
+HbInputDialog::mGetTextReturnValue = "";
+HbInputDialog::mGetTextCallCount = 0;
+data = QString("albumName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+QVERIFY(VideoSortFilterProxyModelData::mLastAlbumNameInRename == "");
+QCOMPARE(HbInputDialog::mGetTextCallCount, 1);
+// Item is video
+VideoSortFilterProxyModelData::mItemIds.clear();
+VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeVideo));
+HbInputDialog::mGetTextFails = false;
+VideoSortFilterProxyModelData::mLastAlbumNameInRename = "";
+HbInputDialog::mGetTextReturnValue = "";
+HbInputDialog::mGetTextCallCount = 0;
+data = QString("albumName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+QVERIFY(VideoSortFilterProxyModelData::mLastAlbumNameInRename == "");
+QCOMPARE(HbInputDialog::mGetTextCallCount, 0);
+// No model
+VideoSortFilterProxyModelData::mLastAlbumNameInRename = "";
+HbInputDialog::mGetTextReturnValue = "renamedVideo";
+HbInputDialog::mGetTextCallCount = 0;
+VideoSortFilterProxyModelData::mItemIds.clear();
+VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
+data = QString("albumName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+VideoSortFilterProxyModel *tmp = mTestWidget->mModel;
+mTestWidget->mModel = 0;
+emit testSignal();
+mTestWidget->mModel = tmp;
+QVERIFY(VideoSortFilterProxyModelData::mLastAlbumNameInRename == "");
+QCOMPARE(HbInputDialog::mGetTextCallCount, 0);
+// Variant data is invalid
+VideoSortFilterProxyModelData::mLastAlbumNameInRename = "";
+HbInputDialog::mGetTextReturnValue = "renamedVideo";
+HbInputDialog::mGetTextCallCount = 0;
+VideoSortFilterProxyModelData::mItemIds.clear();
+VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
+data = QVariant();
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+QVERIFY(VideoSortFilterProxyModelData::mLastAlbumNameInRename == "");
+QCOMPARE(HbInputDialog::mGetTextCallCount, 0);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(renameSlot()));
 }
 // ---------------------------------------------------------------------------
-// testPlayItemSlot
+// testOpenItemSlot
 // ---------------------------------------------------------------------------
 //
-void TestListWidget::testPlayItemSlot()
+void TestListWidget::testOpenItemSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 mTestWidget->initialize(*model);
-connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(playItemSlot()));
+connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(openItemSlot()));
 setRowCount(1);
 TMPXItemId savedId = TMPXItemId(1,1);
 VideoSortFilterProxyModelData::mItemIds.clear();
 VideoSortFilterProxyModelData::mItemIds.append(savedId);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
 QVERIFY(VideoSortFilterProxyModelData::mLastItemId == savedId);
-disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(playItemSlot()));
+disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(openItemSlot()));
 }
-// ---------------------------------------------------------------------------
-// testPlayAllSlot
-// ---------------------------------------------------------------------------
-//
-void TestListWidget::testPlayAllSlot()
-{
-connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(playAllSlot()));
-emit testSignal();
-disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(playAllSlot()));
-}
 // ---------------------------------------------------------------------------
 // testAddToCollectionSlot
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testAddToCollectionSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 VideoListSelectionDialogData::mSelectionType = -1;
 VideoListSelectionDialogData::mSettedMpxId = TMPXItemId::InvalidId();
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(addToCollectionSlot()));
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testRemoveFromCollectionSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 VideoSortFilterProxyModelData::mRemoveItemsFromAlbumReturnValue = 0;
 VideoSortFilterProxyModelData::mLastItemId = TMPXItemId::InvalidId();
 VideoSortFilterProxyModelData::mItemIds.clear();
 //
 void TestListWidget::testRemoveCollectionSlot()
 {
 VideoSortFilterProxyModelData::mRemoveAlbumsFails = false;
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 HbMessageBoxData::mQuestionReturnValue = true;
 HbMessageBoxData::mLatestTxt = "";
 VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
 QVERIFY(HbMessageBoxData::mLatestTxt.isEmpty());
 mTestWidget->initialize(*model);
 // invalid data
-VideoListDataModelData::setData( Qt::DisplayRole, QVariant());
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, QVariant());
 emit testSignal();
 QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
 QVERIFY(HbMessageBoxData::mLatestTxt.isEmpty());
 // valid data
-VideoListDataModelData::setData( Qt::DisplayRole, "test");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, "test");
 emit testSignal();
 QVERIFY(VideoSortFilterProxyModelData::mLastIndex.isValid());
 QVERIFY(VideoSortFilterProxyModelData::mLastIndex.row() == 1);
 QVERIFY(!HbMessageBoxData::mLatestTxt.isEmpty());
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testOpenDetailsSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 QSignalSpy spysignal(mTestWidget, SIGNAL(command(int)));
 HbMessageBoxData::mLatestTxt = "";
 VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
 setRowCount(0);
 mTestWidget->mModel = tmp;
 // detail fetch fails
 setRowCount(1);
 QVariant data = QString("test");
-VideoListDataModelData::setData( Qt::DisplayRole, data);
+VideoListDataModelData::setData(Qt::DisplayRole, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 VideoSortFilterProxyModelData::mDetailsReturnValue = -1;
 emit testSignal();
 QVERIFY(spysignal.count() == 0);
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testBack()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 QSignalSpy spysignal(mTestWidget, SIGNAL(collectionOpened(bool, const QString&, const QModelIndex&)));
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(back()));
 // no model
 emit testSignal();
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testScrollingEndedSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(scrollingEndedSlot()));
 // no visible items
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testScrollPositionChangedSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionWrapper::EAllVideos);
+VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
 mTestWidget->initialize(*model);
 const QPointF point;
 connect(this, SIGNAL(testSignal(const QPointF&)), mTestWidget, SLOT(scrollPositionChangedSlot(const QPointF&)));

changeset 36	8aed59de29f9
parent 35	3738fe97f027
child 37	4eb2df7f7cbe