diff -r 73a1feb507fb -r bc78a40cd63c mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/inc/ut_muscallmonitorbase.h --- a/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/inc/ut_muscallmonitorbase.h Tue Aug 31 15:12:07 2010 +0300 +++ b/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/inc/ut_muscallmonitorbase.h Wed Sep 01 12:31:01 2010 +0100 @@ -27,8 +27,6 @@ #include "muscallmonitorbase.h" #include "mussesseioninformationapi.h" #include "mmustsypropertyobserver.h" -#include "mmuscallstateobserver.h" - // Forward declaration @@ -44,8 +42,7 @@ public: CMusCallMonitorMock( const RMobileCall& aCall, - MMusTsyPropertyObserver& aObserver, - MMusCallStateObserver& aCallStateObserver ); + MMusTsyPropertyObserver& aObserver ); ~CMusCallMonitorMock(); private: @@ -62,8 +59,7 @@ * */ NONSHARABLE_CLASS( UT_CMusCallMonitorBase ): public CEUnitTestSuiteClass, - MMusTsyPropertyObserver, - MMusCallStateObserver + MMusTsyPropertyObserver { public: //Two phase construction @@ -82,9 +78,6 @@ virtual void NotifyCallStateChanged( NMusSessionInformationApi::TMusCallEvent aVal, TName& aCallName ); - public: // from MMusCallStateObserver. - virtual void MusCallStateChanged(); - private: // Constructor UT_CMusCallMonitorBase(); @@ -99,14 +92,16 @@ private: // Test methdods void UT_SetStateLL(); void UT_SetCallInfoLL(); - void UT_RunErrorL(); - void UT_CMusCallMonitorBase_IsDataReadyLL(); + void UT_RunErrorL(); + + void UT_SetClirSettingL(); + void UT_SetTerminatingPrivacyL(); + void UT_RemovePrefixL(); private: // Data CMusCallMonitorBase* iCallMonitorBase; RMobileCall iCall; - TBool iCallStateObserverInvoked; EUNIT_DECLARE_TEST_TABLE;