diff -r acd4e87b24b4 -r 2f0af9ba7665 logsui/logsapp/tsrc/ut_logsapp/src/ut_logsdetailsview.cpp --- a/logsui/logsapp/tsrc/ut_logsapp/src/ut_logsdetailsview.cpp Fri Sep 17 16:47:32 2010 +0300 +++ b/logsui/logsapp/tsrc/ut_logsapp/src/ut_logsdetailsview.cpp Fri Oct 15 14:47:48 2010 +0300 @@ -37,6 +37,8 @@ #include #include #include +#include +#include #include Q_DECLARE_METATYPE(LogsDetailsModel *) @@ -91,12 +93,11 @@ QVariant arg2 = qVariantFromValue( model2 ); LogsDetailsView* view = mRepository->detailsView(); QVERIFY( !view->mInitialized ); - view->activated(false, arg2); + view->activated(false, arg2, view->mDialpad->editor().text()); QVERIFY( view->mInitialized ); QVERIFY(view->mListView); QVERIFY(view->mDetailsModel == model2); QVERIFY(view->mListView->model() == model2); - QVERIFY(view->mActionMap.count() == 4); LogsDetailsModel* model3 = new LogsDetailsModel(); delete model3->mEvent; @@ -104,10 +105,10 @@ model3->mEvent = new LogsEvent(); model3->mEvent->mIsPrivate = false; QVariant arg3 = qVariantFromValue( model3 ); - mDetailsView->activated(false, arg3); + mDetailsView->activated(false, arg3, view->mDialpad->editor().text()); QVERIFY( mDetailsView->mDetailsModel == model3); QVERIFY(view->mListView->model() == model3); - //QT_NO_DEBUG_OUTPUT + delete view; } void UT_LogsDetailsView::testDeactivated() @@ -125,11 +126,12 @@ model->mEvent = 0; model->mEvent = new LogsEvent(); QVariant arg = qVariantFromValue( model ); - view->activated(false, arg); + view->activated(false, arg, view->mDialpad->editor().text()); QVERIFY( view->mListView ); view->deactivated(); QVERIFY( view->mListView ); QVERIFY( !view->mDetailsModel ); + delete view; } void UT_LogsDetailsView::testHandleBackSoftkey() @@ -152,11 +154,12 @@ model->mEvent = new LogsEvent(); model->mEvent->mEventType = LogsEvent::TypeVoiceCall; QVariant arg = qVariantFromValue( model ); - mRepository->detailsView(); - mDetailsView->activated(false, arg); + LogsDetailsView* view = mRepository->detailsView(); + mDetailsView->activated(false, arg, mDetailsView->mDialpad->editor().text()); QVERIFY( mDetailsView->mCall ); mDetailsView->callKeyPressed(); QVERIFY( mDetailsView->mCall->mTestLastCallType != -1 ); + delete view; } void UT_LogsDetailsView::testInitiateVoiceCall() @@ -190,14 +193,14 @@ // No call, call actions disabled QVERIFY( !mDetailsView->mCall ); - mRepository->detailsView(); // Set correct object tree + LogsDetailsView* view = mRepository->detailsView(); // Set correct object tree LogsDetailsModel* model = new LogsDetailsModel(); delete model->mEvent; model->mEvent = 0; model->mEvent = new LogsEvent(); QVariant arg = qVariantFromValue( model ); - mDetailsView->activated(false, arg); + mDetailsView->activated(false, arg, mDetailsView->mDialpad->editor().text()); mDetailsView->updateMenu(); QObject* obj = mRepository->findObject( logsDetailsViewVoiceCallMenuActionId ); HbAction* voiceCallAction = qobject_cast( obj ); @@ -237,6 +240,7 @@ QVERIFY( openContactAction->isVisible() ); QVERIFY( voiceCallAction->isVisible() ); LogsContact::reset(); + delete view; } void UT_LogsDetailsView::testDeleteEventAnswer() @@ -275,16 +279,21 @@ QVERIFY( LogsDetailsModel::mLastCallName.isEmpty() ); } - - -void UT_LogsDetailsView::testChangeFilter() +void UT_LogsDetailsView::testHandleViewSwitchSelected() { mViewManager->reset(); - HbAction action; - action.setObjectName(logsShowFilterMissedMenuActionId); - mDetailsView->changeFilter(&action); + QVERIFY( mViewManager->mViewId == LogsUnknownViewId ); + HbListWidgetItem* item = new HbListWidgetItem(); + item->setData(QVariant(XQService::LogsViewReceived), Qt::UserRole); + mDetailsView->mViewSwitchList = new HbListWidget(); + mDetailsView->mViewSwitchList->addItem(item); + + mDetailsView->handleViewSwitchSelected(item); + QVERIFY( mViewManager->mViewId == LogsRecentViewId ); - QVERIFY( mViewManager->mArgs.toInt() == (int)XQService::LogsViewAll ); + QVERIFY( mViewManager->mArgs.toInt() == (int)XQService::LogsViewReceived ); + delete mDetailsView->mViewSwitchList; + mDetailsView->mViewSwitchList = 0; } void UT_LogsDetailsView::testContactActionCompleted()