diff -r 64a47b97e1e1 -r f27aebe284bb logsui/logsapp/tsrc/ut_logsapp/src/ut_logsrecentcallsview.cpp --- a/logsui/logsapp/tsrc/ut_logsapp/src/ut_logsrecentcallsview.cpp Tue Jul 06 14:16:36 2010 +0300 +++ b/logsui/logsapp/tsrc/ut_logsapp/src/ut_logsrecentcallsview.cpp Wed Aug 18 09:49:12 2010 +0300 @@ -319,8 +319,18 @@ view->mDialpad->editor().setText( dial ); view->callKeyPressed(); QVERIFY( LogsCall::isCallToNumberCalled() ); + QCOMPARE( LogsCall::lastCalledNumber(), dial ); QVERIFY( LogsCall::lastCalledFunction() != "initiateCallback" ); + // Make sure that SS numbers are left untouched when calling + LogsCall::resetTestData(); + dial = "*#7370#"; + view->mDialpad->editor().setText( dial ); + view->callKeyPressed(); + QVERIFY( LogsCall::isCallToNumberCalled() ); + QCOMPARE( LogsCall::lastCalledNumber(), dial ); + LogsCall::resetTestData(); + // Dialpad closed but contains text, call to first item in the list LogsCall::resetTestData(); view->mDialpad->mIsOpen = false; @@ -770,16 +780,21 @@ } -void UT_LogsRecentCallsView::testClearListOkAnswer() +void UT_LogsRecentCallsView::testClearListAnswer() { // No filter ,list is not cleared mRecentCallsView->mModel->mIsCleared = false; - mRecentCallsView->clearListOkAnswer(); + mRecentCallsView->clearListAnswer(HbMessageBox::Ok); + QVERIFY( !mRecentCallsView->mModel->mIsCleared ); + + // Filter exists, cancel button pressed + mRecentCallsView->mFilter = new LogsFilter(LogsFilter::Missed); + mRecentCallsView->clearListAnswer(HbMessageBox::Cancel); QVERIFY( !mRecentCallsView->mModel->mIsCleared ); + // Filter exists, list is cleared - mRecentCallsView->mFilter = new LogsFilter( LogsFilter::Missed ); - mRecentCallsView->clearListOkAnswer(); + mRecentCallsView->clearListAnswer(HbMessageBox::Ok); QVERIFY( mRecentCallsView->mModel->mIsCleared ); }