--- a/logsui/logsapp/tsrc/ut_logsapp/src/ut_logsbaseview.cpp	Tue Jul 06 14:16:36 2010 +0300
+++ b/logsui/logsapp/tsrc/ut_logsapp/src/ut_logsbaseview.cpp	Wed Aug 18 09:49:12 2010 +0300
@@ -37,6 +37,7 @@
 #include <hblineedit.h>
 #include <hblistviewitem.h>
 #include <hblistview.h>
+#include <hbmessagebox.h>
 #include <QStringListModel>
 #include <hbapplication.h>
 #include <hbactivitymanager.h>
@@ -547,36 +548,27 @@
     QVERIFY( HbStubHelper::dialogShown() );
 }
 
-void UT_LogsBaseView::testDeleteEventOkAnswer()
+void UT_LogsBaseView::testDeleteEventAnswer()
 {
     // No model, nothing happens
     QVERIFY( LogsDetailsModel::mLastCallName.isEmpty() );
     QVERIFY( !mBaseView->mDetailsModel );
-    mBaseView->deleteEventOkAnswer();
+    mBaseView->deleteEventAnswer(HbMessageBox::Ok);
     QVERIFY( LogsDetailsModel::mLastCallName.isEmpty() );
 
+    // Model exists, cancel button pressed
+    LogsDetailsModel* model = new LogsDetailsModel();
+    mBaseView->mDetailsModel = model;
+    mBaseView->deleteEventAnswer(HbMessageBox::Cancel);
+    QVERIFY( LogsDetailsModel::mLastCallName.isEmpty() );
+    
     // Model exists, call to delete event made and view is closed
     mViewManager->reset();
-    LogsDetailsModel* model = new LogsDetailsModel();
-    mBaseView->mDetailsModel = model;
-    mBaseView->deleteEventOkAnswer();
+    mBaseView->deleteEventAnswer(HbMessageBox::Ok);
     QVERIFY( LogsDetailsModel::mLastCallName == QLatin1String("clearEvent") );
     QVERIFY( !mViewManager->mPreviousActivated );    
 }
 
-void UT_LogsBaseView::testAskConfirmation()
-{
-    // No receiver and slots specified
-    mBaseView->askConfirmation(QLatin1String("heading"), QLatin1String("text"), 0);
-    QVERIFY( HbStubHelper::dialogShown() );
-    
-    // Receiver and slots specified
-    HbStubHelper::reset();
-    mBaseView->askConfirmation(QLatin1String("heading"), QLatin1String("text"), this,
-            SLOT("dummy()"), SLOT("dummy()"));
-    QVERIFY( HbStubHelper::dialogShown() );
-}
-
 void UT_LogsBaseView::testMatchWithActivityId()
 {
     QVERIFY( !mBaseView->matchWithActivityId(QString("")) );
@@ -683,6 +675,19 @@
     delete HbStubHelper::listItems().takeLast();
     mBaseView->ensureListPositioning(list);
     QVERIFY( HbStubHelper::listEnsureVisibleCalled() );
-    QVERIFY( HbStubHelper::listScrollToCalled() );
+    // TODO: stub does not work due it uses virtual table inside hbcore. Whole
+    // list should be stubbed.
+    //QVERIFY( HbStubHelper::listScrollToCalled() );
+}
 
+void UT_LogsBaseView::testCancelServiceRequest()
+{
+    QVERIFY( !mBaseView->mContact );
+    QVERIFY( !LogsContact::mServiceRequestCanceled );
+    mBaseView->cancelServiceRequest();
+    QVERIFY( !LogsContact::mServiceRequestCanceled );
+
+    mBaseView->mContact = new LogsContact();
+    mBaseView->cancelServiceRequest();
+    QVERIFY( LogsContact::mServiceRequestCanceled );
 }