--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp	Tue Jun 15 14:14:38 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp	Thu Jul 22 16:33:21 2010 +0100
@@ -99,12 +99,21 @@
  */
 void UT_CpCallsPluginGroup::t_showCallDurationStateChanged()
 {
-    int iRet=0;
+    bool bOngoing=true;
+    bool bDuration=true;
     
-    EXPECT(CpSettingsWrapper::setShowCallDuration).returns(iRet);
+    EXPECT(CpSettingsWrapper::isOngoingCall).returns(bOngoing);
+    EXPECT(CpSettingsWrapper::showCallDuration).returns(bDuration);
+    EXPECT(CpPhoneNotes::showGlobalNote);
     m_callspluginGroup->showCallDurationStateChanged();
     
-    EXPECT(CpSettingsWrapper::setShowCallDuration).returns(iRet);
+    bDuration = false;
+    EXPECT(CpSettingsWrapper::isOngoingCall).returns(bOngoing);
+    EXPECT(CpSettingsWrapper::showCallDuration).returns(bDuration);
+    m_callspluginGroup->showCallDurationStateChanged();
+    
+    bOngoing = false;
+    EXPECT(CpSettingsWrapper::isOngoingCall).returns(bOngoing);
     m_callspluginGroup->showCallDurationStateChanged();
     
     QVERIFY(verify());
@@ -160,22 +169,22 @@
 void UT_CpCallsPluginGroup::t_handleCallWaitingChanged()
 {
     EXPECT(CpPhoneNotes::cancelNote);
-    EXPECT(CpPhoneNotes::showGlobalNote);
+    EXPECT(CpPhoneNotes::showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::ActivateCallWaiting , 0);
     
     EXPECT(CpPhoneNotes::cancelNote);
-    EXPECT(CpPhoneNotes::showGlobalNote);
+    EXPECT(CpPhoneNotes::showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::DeactivateCallWaiting, 0);
     
     EXPECT(CpPhoneNotes::cancelNote);
-    EXPECT(CpPhoneNotes::showGlobalNote);
+    EXPECT(CpPhoneNotes::showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::CheckCallWaitingStatus, 0);
     
     EXPECT(CpPhoneNotes::cancelNote);
-    EXPECT(CpPhoneNotes::showGlobalNote);
+    EXPECT(CpPhoneNotes::showNotificationDialog);
     m_callspluginGroup->handleCallWaitingChanged(
         PSetCallWaitingWrapper::DeactivateCallWaiting , -1);
     
@@ -256,7 +265,7 @@
     QList<unsigned char> basicServiceGroupIds;
     
     EXPECT(CpPhoneNotes::cancelNote);
-    EXPECT(CpPhoneNotes::showGlobalNote);
+    EXPECT(CpPhoneNotes::showNotificationDialog);
     m_callspluginGroup->handleCallWaitingGetStatus(
         PSetCallWaitingWrapper::StatusNotProvisioned, basicServiceGroupIds);
     
@@ -264,6 +273,20 @@
 }
 
 /*!
+  UT_CpCallsPluginGroup::t_ownVideoInReceivedCallStateChanged
+ */
+void UT_CpCallsPluginGroup::t_ownVideoInReceivedCallStateChanged()
+{
+    EXPECT(CpSettingsWrapper::writeVtVideoSending).times(3);
+    m_callspluginGroup->ownVideoInReceivedCallStateChanged(0);
+    m_callspluginGroup->ownVideoInReceivedCallStateChanged(1);
+    m_callspluginGroup->ownVideoInReceivedCallStateChanged(2);
+    m_callspluginGroup->ownVideoInReceivedCallStateChanged(-1);
+    
+    QVERIFY(verify());
+}
+
+/*!
   UT_CpCallsPluginGroup::cleanup
  */
 void UT_CpCallsPluginGroup::cleanup()