diff -r adb51f74b890 -r 72c709219fcd videocollection/videocollectionview/tsrc/testvideolistselectiondialog/src/testvideolistselectiondialog.cpp
--- a/videocollection/videocollectionview/tsrc/testvideolistselectiondialog/src/testvideolistselectiondialog.cpp	Tue Oct 05 09:26:49 2010 +0300
+++ b/videocollection/videocollectionview/tsrc/testvideolistselectiondialog/src/testvideolistselectiondialog.cpp	Fri Oct 15 16:29:10 2010 +0300
@@ -19,31 +19,24 @@
 #include <qapplication.h>
 #include "hbview.h"
 #include "hbabstractitemview.h"
-#include "hbdocumentloader.h"
-#include "hbstackedwidget.h"
-#include "hbcheckbox.h"
 #include "hbinputdialog.h"
-#include "hbdialog.h"
+#include "hbselectiondialog.h"
 #include "hbwidget.h"
 #include "hblistview.h"
-#include "hbmessagebox.h"
 
 #include "testvideolistselectiondialog.h"
 
-#include "videocollectionuiloader.h"
 #include "videolistdatamodel.h"
 #include "videoproxymodelgeneric.h"
-#include "videolistwidget.h"
 #include "videocollectionwrapper.h"
 #include "videocollectioncommon.h"
 #include <vcxmyvideosdefs.h>
 
 #include "videolistdatamodeldata.h"
 #include "videocollectionwrapperdata.h"
-#include "videocollectionuiloaderdata.h"
-#include "videolistwidgetdata.h"
 #include "videoproxymodeldata.h"
 #include "videocollectionviewutilsdata.h"
+#include "videothumbnailtestdata.h"
 
 #define private public
 #include "videolistselectiondialogtester.h"
@@ -137,13 +130,10 @@
 {
     mTestObject = 0;
     mModel = 0;
-    mTestUiLoader = 0;
-    mTestWidget = 0;
     
     mInitOk = false;
     
-    mTestUiLoader = new VideoCollectionUiLoader();
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     mModel = VideoCollectionWrapper::instance().getGenericModel();
     
     mTestHelper->mTestable = mTestObject;
@@ -166,12 +156,11 @@
     delete mTestObject; 
     mTestObject = 0;
     
-    delete mTestUiLoader;
-    mTestUiLoader = 0;  
-    
     mSourceModel = 0;
     
     mModel = 0;
+    
+    VideoThumbnailTestData::reset();
 }
 
 // ---------------------------------------------------------------------------
@@ -193,21 +182,15 @@
     
     // Getting model fails 
     VideoCollectionWrapperData::mGetGenericModelFails = true;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     QVERIFY(mTestObject->mModel == 0);
-    QVERIFY(mTestObject->mListWidget == 0);
     
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
     mTestObject = 0;
 
-    // List widget initialize fails
     VideoCollectionWrapperData::mGetGenericModelFails = false;
-    VideoListWidgetData::mInitializeReturnValue = -1;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
-    QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget == 0);
 }
 
 // ---------------------------------------------------------------------------
@@ -217,7 +200,6 @@
 void TestVideoListSelectionDialog::testSetupContent()
 {
     VideoCollectionWrapperData::reset();
-    VideoListWidgetData::reset();
     
     QVERIFY(mInitOk == true);
     QVERIFY(mModel != 0);
@@ -226,9 +208,7 @@
     
     // invalid type provided, object's internal data will not change
     mTestObject->mTypeOfSelection = VideoListSelectionDialog::EDeleteVideos;
-    mTestObject->setupContent(-1, mpxId);
-    QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
-    mTestObject->setupContent(600, mpxId);
+    mTestObject->setupContent(VideoListSelectionDialog::ENoFunction, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
     
     // No data. type EDeleteVideos. Default mpx item 
@@ -236,19 +216,11 @@
     mpxId = TMPXItemId();
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 1);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -261,19 +233,11 @@
     // second setup (for coverity)
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 1);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -284,7 +248,7 @@
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     VideoProxyModelData::reset();
     
     // No data. type ESelectCollection. Default mpx item 
@@ -292,19 +256,11 @@
     mpxId = TMPXItemId();
     mTestObject->setupContent(VideoListSelectionDialog::ESelectCollection, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::ESelectCollection);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 1);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == false);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -315,7 +271,7 @@
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     VideoProxyModelData::reset();
     
     // No data. type EAddToCollection:. Default mpx item 
@@ -323,19 +279,11 @@
     mpxId = TMPXItemId();
     mTestObject->setupContent(VideoListSelectionDialog::EAddToCollection, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EAddToCollection);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 1);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -348,19 +296,11 @@
     mpxId = TMPXItemId();
     mTestObject->setupContent(VideoListSelectionDialog::ECreateCollection, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::ECreateCollection);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 1);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -371,7 +311,7 @@
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     VideoProxyModelData::reset();
     
     // No data. type ERemoveFromCollection:. Default mpx item 
@@ -379,19 +319,11 @@
     mpxId = TMPXItemId();
     mTestObject->setupContent(VideoListSelectionDialog::ERemoveFromCollection, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::ERemoveFromCollection);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 1);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -402,7 +334,7 @@
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);    
+    mTestObject = new VideoListSelectionDialog();    
     VideoProxyModelData::reset();
     
     // Some data, mpx item type is album 
@@ -410,19 +342,11 @@
     mpxId = TMPXItemId(0, KVcxMvcMediaTypeAlbum);
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 0);
     QVERIFY(mTestObject->mSelectedAlbumId == mpxId);
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -433,26 +357,18 @@
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     VideoProxyModelData::reset();
     
     // Some data, mpx item type is invalid: category
     mpxId = TMPXItemId(0, KVcxMvcMediaTypeCategory);
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 0);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -463,26 +379,18 @@
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     VideoProxyModelData::reset();
     
     // Some data, mpx item type is invalid id
     mpxId = TMPXItemId::InvalidId();
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 0);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);  
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -492,25 +400,14 @@
    
     VideoProxyModelData::reset();
     // some data, second initialization without widget and model, for coverity
-    delete mTestObject->mListWidget;
-    mTestObject->mListWidget = 0;
     mTestObject->mModel = 0;
-    mTestObject->mListContainer = 0;
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::EDeleteVideos);
-    QCOMPARE(mTestObject->mSelection.count(), 0);
     QCOMPARE(mTestObject->mSelectedVideos.count(), 0);
     QVERIFY(mTestObject->mSelectedAlbumId == TMPXItemId::InvalidId());
     QVERIFY(mTestObject->mNewAlbumText.isNull());
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);
-    QVERIFY(mTestObject->mListContainer != 0);
-    QVERIFY(mTestObject->mListContainer->mCurrentWidget == mTestObject->mListWidget);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mCheckboxContainer->isVisible() == true);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);
+    QVERIFY(mTestObject->mScrollPositionTimer != 0);
     QVERIFY(mTestObject->mPrimaryAction != 0);
     QVERIFY(mTestObject->mSecondaryAction != 0);  
     QVERIFY(VideoProxyModelData::mGenericFilterId == mpxId);
@@ -530,28 +427,22 @@
     // initDialog fails because model get fails. 
     QVERIFY(mTestObject->mModel != 0);
     VideoProxyModelGeneric *backup = mTestObject->mModel;
-    VideoListWidget *backupWidget = mTestObject->mListWidget;
     mTestObject->mModel = 0;
-    mTestObject->mListWidget = 0;
     VideoCollectionWrapperData::mGetGenericModelFails = true;
     mpxId = TMPXItemId(0, KVcxMvcMediaTypeVideo);
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     VideoCollectionWrapperData::mGetGenericModelFails = false;
     QVERIFY(mTestObject->mModel == 0);
-    QVERIFY(mTestObject->mListWidget == 0);
-    QVERIFY(mTestObject->mListContainer == 0);
-    QVERIFY(mTestObject->mHeading == 0);
-    QVERIFY(mTestObject->mCheckboxContainer == 0);
-    QVERIFY(mTestObject->mItemCount == 0);
-    QVERIFY(mTestObject->mCheckBox == 0);
+    QVERIFY(mTestObject->mScrollPositionTimer == 0);
     mTestObject->mModel = backup; backup = 0;
-    mTestObject->mListWidget = backupWidget; backupWidget = 0;
     
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
+    mTestObject = new VideoListSelectionDialog();
     
+	/*
+	 * TODO
     // initDialog fails because mListWidget::initialize
     QVERIFY(mTestObject->mModel != 0);
     VideoListWidgetData::mInitializeReturnValue = -1;
@@ -560,33 +451,14 @@
     mpxId = TMPXItemId(0, KVcxMvcMediaTypeVideo);
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
     QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget == 0);    
-    QVERIFY(mTestObject->mListContainer == 0);
-    QVERIFY(mTestObject->mHeading == 0);
-    QVERIFY(mTestObject->mCheckboxContainer == 0);
-    QVERIFY(mTestObject->mItemCount == 0);
-    QVERIFY(mTestObject->mCheckBox == 0);  
+    QVERIFY(mTestObject->mScrollPositionTimer == 0);
     VideoListWidgetData::mInitializeReturnValue = 0;
     
     if(mTestHelper) 
         mTestHelper->disconnectSignals();
     delete mTestObject;
-    mTestObject = new VideoListSelectionDialog(mTestUiLoader);
-    
-    // initdialog fails because DOCML_NAME_LIST_CONTAINER finding fails
-    VideoCollectionUiLoaderData::mFindFailure = false;
-    VideoCollectionUiLoaderData::mFindFailureNameList.clear();
-    VideoCollectionUiLoaderData::mFindFailureNameList.append(DOCML_NAME_LIST_CONTAINER);
-    mpxId = TMPXItemId(0, KVcxMvcMediaTypeVideo);
-    mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
-    QVERIFY(mTestObject->mModel != 0);
-    QVERIFY(mTestObject->mListWidget != 0);    
-    QVERIFY(mTestObject->mListContainer == 0);
-    QVERIFY(mTestObject->mHeading != 0);
-    QVERIFY(mTestObject->mCheckboxContainer != 0);
-    QVERIFY(mTestObject->mItemCount != 0);
-    QVERIFY(mTestObject->mCheckBox != 0);     
-    VideoCollectionUiLoaderData::mFindFailureNameList.clear();
+    mTestObject = new VideoListSelectionDialog();
+	*/
 }
 
 // ---------------------------------------------------------------------------
@@ -700,7 +572,7 @@
     
     ////////////
     // mTypeOfSelection == ESelectCollection     
-    //  mSelectedAlbumId != TMPXItemId::InvalidId())    
+    // mSelectedAlbumId != TMPXItemId::InvalidId())    
     VideoCollectionViewUtilsData::mLastError = -1;    
     mTestObject->setupContent(VideoListSelectionDialog::ESelectCollection, mpxId);
     mTestObject->mSelectedVideos.insert(TMPXItemId(1,0));
@@ -886,63 +758,25 @@
     QVERIFY(VideoCollectionViewUtilsData::mLastError == VideoCollectionCommon::statusDeleteInProgress);
     
     // invalid type
-    mTestObject->mTypeOfSelection = 500;
+    mTestObject->mTypeOfSelection = VideoListSelectionDialog::ENoFunction;
     VideoCollectionViewUtilsData::mLastError = -1;
     mTestObject->mSelectedVideos.insert(TMPXItemId(1,0));
     mTestObject->mSelectedVideos.insert(TMPXItemId(2,0));
     VideoProxyModelData::reset();
     mTestObject->exec();  
-    QVERIFY(mTestObject->mTypeOfSelection == 500);
+    QVERIFY(mTestObject->mTypeOfSelection == VideoListSelectionDialog::ENoFunction);
     QVERIFY(VideoCollectionViewUtilsData::mLastError == -1);
     QVERIFY(!VideoProxyModelData::mItemIds.count());
-   
 }
 
-void TestVideoListSelectionDialog::testMarkAllStateChangedSlot()
+
+void TestVideoListSelectionDialog::testSelectionChangedSlot()
 {
-    VideoCollectionWrapperData::reset();
-    VideoListWidgetData::reset();
-    VideoProxyModelData::reset();
-
     mTestHelper->mTestable = mTestObject;
     mTestHelper->connectSignals();
     
-    HbListView::mAllSelectedStatus = -1;
-    
-    // forced check
-    mTestObject->mForcedCheck = true;
-    mTestHelper->emitMarkAllStateChanged(Qt::Checked);
-    mTestObject->mForcedCheck = false;
-    QVERIFY(HbListView::mAllSelectedStatus == -1);
-    
-    // checked
-    mTestHelper->emitMarkAllStateChanged(Qt::Checked);
-    QVERIFY(HbListView::mAllSelectedStatus == 1);
-    HbListView::mAllSelectedStatus = -1;
-    
-    // unchecked
-    mTestHelper->emitMarkAllStateChanged(Qt::Unchecked);
-    QVERIFY(HbListView::mAllSelectedStatus == 0);
-    
-    HbListView::mAllSelectedStatus = -1;
-    
-    mTestHelper->disconnectSignals();
-
-}
-
-void TestVideoListSelectionDialog::testSelectionChangedSlot()
-{
-    QItemSelection selected;
-    QItemSelection deselected;
-    
-    mTestHelper->mTestable = mTestObject;
-    mTestHelper->connectSignals();
-    
-    mTestObject->mSelection.clear();
-    
     // no primary action
-    mTestHelper->emitSelectionChangedSlot(selected, deselected);
-    QVERIFY(!mTestObject->mSelection.count());
+    mTestHelper->emitSelectionChangedSlot();
     
     TMPXItemId mpxId = TMPXItemId::InvalidId();
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, TMPXItemId(1,1));
@@ -951,18 +785,21 @@
     
     // select item
     mTestObject->mPrimaryAction->setEnabled(false);
-    QModelIndex index = mModel->index(0, 0);
-    QItemSelectionRange range(mModel->index(0, 0));
-    selected.append(range);
-    mTestHelper->emitSelectionChangedSlot(selected, deselected);
-    QVERIFY(mTestObject->mSelection.count() == 1);
+    {
+        QModelIndex index = mModel->index(0, 0);
+        QModelIndexList selected;
+        selected.append(index);
+        mTestObject->setSelectedModelIndexes(selected);
+    }
+    mTestHelper->emitSelectionChangedSlot();
     QVERIFY(mTestObject->mPrimaryAction->isEnabled() == true);
     
     // deselect item
-    selected.clear();
-    deselected.append(range);
-    mTestHelper->emitSelectionChangedSlot(selected, deselected);
-    QVERIFY(mTestObject->mSelection.count() == 0);
+    {
+        QModelIndexList selected;
+        mTestObject->setSelectedModelIndexes(selected);
+    }
+    mTestHelper->emitSelectionChangedSlot();
     QVERIFY(mTestObject->mPrimaryAction->isEnabled() == false);
     
     mTestObject->setupContent(VideoListSelectionDialog::ECreateCollection, TMPXItemId::InvalidId());
@@ -970,46 +807,28 @@
     QCOMPARE(mTestObject->mPrimaryAction->text(), hbTrId("txt_common_button_ok"));
     
     // select item, type ECreateCollection
-    deselected.clear();
-    selected.append(range);
-    mTestHelper->emitSelectionChangedSlot(selected, deselected);
-    QVERIFY(mTestObject->mSelection.count() == 1);
+    {
+        QModelIndex index = mModel->index(0, 0);
+        QModelIndexList selected;
+        selected.append(index);
+        mTestObject->setSelectedModelIndexes(selected);
+    }
+    mTestHelper->emitSelectionChangedSlot();
     QVERIFY(mTestObject->mPrimaryAction->isEnabled() == true);
     QCOMPARE(mTestObject->mPrimaryAction->text(), hbTrId("txt_common_button_add"));
     
-    // desect item, type ECreateCollection
-    selected.clear();
-    deselected.append(range);
-    mTestHelper->emitSelectionChangedSlot(selected, deselected);
-    QVERIFY(mTestObject->mSelection.count() == 0);
+    // deselect item, type ECreateCollection
+    {
+        QModelIndexList selected;
+        mTestObject->setSelectedModelIndexes(selected);
+    }
+    mTestHelper->emitSelectionChangedSlot();
     QVERIFY(mTestObject->mPrimaryAction->isEnabled() == true);
     QCOMPARE(mTestObject->mPrimaryAction->text(), hbTrId("txt_common_button_ok"));
     
     mTestHelper->disconnectSignals();
 }
 
-void TestVideoListSelectionDialog::testSingleItemSelectedSlot()
-{
-    mTestHelper->mTestable = mTestObject;
-    mTestHelper->connectSignals();
-    
-    setRowCount(10);
-    TMPXItemId mpxId = TMPXItemId::InvalidId();
-    mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
-    
-    mTestObject->mTypeOfSelection = VideoListSelectionDialog::ESelectCollection;
-    mTestHelper->emitSingleItemSelectedSlot(mModel->index(0, 0));
-    
-    mTestObject->mTypeOfSelection = VideoListSelectionDialog::ESelectCollection;
-    QModelIndex invalidIndex;
-    mTestHelper->emitSingleItemSelectedSlot(invalidIndex);
-    
-    mTestObject->mTypeOfSelection = VideoListSelectionDialog::EDeleteVideos;
-    mTestHelper->emitSingleItemSelectedSlot(mModel->index(0, 0));
-    
-    mTestHelper->disconnectSignals();
-}
-
 void TestVideoListSelectionDialog::testModelReadySlot()
 {
 
@@ -1053,68 +872,17 @@
     // type ECreateCollection, dialog hidden
     mTestObject->setupContent(VideoListSelectionDialog::ECreateCollection, TMPXItemId::InvalidId());
     mTestObject->hide();
-    HbListView::mLatestScrollToIndex = index;
     mTestHelper->emitModelReadySlot();
-    QCOMPARE(HbListView::mLatestScrollToIndex, index);
     
     // type EDeleteVideos, dialog hidden.
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, TMPXItemId(1,2));
     mTestObject->hide();
     mTestHelper->emitModelReadySlot();
-    QCOMPARE(HbListView::mLatestScrollToIndex, mModel->index(0, 0));
     
     // type EDeleteVideos, dialog visible.
     mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, TMPXItemId(1,2));
-    HbListView::mLatestScrollToIndex = index;
     mTestObject->setVisible(true);
     mTestHelper->emitModelReadySlot();
-    QCOMPARE(HbListView::mLatestScrollToIndex, index);
-    
-    mTestHelper->disconnectSignals();
-}
-
-void TestVideoListSelectionDialog::testUpdateCounterSlot()
-{
-    mTestHelper->mTestable = mTestObject;
-    mTestHelper->connectSignals();
-    
-    TMPXItemId mpxId = TMPXItemId::InvalidId();
-    mTestObject->setupContent(VideoListSelectionDialog::EDeleteVideos, mpxId);
-    
-    // itemCount is null
-    HbLabel *labelBackup = mTestObject->mItemCount;
-    mTestObject->mCheckBox->setChecked(true);
-    mTestObject->mItemCount = 0;
-    mTestHelper->emitUpdateCounterSlot();
-    mTestObject->mItemCount = labelBackup;
-    QVERIFY(mTestObject->mCheckBox->mChecked == true);
-    
-    // no items in model
-    setRowCount(0);
-    mTestObject->mCheckBox->setChecked(true);
-    mTestHelper->emitUpdateCounterSlot();
-    QVERIFY(mTestObject->mCheckBox->mChecked == false);
-
-    // all selected.
-    setRowCount(1);
-    mTestObject->mCheckBox->setChecked(false);
-    QItemSelection selected;
-    QItemSelectionRange range(mTestObject->mModel->index(0, 0));
-    selected.append(range);
-    mTestObject->mSelection.merge(selected, QItemSelectionModel::Select);
-    mTestHelper->emitUpdateCounterSlot();
-    QVERIFY(mTestObject->mCheckBox->mChecked == true);
-    
-    // not all selected
-    setRowCount(10);
-    mTestObject->mCheckBox->setChecked(true);
-    selected.clear();
-    range = QItemSelectionRange(mModel->index(0, 0));
-    selected.append(range);
-    mTestObject->mSelection.clear();
-    mTestObject->mSelection.merge(selected, QItemSelectionModel::Select);
-    mTestHelper->emitUpdateCounterSlot();
-    QVERIFY(mTestObject->mCheckBox->mChecked == false);
     
     mTestHelper->disconnectSignals();
 }
@@ -1160,7 +928,7 @@
     mTestObject->mSelectedAlbumId = TMPXItemId::InvalidId();
     mTestObject->mPrimaryAction->mTriggeredCount = 0;
     mTestObject->mSecondaryAction->mTriggeredCount = 0;
-    mTestObject->mTypeOfSelection = 555;
+    mTestObject->mTypeOfSelection = VideoListSelectionDialog::ENoFunction;
     mTestHelper->emitPrimaryActionTriggeredSlot();
     QCOMPARE(mTestObject->mPrimaryAction->mTriggeredCount, 0);
     QCOMPARE(mTestObject->mSecondaryAction->mTriggeredCount, 0);
@@ -1191,10 +959,10 @@
     VideoProxyModelData::mItemIds.append(TMPXItemId(1,2));
     
     // videos selected, other one's type is not video
-    QItemSelection selected;
-    QItemSelectionRange range(mTestObject->mModel->index(0, 0), mTestObject->mModel->index(1, 0));
-    selected.append(range);
-    mTestObject->mSelection.merge(selected, QItemSelectionModel::Select);
+    QModelIndexList selected;
+    selected.append(mTestObject->mModel->index(0, 0));
+    selected.append(mTestObject->mModel->index(1, 0));
+    mTestObject->setSelectedModelIndexes(selected);
     mTestObject->mPrimaryAction->mTriggeredCount = 0;
     mTestObject->mSecondaryAction->mTriggeredCount = 0;
     mTestObject->mTypeOfSelection = VideoListSelectionDialog::EAddToCollection;