--- a/videocollection/videocollectionview/tsrc/testlistview/src/testlistview.cpp Fri Jun 11 09:44:20 2010 +0300
+++ b/videocollection/videocollectionview/tsrc/testlistview/src/testlistview.cpp Thu Jun 24 09:49:13 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 46 %
+// Version : %version: 48 %
#define private public
#include "videoservices.h"
@@ -97,7 +97,7 @@
// init
// ---------------------------------------------------------------------------
//
-void TestListView::init(bool initTestView)
+void TestListView::init(bool initTestView )
{
XQServiceUtilXtra::service = false;
mUiLoader = new VideoCollectionUiLoader();
@@ -177,7 +177,8 @@
{
if (!mTestView->mCurrentList)
{
- mTestView->activateView(TMPXItemId::InvalidId());
+ TMPXItemId tmpId = TMPXItemId::InvalidId();
+ mTestView->activateView(tmpId);
}
model = mTestView->mCurrentList->mModel;
}
@@ -265,23 +266,21 @@
mTestView->mUiLoader = 0;
QVERIFY( mTestView->initializeView() < 0 );
QVERIFY( mTestView->mVideoServices == 0 );
- QVERIFY( mTestView->mIsService == false );
mTestView->mUiLoader = tmp;
// service flag is false and mVideoServices is != 0
- mTestView->mIsService = false;
XQServiceUtilXtra::service = false;
- mTestView->mVideoServices = VideoServices::instance();
+ VideoServices *tmpService = VideoServices::instance();
+ mTestView->mVideoServices = tmpService;
QVERIFY( mTestView->initializeView() == 0 );
- QVERIFY( mTestView->mVideoServices != 0 );
- QVERIFY( mTestView->mIsService == false );
-
- // servicve flag is true, mVideoServices is 0
+ QVERIFY( mTestView->mVideoServices == 0 );
+ tmpService->decreaseReferenceCount();
+
+ // service flag is true, mVideoServices is 0
mTestView->mVideoServices = 0;
XQServiceUtilXtra::service = true;
QVERIFY( mTestView->initializeView() == 0 );
QVERIFY( mTestView->mVideoServices != 0 );
- QVERIFY( mTestView->mIsService == true );
XQServiceUtilXtra::service = false;
cleanup();
@@ -294,7 +293,8 @@
void TestListView::testMenus()
{
init();
- mTestView->activateView(TMPXItemId::InvalidId());
+ TMPXItemId tmpId = TMPXItemId::InvalidId();
+ mTestView->activateView(tmpId);
HbAction* action = 0;
QList<QAction*> tbActions = mTestView->toolBar()->actions();
@@ -394,7 +394,8 @@
void TestListView::testCreateAction()
{
init();
- mTestView->activateView(TMPXItemId::InvalidId());
+ TMPXItemId tmpId = TMPXItemId::InvalidId();
+ mTestView->activateView(tmpId);
QVERIFY(mTestView->mToolbarViewsActionGroup != 0);
@@ -435,7 +436,7 @@
void TestListView::testActivateView()
{
VideoListWidget* videoListWidget = 0;
-
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
init();
HbMainWindow *mainWnd = hbInstance->allMainWindows().value(0);
@@ -443,7 +444,7 @@
VideoListWidget *backup = mTestView->mCurrentList;
mTestView->mCurrentList = 0;
HbDocumentLoader::mFindWidgetFails = true;
- QCOMPARE( mTestView->activateView(TMPXItemId::InvalidId()), -1 );
+ QCOMPARE( mTestView->activateView(invalidId), -1 );
QVERIFY( VideoListWidgetData::mActive == false );
QVERIFY( mTestView->mCurrentList == 0 );
QCOMPARE( VideoListWidgetData::mActivateCount, 0 );
@@ -455,21 +456,21 @@
videoListWidget = mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_VIDEOLISTWIDGET);
QVERIFY(videoListWidget);
VideoListWidgetData::mActivateReturnValue = -1;
- QCOMPARE( mTestView->activateView(TMPXItemId::InvalidId()), -1 );
+ QCOMPARE( mTestView->activateView(invalidId), -1 );
QVERIFY( VideoListWidgetData::mActive == false );
QCOMPARE( VideoListWidgetData::mActivateCount, 1 );
QCOMPARE( VideoListWidgetData::mDeactivateCount, 1 );
QVERIFY( mainWnd->mOrientationSet == false );
VideoListWidgetData::mActivateReturnValue = 0;
- QCOMPARE( mTestView->activateView(TMPXItemId::InvalidId()), 0 );
+ QCOMPARE( mTestView->activateView(invalidId), 0 );
QVERIFY( VideoListWidgetData::mActive );
QCOMPARE( VideoListWidgetData::mActivateCount, 2 );
QCOMPARE( VideoListWidgetData::mDeactivateCount, 1 );
QVERIFY( mainWnd->mOrientationSet );
QCOMPARE( mainWnd->mOrientation, Qt::Vertical );
- QCOMPARE( mTestView->activateView(TMPXItemId::InvalidId()), 0 );
+ QCOMPARE( mTestView->activateView(invalidId), 0 );
QVERIFY( VideoListWidgetData::mActive );
QCOMPARE( VideoListWidgetData::mActivateCount, 3 );
QCOMPARE( VideoListWidgetData::mDeactivateCount, 1 );
@@ -478,8 +479,7 @@
cleanup();
- // activate view:
- // -browse service
+ // activate collection content view:
// -captured category
TMPXItemId itemId = TMPXItemId::InvalidId();
init();
@@ -493,12 +493,9 @@
QCOMPARE(mTestView->mCollectionName, hbTrId("txt_videos_dblist_captured"));
QCOMPARE(mTestView->mCurrentList->getLevel(), VideoCollectionCommon::ELevelDefaultColl);
QCOMPARE(VideoSortFilterProxyModelData::mLastItemId, itemId);
- QCOMPARE(VideoSortFilterProxyModelData::mSortRole, (int)VideoCollectionCommon::KeyDateTime);
- QCOMPARE(VideoSortFilterProxyModelData::mSortOrder, Qt::AscendingOrder);
cleanup();
- // activate view:
- // -browse service
+ // activate collection content view::
// -downloaded category
init();
VideoListWidgetData::reset();
@@ -511,12 +508,9 @@
QCOMPARE(mTestView->mCollectionName, hbTrId("txt_videos_dblist_downloaded"));
QCOMPARE(mTestView->mCurrentList->getLevel(), VideoCollectionCommon::ELevelDefaultColl);
QCOMPARE(VideoSortFilterProxyModelData::mLastItemId, itemId);
- QCOMPARE(VideoSortFilterProxyModelData::mSortRole, (int)VideoCollectionCommon::KeyDateTime);
- QCOMPARE(VideoSortFilterProxyModelData::mSortOrder, Qt::AscendingOrder);
cleanup();
- // activate view:
- // -browse service
+ // activate collection content view:
// -other category
init();
videoListWidget = mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_VIDEOLISTWIDGET);
@@ -524,27 +518,28 @@
VideoSortFilterProxyModelData::reset();
itemId.iId1 = KVcxMvcCategoryIdOther;
itemId.iId2 = KVcxMvcMediaTypeCategory;
- QCOMPARE(mTestView->activateView(itemId), 0);
- QVERIFY(VideoListWidgetData::mActive);
- QCOMPARE(VideoListWidgetData::mActivateCount, 1);
+ QCOMPARE(mTestView->activateView(itemId), -1);
+ QVERIFY(VideoListWidgetData::mActive == false);
+ QCOMPARE(VideoListWidgetData::mActivateCount, 0);
QCOMPARE(mTestView->mCollectionName.length(), 0);
- //QCOMPARE(mTestView->mCurrentList->getLevel(), VideoCollectionCommon::ELevelVideos);
+ // for not activated widget, defaultlevel is ELevelVideos
+ QCOMPARE(mTestView->mCurrentList->getLevel(), VideoCollectionCommon::ELevelVideos);
QCOMPARE(VideoSortFilterProxyModelData::mLastItemId, TMPXItemId::InvalidId());
cleanup();
- // activate view:
- // -browse service
+ // activate collection content view:
// -invalid category but item id is ok
init();
VideoListWidgetData::reset();
VideoSortFilterProxyModelData::reset();
itemId.iId1 = 0;
itemId.iId2 = KVcxMvcMediaTypeVideo;
- QCOMPARE(mTestView->activateView(itemId), 0);
- QVERIFY(VideoListWidgetData::mActive);
- QCOMPARE(VideoListWidgetData::mActivateCount, 1);
+ QCOMPARE(mTestView->activateView(itemId), -1);
+ QVERIFY(VideoListWidgetData::mActive == false);
+ QCOMPARE(VideoListWidgetData::mActivateCount, 0);
QCOMPARE(mTestView->mCollectionName.length(), 0);
-// QCOMPARE(mTestView->mCurrentList->getLevel(), VideoCollectionCommon::ELevelVideos);
+ // for not activated widget, defaultlevel is ELevelVideos
+ QCOMPARE(mTestView->mCurrentList->getLevel(), VideoCollectionCommon::ELevelVideos);
QCOMPARE(VideoSortFilterProxyModelData::mLastItemId, TMPXItemId::InvalidId());
cleanup();
@@ -664,7 +659,7 @@
void TestListView::testDeactivateView()
{
VideoListWidget* videoListWidget = 0;
-
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
init();
HbMainWindow *mainWnd = hbInstance->allMainWindows().value(0);
@@ -689,7 +684,7 @@
VideoListWidgetData::mActivateReturnValue = 0;
mainWnd->mOrientationSet = true;
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
mTestView->deactivateView();
QVERIFY( mUiLoader->findWidget<HbMenu>(DOCML_NAME_OPTIONS_MENU)->isVisible() == false );
QCOMPARE( VideoListWidgetData::mActivateCount, 1 );
@@ -720,9 +715,9 @@
{
VideoListWidget *videoListWidget = 0;
HbGroupBox *subLabel = 0;
-
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
init();
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
videoListWidget = mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_VIDEOLISTWIDGET);
QVERIFY( videoListWidget );
@@ -760,9 +755,9 @@
{
VideoListWidget *collectionWidget = 0;
HbGroupBox *subLabel = 0;
-
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
init();
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
QList<QAction*> actions = mTestView->mToolbarViewsActionGroup->actions();
HbAction* action = static_cast<HbAction*>(actions.at(1));
@@ -827,9 +822,10 @@
QCOMPARE(VideoSortFilterProxyModelData::mSortRole, -1);
cleanup();
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
// Active action is not sort by.
init();
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
action = mUiLoader->findObject<HbAction>(DOCML_NAME_DELETE_MULTIPLE);
QVERIFY(action != 0);
mUiLoader->findWidget<HbMenu>(DOCML_NAME_OPTIONS_MENU)->setActiveAction(action);
@@ -844,7 +840,7 @@
// Good cases.
init();
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
sortMenu = mUiLoader->findWidget<HbMenu>(DOCML_NAME_SORT_MENU);
sortMenuAction->setMenu(sortMenu);
HbMenuData::mMenuAction = sortMenuAction;
@@ -864,22 +860,27 @@
connect(this, SIGNAL(testSignal(int)), mTestView, SLOT(startSorting()));
emit testSignal(0);
- QCOMPARE(VideoSortFilterProxyModelData::mDoSortingCallCount, 1);
+ // since current list is videolist, sorting count is 2 because both all videos and collection content are sorted
+ QCOMPARE(VideoSortFilterProxyModelData::mDoSortingCallCount, 2);
QCOMPARE(VideoSortFilterProxyModelData::mSortRole, (int)VideoCollectionCommon::KeyTitle);
QCOMPARE(VideoSortFilterProxyModelData::mSortOrder, Qt::AscendingOrder);
QVERIFY(VideoSortFilterProxyModelData::mSortAsync);
+ VideoSortFilterProxyModelData::mDoSortingCallCount = 0;
// emit test signal again, with same parameters. Sorting should be switched to
// descending order.
emit testSignal(0);
+ // since current list is videolist, sorting count is 2 because both all videos and collection content are sorted
QCOMPARE(VideoSortFilterProxyModelData::mDoSortingCallCount, 2);
QCOMPARE(VideoSortFilterProxyModelData::mSortRole, (int)VideoCollectionCommon::KeyTitle);
QCOMPARE(VideoSortFilterProxyModelData::mSortOrder, Qt::DescendingOrder);
QVERIFY(VideoSortFilterProxyModelData::mSortAsync);
+ VideoSortFilterProxyModelData::mDoSortingCallCount = 0;
// on third emit, sorting should be switched back to ascending
emit testSignal(0);
- QCOMPARE(VideoSortFilterProxyModelData::mDoSortingCallCount, 3);
+ // since current list is videolist, sorting count is 2 because both all videos and collection content are sorted
+ QCOMPARE(VideoSortFilterProxyModelData::mDoSortingCallCount, 2);
QCOMPARE(VideoSortFilterProxyModelData::mSortRole, (int)VideoCollectionCommon::KeyTitle);
QCOMPARE(VideoSortFilterProxyModelData::mSortOrder, Qt::AscendingOrder);
QVERIFY(VideoSortFilterProxyModelData::mSortAsync);
@@ -889,9 +890,10 @@
sortAction = mUiLoader->findObject<HbAction>(DOCML_NAME_SORT_BY_DATE);
QVERIFY(sortAction != 0);
sortMenu->setActiveAction(sortAction);
-
+ VideoSortFilterProxyModelData::mDoSortingCallCount = 0;
emit testSignal(0);
- QCOMPARE(VideoSortFilterProxyModelData::mDoSortingCallCount, 5);
+ // since current list is videolist, sorting count is 2 because both all videos and collection content are sorted
+ QCOMPARE(VideoSortFilterProxyModelData::mDoSortingCallCount, 2);
QCOMPARE(VideoSortFilterProxyModelData::mSortRole, (int)VideoCollectionCommon::KeyDateTime);
QCOMPARE(VideoSortFilterProxyModelData::mSortOrder, Qt::AscendingOrder);
QVERIFY(VideoSortFilterProxyModelData::mSortAsync);
@@ -911,7 +913,7 @@
XQServiceUtilXtra *serviceUtilXtra = XQServiceUtilXtra::instance();
serviceUtilXtra->setCurrentService(true);
QCOMPARE(mTestView->initializeView(), 0);
- QCOMPARE(mTestView->activateView(TMPXItemId::InvalidId()), 0);
+ QCOMPARE(mTestView->activateView(invalidId), 0);
int sortRole = VideoCollectionViewUtilsData::mVideoSortRole;
emit testSignal(0);
QCOMPARE(sortRole, VideoCollectionViewUtilsData::mVideoSortRole);
@@ -1012,11 +1014,11 @@
cleanup();
HbAction *action(0);
-
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
// Collections is triggered from toolbar.
init();
connect(this, SIGNAL(testSignal()), mTestView, SLOT(aboutToShowMainMenuSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
setRowCount(1);
action = mTestView->mToolbarActions[VideoListView::ETBActionCollections];
QVERIFY(action != 0);
@@ -1030,7 +1032,7 @@
// All videos is triggered from toolbar.
init();
connect(this, SIGNAL(testSignal()), mTestView, SLOT(aboutToShowMainMenuSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
setRowCount(1);
action = mTestView->mToolbarActions[VideoListView::ETBActionAllVideos];
QVERIFY(action != 0);
@@ -1044,7 +1046,7 @@
// Add videos action is visible.
init();
connect(this, SIGNAL(testSignal()), mTestView, SLOT(aboutToShowMainMenuSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
mTestView->toolBar()->clearActions();
mTestView->toolBar()->addActions( mTestView->mToolbarCollectionActionGroup->actions() );
setRowCount(1);
@@ -1057,7 +1059,7 @@
// Model has no items.
init();
connect(this, SIGNAL(testSignal()), mTestView, SLOT(aboutToShowMainMenuSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
setRowCount(0);
emit testSignal();
visible = visibleMenuActions();
@@ -1067,7 +1069,7 @@
// Toolbar action group is null
init();
connect(this, SIGNAL(testSignal()), mTestView, SLOT(aboutToShowMainMenuSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
setRowCount(1);
QActionGroup* actionGroup = mTestView->mToolbarViewsActionGroup;
mTestView->mToolbarViewsActionGroup = NULL;
@@ -1096,7 +1098,7 @@
videoServices->mCurrentService = VideoServices::EBrowse;
init(true);
connect(this, SIGNAL(testSignal()), mTestView, SLOT(aboutToShowMainMenuSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
emit testSignal();
visible = visibleMenuActions();
QCOMPARE(visible, 0);
@@ -1109,7 +1111,7 @@
videoServices->mCurrentService = VideoServices::EBrowse;
init(true);
connect(this, SIGNAL(testSignal()), mTestView, SLOT(aboutToShowMainMenuSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
setRowCount(3, mTestView->mCurrentList->getModel());
emit testSignal();
QVERIFY(isActionVisible(DOCML_NAME_DELETE_MULTIPLE));
@@ -1289,13 +1291,14 @@
//
void TestListView::testShowHint()
{
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
init(false);
connect(this, SIGNAL(testLayoutChangedSignal()), mTestView, SLOT(layoutChangedSlot()));
mTestView->mModelReady = true;
// current list is null. (cannot be verified, run for coverity
emit testLayoutChangedSignal();
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
disconnect(this, SIGNAL(testLayoutChangedSignal()), mTestView, SLOT(layoutChangedSlot()));
cleanup();
@@ -1353,7 +1356,7 @@
////////
// toolbar setup
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
mTestView->mToolbarActions[VideoListView::ETBActionRemoveVideos]->setVisible(true);
// mToolbarViewsActionGroup is null
@@ -1370,11 +1373,13 @@
QVERIFY(mTestView->mToolbarActions[VideoListView::ETBActionRemoveVideos]->isVisible());
mTestView->mToolbarCollectionActionGroup = tmp;
- // mIsService is true
- mTestView->mIsService = true;
+ // mVideoServices exists
+ VideoServices *tmpService = VideoServices::instance();
+ mTestView->mVideoServices = tmpService;
emit testLayoutChangedSignal();
QVERIFY(mTestView->mToolbarActions[VideoListView::ETBActionRemoveVideos]->isVisible());
- mTestView->mIsService = false;
+ mTestView->mVideoServices = 0;
+ tmpService->decreaseReferenceCount();
// show -flag is true, currentlist level != VideoCollectionCommon::ELevelDefaultColl
mTestView->mCurrentList->activate(VideoCollectionCommon::ELevelAlbum);
@@ -1534,6 +1539,7 @@
init(false);
QVERIFY(connect(this, SIGNAL(testSignal()), mTestView, SLOT(addVideosToCollectionSlot())));
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
VideoSortFilterProxyModelData::mOpenedItemId = TMPXItemId(0, 2);
// Not initalized, no mCurrentList
@@ -1543,7 +1549,7 @@
QCOMPARE(VideoCollectionViewUtilsData::mLastError, 0);
QVERIFY(mTestView->initializeView() == 0);
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
// Selection dialog widget loading fails.
VideoCollectionUiLoaderData::mFindFailure = true;
@@ -1611,7 +1617,7 @@
QVERIFY(connect(this, SIGNAL(testSignal2()), mTestView, SLOT(openCollectionViewSlot())));
emit testSignal2();
disconnect(this, SIGNAL(testSignal2()), mTestView, SLOT(openCollectionViewSlot()));
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
VideoListDataModelData::mRowCountDecrement = 1;
mTestView->mCurrentList->mCurrentLevel = VideoCollectionCommon::ELevelAlbum;
setRowCount(1);
@@ -1643,8 +1649,10 @@
// Not initialized, no current list
emit testSignal();
+ TMPXItemId invalidId = TMPXItemId::InvalidId();
+
QVERIFY(mTestView->initializeView() == 0);
- mTestView->activateView(TMPXItemId::InvalidId());
+ mTestView->activateView(invalidId);
setRowCount(1);
// Wrong level.