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

equal deleted inserted replaced

-:a76e86df7ccd
+:0e1e938beb1a
 *
 * Description:   tester for methods in VideoListWidget
 *
 */
-// Version : %version: 60 %
+// Version : %version: 62 %
 #include <qmap.h>
 #include <vcxmyvideosdefs.h>
 #include <mpxhbvideocommondefs.h>
 #include "hbglobal.h"
 #include "hblistview.h"
 #include "hbview.h"
-#include "videosortfilterproxymodel.h"
+#include "videoproxymodelgeneric.h"
 #include "hbscrollbar.h"
 #include "hbmenu.h"
 #include "hbmessagebox.h"
 #include "hbinstance.h"
 #include "hbmainwindow.h"
 #include "videocollectionwrapperdata.h"
 #include "hbmenudata.h"
 #include "videothumbnailtestdata.h"
 #include "videolistdatamodel.h"
 #include "videolistdatamodeldata.h"
-#include "videosortfilterproxymodeldata.h"
+#include "videoproxymodeldata.h"
 #include "videocollectionuiloader.h"
 #include "videocollectionuiloaderdata.h"
 #include "videolistselectiondialog.h"
 #include "videolistselectiondialogdata.h"
 #include "hbmessageboxdata.h"
 // ---------------------------------------------------------------------------
 // setRowCount
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::setRowCount(int count,
-VideoCollectionCommon::TModelType type,
+VideoProxyModelGeneric *proxyModel,
 VideoListDataModel *model)
 {
 if (!model)
 {
-VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
+proxyModel = VideoCollectionWrapper::instance().getAllVideosModel();
-VideoSortFilterProxyModel *model = wrapper.getModel(type);
+QVERIFY(proxyModel);
-QVERIFY(model);
-VideoListDataModel *sourceModel = qobject_cast<VideoListDataModel*>(model->sourceModel());
+VideoListDataModel *sourceModel = qobject_cast<VideoListDataModel*>(proxyModel->sourceModel());
 QVERIFY(sourceModel);
 VideoListDataModelData::setRowCount(*sourceModel, count);
 sourceModel->initialize();
 }
 VideoCollectionWrapperData::reset();
 HbMenuData::reset();
 VideoThumbnailTestData::reset();
 VideoListDataModelData::reset();
-VideoSortFilterProxyModelData::reset();
+VideoProxyModelData::reset();
 HbMessageBoxData::reset();
 }
 // ---------------------------------------------------------------------------
 // testInitialized
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testInitialize()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 // 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(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 // no  model: fails
 QVERIFY(mTestWidget->activate() == -1);
 QCOMPARE(HbMenuData::mEnabledSetted, false);
 QCOMPARE(HbListView::mLatestVisibility, false);
 HbView *tmpView = new HbView();
 // model exists, current view exists, level neither ELevelAlbum nor ELevelDefaultColl
 delete mTestWidget;
 mTestWidget = 0;
 mTestWidget = new ListWidgetTester(mTestUiLoader, mTempView);
-model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+model = wrapper.getAllVideosModel();
 QVERIFY(mTestWidget->initialize(*model, 0, VideoCollectionCommon::ELevelVideos) == 0);
 hbInstance->allMainWindows().value(0)->addView(tmpView);
 QVERIFY(mTestWidget->activate() == 0);
 QCOMPARE(HbMenuData::mEnabledSetted, true);
 // model exists, current view exists, level is ELevelAlbum
 delete mTestWidget;
 mTestWidget = 0;
 mTestWidget = new ListWidgetTester(mTestUiLoader, mTempView);
-model = wrapper.getModel(VideoCollectionCommon::EModelTypeCollectionContent);
+model = wrapper.getCollectionContentModel();
 tmpView->mNavigationAction = 0;
 QVERIFY(mTestWidget->initialize(*model) == 0);
 QVERIFY(mTestWidget->activate(VideoCollectionCommon::ELevelAlbum) == 0);
 QCOMPARE(HbMenuData::mEnabledSetted, true);
 QCOMPARE(HbListView::mLatestVisibility, true);
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testDeactivate()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 HbListView::mLatestVisibility = true;
 VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = 1;
 mTestWidget->activate();
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testGetLevel()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelVideos;
 QCOMPARE(mTestWidget->getLevel(), VideoCollectionCommon::ELevelVideos);
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testGetModel()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 QVERIFY(mTestWidget->getModel() == 0);
 HbListView::mVScrollBarIsNull = false;
 HbListView::mReturnNullPrototype = false;
 //
 void TestListWidget::testEmitActivated()
 {
 VideoServices *videoServices = VideoServices::instance();
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 QSignalSpy spysignal(mTestWidget, SIGNAL(collectionOpened(bool, const QString&, const TMPXItemId&)));
 QSignalSpy spysignalFileUri(mTestWidget, SIGNAL(fileUri(const QString&)));
 QSignalSpy spysignalActivated(mTestWidget, SIGNAL(activated(const QModelIndex&)));
 mTestWidget->initialize(*model);
 mTestWidget->activate();
-VideoSortFilterProxyModelData::mLastItemId = TMPXItemId::InvalidId();
+VideoProxyModelData::mLastItemId = TMPXItemId::InvalidId();
 TMPXItemId savedId = TMPXItemId(1,1);
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(savedId);
+VideoProxyModelData::mItemIds.append(savedId);
 QVariant data = QString("test");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 setRowCount(2);
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0,0));
+VideoProxyModelData::mItemIds.append(TMPXItemId(0,0));
 QModelIndex fetchIndex = model->index(0, 0, QModelIndex());
 // selection mode == HbAbstractItemView::MultiSelection
 mTestWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 1);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 spysignal.clear();
 spysignalFileUri.clear();
 spysignalActivated.clear();
 // modelIndex is not valid
 fetchIndex = QModelIndex();
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 0);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 // current level is ELevelCategory
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelCategory;
 // --> variant is not valid
 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());
+QVERIFY(VideoProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 // --> variant is valid, collectionOpened -signal should be emitted
 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);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 spysignal.clear();
 spysignalFileUri.clear();
 spysignalActivated.clear();
 fetchIndex = model->index(5, 0, QModelIndex());
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 0);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 // current level is not ELevelCategory
 // mVideoServices, variant gotten is valid
 mTestWidget->mService = 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);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 spysignal.clear();
 spysignalFileUri.clear();
 spysignalActivated.clear();
 fetchIndex = model->index(0, 0, QModelIndex());
 mTestWidget->callEmiteActivated(fetchIndex);
 QVERIFY(spysignal.count() == 0);
 QVERIFY(spysignalFileUri.count() == 0);
 QVERIFY(spysignalActivated.count() == 0);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == savedId);
+QVERIFY(VideoProxyModelData::mLastItemId == savedId);
 // context menu is visible
 if (!mTestWidget->mContextMenu)
 {
 mTestWidget->mContextMenu = new HbMenu;
 }
 mTestWidget->mContextMenu->show();
-VideoSortFilterProxyModelData::mLastItemId = TMPXItemId::InvalidId();
+VideoProxyModelData::mLastItemId = TMPXItemId::InvalidId();
 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());
+QVERIFY(VideoProxyModelData::mLastItemId == TMPXItemId::InvalidId());
 // final cleanup
 videoServices->decreaseReferenceCount();
 }
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testLongPressedSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 QVariant data = QString("test");
 // correct data to index 0
 VideoListDataModelData::setData(Qt::DisplayRole, data);
 setRowCount(2);
 // item at position is not null, returns current index is valid
 item->mModelIndex = model->index(0, 0, QModelIndex());
 mTestWidget->mItem->mModelIndex = HbListView::mCurrentIndex ;
 // model is null
-VideoSortFilterProxyModel *tmp = mTestWidget->mModel;
+VideoProxyModelGeneric *tmp = mTestWidget->mModel;
 mTestWidget->mModel = 0;
 mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint != point);
 mTestWidget->mModel = tmp;
 VideoServices *videoServices = VideoServices::instance();
 // gotten id != KVcxMvcMediaTypeVideo, service exists true and id != KVcxMvcMediaTypeAlbum
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,1));
+VideoProxyModelData::mItemIds.append(TMPXItemId(1,1));
 mTestWidget->mVideoServices = videoServices;
 mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint == point);
 // gotten id != KVcxMvcMediaTypeVideo, service does not exists and id !=  KVcxMvcMediaTypeAlbum
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,1));
+VideoProxyModelData::mItemIds.append(TMPXItemId(1,1));
 mTestWidget->mVideoServices = 0;
 mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint == point);
 // gotten id != KVcxMvcMediaTypeVideo, service service does not exists and id ==  KVcxMvcMediaTypeAlbum
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,2));
+VideoProxyModelData::mItemIds.append(TMPXItemId(1,2));
 mTestWidget->mVideoServices = 0;
 mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint == point);
 HbMenuData::mExecPoint = QPointF();
 // gotten id == KVcxMvcMediaTypeVideo
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,02));
+VideoProxyModelData::mItemIds.append(TMPXItemId(1,02));
 mTestWidget->mVideoServices = 0;
 mTestWidget->callLongPressedSlot(item, point);
 QVERIFY(HbMenuData::mExecPoint == point);
 HbMenuData::mExecPoint = QPointF();
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testSetContextMenu()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 VideoListDataModel *sourceModel = qobject_cast<VideoListDataModel*>(model->sourceModel());
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
 mTestWidget->initialize(*model);
 setRowCount(1);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 mTestWidget->mItem->mModelIndex = HbListView::mCurrentIndex ;
 TMPXItemId itemId;
 QPointF point(1,1);
 itemId.iId2 = 0;
-VideoSortFilterProxyModelData::mItemIds.append(itemId);
+VideoProxyModelData::mItemIds.append(itemId);
 HbAbstractViewItem *item = new HbAbstractViewItem();
 item->mModelIndex = model->index(0, 0, QModelIndex());
 // no context menu
 ++iter;
 }
 QVERIFY(visibleCount == 1);
 // service does not exists , mpxId.iId2 == KVcxMvcMediaTypeAlbum
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(1,KVcxMvcMediaTypeAlbum));
+VideoProxyModelData::mItemIds.append(TMPXItemId(1,KVcxMvcMediaTypeAlbum));
 HbListView::mCurrentIndex = model->index(1, 0, QModelIndex());
 item->mModelIndex = model->index(1, 0, QModelIndex());
 mTestWidget->mVideoServices = 0;
 mTestWidget->callLongPressedSlot(item, point);
 iter = mTestWidget->mContextMenuActions.begin();
 // service does exists
 // object needs to be resetted for the service use
 cleanup();
 init();
 setRowCount(1);
-model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+model = wrapper.getAllVideosModel();
 mTestWidget->mVideoServices = videoServices;
 videoServices->mCurrentService = VideoServices::EUriFetcher;
 mTestWidget->initialize(*model, videoServices);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 mTestWidget->mItem->mModelIndex = HbListView::mCurrentIndex ;
 mTestWidget->mCurrentLevel = VideoCollectionCommon::ELevelAlbum;
-VideoSortFilterProxyModelData::mItemIds.append(itemId);
+VideoProxyModelData::mItemIds.append(itemId);
 mTestWidget->callLongPressedSlot(item, point);
 iter = mTestWidget->mContextMenuActions.begin();
 QVERIFY(iter != mTestWidget->mContextMenuActions.end());
 visibleCount = 0;
 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(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 delete mTestWidget->mContextMenu;
 mTestWidget->mContextMenu = 0;
 int visibleCount = 0;
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testDeleteItemSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 HbMessageBoxData::mLatestTxt = "";
-VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
+VideoProxyModelData::mLastIndex = QModelIndex();
 mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(deleteItemSlot()));
 HbMessageBox *box = new HbMessageBox();
 // no model
 VideoListDataModelData::mDataAccessCount = 0;
-VideoSortFilterProxyModel *tmp = mTestWidget->mModel;
+VideoProxyModelGeneric *tmp = mTestWidget->mModel;
 mTestWidget->mModel = 0;
 emit testSignal();
 QVERIFY(VideoListDataModelData::dataAccessCount() == 0);
 QVERIFY(HbMessageBoxData::mLatestTxt.isEmpty());
-QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(!VideoProxyModelData::mLastIndex.isValid());
 setRowCount(1);
 mTestWidget->mModel = tmp;
 // data fetched from item is invalid
 VideoListDataModelData::mDataAccessCount = 0;
 setRowCount(1);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
 QVERIFY(VideoListDataModelData::dataAccessCount() == 1);
 QVERIFY(HbMessageBoxData::mLatestTxt.isEmpty());
-QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(!VideoProxyModelData::mLastIndex.isValid());
 setRowCount(0);
 // data is valid
 VideoListDataModelData::mDataAccessCount = 0;
 setRowCount(1);
 HbMessageBoxData::mQuestionReturnValue = false;
 emit testSignal();
 box->emitDialogFinished(mTestWidget, SLOT(deleteItemDialogFinished(int)), HbMessageBox::No);
 QVERIFY(VideoListDataModelData::dataAccessCount() == 1);
 QVERIFY(!HbMessageBoxData::mLatestTxt.isEmpty());
-QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(!VideoProxyModelData::mLastIndex.isValid());
 HbMessageBoxData::mLatestTxt = "";
 setRowCount(1);
 data = QString("test");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 // messagebox question returns true
 VideoListDataModelData::mDataAccessCount = 0;
-VideoSortFilterProxyModelData::mDeleteItemsFails = false;
+VideoProxyModelData::mDeleteItemsFails = false;
 HbMessageBoxData::mQuestionReturnValue = true;
 emit testSignal();
 box->emitDialogFinished(mTestWidget, SLOT(deleteItemDialogFinished(int)), HbMessageBox::Yes);
 QVERIFY(VideoListDataModelData::dataAccessCount() == 1);
 QVERIFY(!HbMessageBoxData::mLatestTxt.isEmpty());
-QVERIFY(VideoSortFilterProxyModelData::mLastIndex.row() == 0);
+QVERIFY(VideoProxyModelData::mLastIndex.row() == 0);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(deleteItemSlot()));
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testRenameSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 HbInputDialog *dialog = new HbInputDialog();
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(renameSlot()));
-VideoSortFilterProxyModelData::reset();
+VideoProxyModelData::reset();
-VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
+VideoProxyModelData::mLastIndex = QModelIndex();
 mTestWidget->initialize(*model);
 // Good case
-VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+VideoProxyModelData::mLastItemNameInRename = "";
 HbInputDialog::mValueReturnValue = "renamedVideo";
 HbInputDialog::mValueCallCount = 0;
 HbInputDialog::mOpenCallCount = 0;
 setRowCount(1);
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
+VideoProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
 QVariant data = QString("albumName");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
 dialog->emitDialogFinished(mTestWidget, SLOT(renameDialogFinished(HbAction *)), 0);
 // New name is same as previous
 HbInputDialog::mValueReturnValue = "albumName";
 HbInputDialog::mValueCallCount = 0;
 HbInputDialog::mOpenCallCount = 0;
-VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+VideoProxyModelData::mLastItemNameInRename = "";
 data = QString("albumName");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
 dialog->emitDialogFinished(mTestWidget, SLOT(renameDialogFinished(HbAction *)), 0);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemNameInRename == "");
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "");
 QCOMPARE(HbInputDialog::mOpenCallCount, 1);
 QVERIFY(HbInputDialog::mValueCallCount == 1);
 // Dialog canceled
 HbInputDialog::mValueReturnValue = "";
 HbInputDialog::mValueCallCount = 0;
 HbInputDialog::mOpenCallCount = 0;
-VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+VideoProxyModelData::mLastItemNameInRename = "";
 data = QString("albumName");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
 dialog->emitDialogFinished(mTestWidget, SLOT(renameDialogFinished(HbAction *)), 1);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemNameInRename == "");
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "");
 QCOMPARE(HbInputDialog::mOpenCallCount, 1);
 QVERIFY(HbInputDialog::mValueCallCount == 0);
 // New name is empty.
-VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+VideoProxyModelData::mLastItemNameInRename = "";
 HbInputDialog::mValueReturnValue = "";
 HbInputDialog::mValueCallCount = 0;
 HbInputDialog::mOpenCallCount = 0;
 data = QString("albumName");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
 dialog->emitDialogFinished(mTestWidget, SLOT(renameDialogFinished(HbAction *)), 0);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemNameInRename == "");
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "");
 QCOMPARE(HbInputDialog::mOpenCallCount, 1);
 QVERIFY(HbInputDialog::mValueCallCount == 1);
 // Item is video
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeVideo));
+VideoProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeVideo));
-VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+VideoProxyModelData::mLastItemNameInRename = "";
 HbInputDialog::mValueReturnValue = "renamedVideo";
 HbInputDialog::mValueCallCount = 0;
 HbInputDialog::mOpenCallCount = 0;
 data = QString("oldVideoNama");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
 dialog->emitDialogFinished(mTestWidget, SLOT(renameDialogFinished(HbAction *)), 0);
 QCOMPARE(HbInputDialog::mOpenCallCount, 1);
 QVERIFY(HbInputDialog::mValueCallCount == 1);
-QVERIFY(VideoSortFilterProxyModelData::mLastItemNameInRename == "renamedVideo");
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "renamedVideo");
+// Item is album
+VideoProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
+VideoProxyModelData::mLastItemNameInRename = "";
+HbInputDialog::mValueReturnValue = "renamedAlbum";
+HbInputDialog::mValueCallCount = 0;
+HbInputDialog::mOpenCallCount = 0;
+data = QString("oldAlbumName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+dialog->emitDialogFinished(mTestWidget, SLOT(renameDialogFinished(HbAction *)), 0);
+QCOMPARE(HbInputDialog::mOpenCallCount, 1);
+QVERIFY(HbInputDialog::mValueCallCount == 1);
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "renamedAlbum");
+// Item is category
+VideoProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeCategory));
+VideoProxyModelData::mLastItemNameInRename = "";
+HbInputDialog::mValueReturnValue = "notallowed";
+HbInputDialog::mValueCallCount = 0;
+HbInputDialog::mOpenCallCount = 0;
+data = QString("oldCategoryName");
+VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
+mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
+emit testSignal();
+QCOMPARE(HbInputDialog::mOpenCallCount, 0);
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "");
 // No model
-VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+VideoProxyModelData::mLastItemNameInRename = "";
 HbInputDialog::mValueReturnValue = "";
 HbInputDialog::mValueCallCount = 0;
 HbInputDialog::mOpenCallCount = 0;
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
+VideoProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
 data = QString("albumName");
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
-VideoSortFilterProxyModel *tmp = mTestWidget->mModel;
+VideoProxyModelGeneric *tmp = mTestWidget->mModel;
 mTestWidget->mModel = 0;
 emit testSignal();
 mTestWidget->mModel = tmp;
-QVERIFY(VideoSortFilterProxyModelData::mLastItemNameInRename == "");
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "");
 QCOMPARE(HbInputDialog::mOpenCallCount, 0);
 // Variant data is invalid
-VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+VideoProxyModelData::mLastItemNameInRename = "";
 HbInputDialog::mValueReturnValue = "renamedVideo";
 HbInputDialog::mValueCallCount = 0;
 HbInputDialog::mOpenCallCount = 0;
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
+VideoProxyModelData::mItemIds.append(TMPXItemId(0, KVcxMvcMediaTypeAlbum));
 data = QVariant();
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
-QVERIFY(VideoSortFilterProxyModelData::mLastItemNameInRename == "");
+QVERIFY(VideoProxyModelData::mLastItemNameInRename == "");
 QCOMPARE(HbInputDialog::mOpenCallCount, 0);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(renameSlot()));
 }
 {
 // testEmitActivated has already tested the doEmitActivated functionality.
 // Just verify here, that the openItemSlot calls doEmitActivated.
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(openItemSlot()));
 setRowCount(1);
 TMPXItemId savedId = TMPXItemId(1,1);
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(savedId);
+VideoProxyModelData::mItemIds.append(savedId);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 // Making the context menu visible ensures that the doEmitActivated is called
 // instead of just emitActivated, as emitActivated does nothing if context menu
 // is already visible.
 }
 mTestWidget->mContextMenu->show();
 emit testSignal();
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == savedId);
+QVERIFY(VideoProxyModelData::mLastItemId == savedId);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(openItemSlot()));
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testPlayItemSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(playItemSlot()));
 setRowCount(1);
 TMPXItemId savedId = TMPXItemId(1,1);
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(savedId);
+VideoProxyModelData::mItemIds.append(savedId);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId == savedId);
+QVERIFY(VideoProxyModelData::mLastItemId == savedId);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(playItemSlot()));
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testAddToCollectionSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 VideoListSelectionDialogData::mSelectionType = -1;
 VideoListSelectionDialogData::mSettedMpxId = TMPXItemId::InvalidId();
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(addToCollectionSlot()));
 setRowCount(1);
 TMPXItemId savedId = TMPXItemId(1,1);
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(savedId);
+VideoProxyModelData::mItemIds.append(savedId);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 // no model
 emit testSignal();
 QVERIFY(VideoListSelectionDialogData::mSelectionType == -1 );
 QVERIFY(VideoListSelectionDialogData::mSelectionType == -1 );
 QVERIFY(VideoListSelectionDialogData::mSettedMpxId == TMPXItemId::InvalidId());
 VideoCollectionUiLoaderData::mFindFailureNameList.clear();
 // invalid id at current index
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId::InvalidId());
+VideoProxyModelData::mItemIds.append(TMPXItemId::InvalidId());
 emit testSignal();
 QVERIFY(VideoListSelectionDialogData::mSelectionType == -1 );
 QVERIFY(VideoListSelectionDialogData::mSettedMpxId == TMPXItemId::InvalidId());
 // valid id at current index
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
-VideoSortFilterProxyModelData::mItemIds.append(savedId);
+VideoProxyModelData::mItemIds.append(savedId);
 emit testSignal();
 QVERIFY(VideoListSelectionDialogData::mSelectionType == VideoListSelectionDialog::ESelectCollection );
 QVERIFY(VideoListSelectionDialogData::mSettedMpxId == savedId);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(addToCollectionSlot()));
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testRemoveFromCollectionSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
-VideoSortFilterProxyModelData::mRemoveItemsFromAlbumReturnValue = 0;
+VideoProxyModelData::mRemoveItemsFromAlbumReturnValue = 0;
-VideoSortFilterProxyModelData::mLastItemId = TMPXItemId::InvalidId();
+VideoProxyModelData::mLastItemId = TMPXItemId::InvalidId();
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(removeFromCollectionSlot()));
 setRowCount(2);
 TMPXItemId savedId = TMPXItemId(1,1);
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
 // invalid id at index 0
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId::InvalidId());
+VideoProxyModelData::mItemIds.append(TMPXItemId::InvalidId());
-VideoSortFilterProxyModelData::mItemIds.append(savedId);
+VideoProxyModelData::mItemIds.append(savedId);
 HbListView::mCurrentIndex = model->index(1, 0, QModelIndex());
 // no model
 emit testSignal();
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId  == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId  == TMPXItemId::InvalidId());
 mTestWidget->initialize(*model);
-VideoSortFilterProxyModelData::mOpenedItemId = TMPXItemId::InvalidId();
+VideoProxyModelData::mOpenedItemId = TMPXItemId::InvalidId();
 // collection id is invalid
 emit testSignal();
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId  == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId  == TMPXItemId::InvalidId());
-VideoSortFilterProxyModelData::mOpenedItemId = TMPXItemId(1,2);
+VideoProxyModelData::mOpenedItemId = TMPXItemId(1,2);
 // media at current index is invalid
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 emit testSignal();
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId  == TMPXItemId::InvalidId());
+QVERIFY(VideoProxyModelData::mLastItemId  == TMPXItemId::InvalidId());
 // all is ok
 HbListView::mCurrentIndex = model->index(1, 0, QModelIndex());
 emit testSignal();
-QVERIFY(VideoSortFilterProxyModelData::mLastItemId  == TMPXItemId(1,2));
+QVERIFY(VideoProxyModelData::mLastItemId  == TMPXItemId(1,2));
-// ids are to be saved at VideoSortFilterProxyModelData::mItemIds
+// ids are to be saved at VideoProxyModelData::mItemIds
-QVERIFY(VideoSortFilterProxyModelData::mItemIds.at(0) == savedId);
+QVERIFY(VideoProxyModelData::mItemIds.at(0) == savedId);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(removeFromCollectionSlot()));
 }
 // ---------------------------------------------------------------------------
 // testRemoveCollectionSlot
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testRemoveCollectionSlot()
 {
-VideoSortFilterProxyModelData::mRemoveAlbumsFails = false;
+VideoProxyModelData::mRemoveAlbumsFails = false;
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 HbMessageBoxData::mQuestionReturnValue = true;
 HbMessageBoxData::mLatestTxt = "";
-VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
+VideoProxyModelData::mLastIndex = QModelIndex();
 setRowCount(1);
 HbListView::mCurrentIndex = model->index(0, 0, QModelIndex());
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(removeCollectionSlot()));
 HbMessageBox *box = new HbMessageBox();
 setRowCount(2);
 TMPXItemId savedId = TMPXItemId(1,1);
-VideoSortFilterProxyModelData::mItemIds.clear();
+VideoProxyModelData::mItemIds.clear();
 // invalid id at index 0
-VideoSortFilterProxyModelData::mItemIds.append(TMPXItemId::InvalidId());
+VideoProxyModelData::mItemIds.append(TMPXItemId::InvalidId());
-VideoSortFilterProxyModelData::mItemIds.append(savedId);
+VideoProxyModelData::mItemIds.append(savedId);
 HbListView::mCurrentIndex = model->index(1, 0, QModelIndex());
 // no model
 emit testSignal();
-QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(!VideoProxyModelData::mLastIndex.isValid());
 QVERIFY(HbMessageBoxData::mLatestTxt.isEmpty());
 mTestWidget->initialize(*model);
 // invalid data
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, QVariant());
 emit testSignal();
-QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(!VideoProxyModelData::mLastIndex.isValid());
 QVERIFY(HbMessageBoxData::mLatestTxt.isEmpty());
 // valid data
 VideoListDataModelData::setData(VideoCollectionCommon::KeyTitle, "test");
 emit testSignal();
 box->emitDialogFinished(mTestWidget, SLOT(removeCollectionDialogFinished(int)), HbMessageBox::Yes);
-QVERIFY(VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(VideoProxyModelData::mLastIndex.isValid());
-QVERIFY(VideoSortFilterProxyModelData::mLastIndex.row() == 1);
+QVERIFY(VideoProxyModelData::mLastIndex.row() == 1);
 QVERIFY(!HbMessageBoxData::mLatestTxt.isEmpty());
 // msg box return false (for coverity)
-VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
+VideoProxyModelData::mLastIndex = QModelIndex();
 HbMessageBoxData::mLatestTxt = "";
 HbMessageBoxData::mQuestionReturnValue = false;
 emit testSignal();
 box->emitDialogFinished(mTestWidget, SLOT(removeCollectionDialogFinished(int)), HbMessageBox::No);
-QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(!VideoProxyModelData::mLastIndex.isValid());
 QVERIFY(!HbMessageBoxData::mLatestTxt.isEmpty());
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(removeCollectionSlot()));
 }
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testOpenDetailsSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 QSignalSpy spysignal(mTestWidget, SIGNAL(command(int)));
 HbMessageBoxData::mLatestTxt = "";
-VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
+VideoProxyModelData::mLastIndex = QModelIndex();
 setRowCount(0);
 mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(openDetailsSlot()));
 // no model
-VideoSortFilterProxyModel *tmp = mTestWidget->mModel;
+VideoProxyModelGeneric *tmp = mTestWidget->mModel;
 mTestWidget->mModel = 0;
 emit testSignal();
 QVERIFY(spysignal.count() == 0);
-QVERIFY(!VideoSortFilterProxyModelData::mLastIndex.isValid());
+QVERIFY(!VideoProxyModelData::mLastIndex.isValid());
 mTestWidget->mModel = tmp;
 // detail fetch fails
 setRowCount(1);
 QVariant data = QString("test");
 VideoListDataModelData::setData(Qt::DisplayRole, data);
 mTestWidget->mCurrentIndex = model->index(0, 0, QModelIndex());
-VideoSortFilterProxyModelData::mDetailsReturnValue = -1;
+VideoProxyModelData::mDetailsReturnValue = -1;
 emit testSignal();
 QVERIFY(spysignal.count() == 0);
-QVERIFY(VideoSortFilterProxyModelData::mLastIndex.row() == 0);
+QVERIFY(VideoProxyModelData::mLastIndex.row() == 0);
 // detail fetch succeeds
-VideoSortFilterProxyModelData::mDetailsReturnValue = 0;
+VideoProxyModelData::mDetailsReturnValue = 0;
-VideoSortFilterProxyModelData::mLastIndex = QModelIndex();
+VideoProxyModelData::mLastIndex = QModelIndex();
 emit testSignal();
 QVERIFY(spysignal.count() == 1);
 QVERIFY(spysignal.at(0).at(0).isValid());
 QVERIFY(spysignal.at(0).at(0).toInt() == MpxHbVideoCommon::ActivateVideoDetailsView);
-QVERIFY(VideoSortFilterProxyModelData::mLastIndex.row() == 0);
+QVERIFY(VideoProxyModelData::mLastIndex.row() == 0);
 disconnect(this, SIGNAL(testSignal()), mTestWidget, SLOT(openDetailsSlot()));
 }
 // ---------------------------------------------------------------------------
 // testBack
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testBack()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 QSignalSpy spysignal(mTestWidget, SIGNAL(collectionOpened(bool, const QString&, const TMPXItemId&)));
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(back()));
 // no model
 emit testSignal();
 //
 void TestListWidget::testScrollingEndedSlot()
 {
 VideoThumbnailTestData::mBackgroundThumbnailFetchingEnabled = true;
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 connect(this, SIGNAL(testSignal()), mTestWidget, SLOT(scrollingEndedSlot()));
 // no visible items
 // ---------------------------------------------------------------------------
 //
 void TestListWidget::testScrollPositionChangedSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 const QPointF point;
 connect(this, SIGNAL(testSignal(const QPointF&)), mTestWidget, SLOT(scrollPositionChangedSlot(const QPointF&)));
 }
 void TestListWidget::testRowsInsertedSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 // setup few "visible" items to trigger the fetch
 int count = 10;
 }
 void TestListWidget::testRowsRemovedSlot()
 {
 VideoCollectionWrapper &wrapper = VideoCollectionWrapper::instance();
-VideoSortFilterProxyModel *model = wrapper.getModel(VideoCollectionCommon::EModelTypeAllVideos);
+VideoProxyModelGeneric *model = wrapper.getAllVideosModel();
 mTestWidget->initialize(*model);
 // setup few "visible" items to trigger the fetch
 int count = 10;

changeset 62	0e1e938beb1a
parent 52	e3cecb93e76a