diff -r 73a1feb507fb -r bc78a40cd63c mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/inc/ut_mustsypropertymonitor.h --- a/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/inc/ut_mustsypropertymonitor.h Tue Aug 31 15:12:07 2010 +0300 +++ b/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/inc/ut_mustsypropertymonitor.h Wed Sep 01 12:31:01 2010 +0100 @@ -20,9 +20,6 @@ #define __UT_CMusTsyPropertyMonitor_H__ -// USER INCLUDE -#include "mmuscallstateobserver.h" - // EXTERNAL INCLUDES #include #include @@ -30,7 +27,6 @@ // FORWARD DECLARATIONS class CMusCommonObserverStub; class CMusTsyPropertyMonitor; -class CRepository; // Next row is to disable warning emerging from EUnit code. // Placement is due to a fact that most test case files @@ -43,8 +39,7 @@ * Tester class for CMusTsyPropertyMonitor. * */ -NONSHARABLE_CLASS( UT_CMusTsyPropertyMonitor ): public CEUnitTestSuiteClass, - MMusCallStateObserver +NONSHARABLE_CLASS( UT_CMusTsyPropertyMonitor ): public CEUnitTestSuiteClass { public: // Constructors and destructors @@ -53,17 +48,11 @@ */ static UT_CMusTsyPropertyMonitor* NewL(); static UT_CMusTsyPropertyMonitor* NewLC(); - + /** * Destructor */ ~UT_CMusTsyPropertyMonitor(); - - - public: // MMusCallStateObserver - - virtual void MusCallStateChanged(); - private: // Constructors and destructors @@ -73,6 +62,7 @@ private: // Test case setup and teardown void SetupL(); + void Setup2L(); void Teardown(); private: // Test methdods @@ -83,17 +73,14 @@ void UT_CMusTsyPropertyMonitor_RunErrorL(); void UT_CMusTsyPropertyMonitor_AddCallMonitorLL(); void UT_CMusTsyPropertyMonitor_RemoveCallMonitorL(); - void UT_CMusTsyPropertyMonitor_MonitorCSCallLL(); - void UT_CMusTsyPropertyMonitor_MonitorVoipCallLL(); void UT_CMusTsyPropertyMonitor_MonitorCallLL(); + void UT_CMusTsyPropertyMonitor_MonitorCallL_2L(); void UT_CMusTsyPropertyMonitor_RemoveUnUsedCallMonitorsL(); - void UT_CMusTsyPropertyMonitor_CheckCallCriteriaLL(); - void UT_CMusTsyPropertyMonitor_IsDataReadyLL(); private: // Data CMusTsyPropertyMonitor* iMusTsyPropertyMonitor; RMobilePhone iPhone; - CRepository* iMusCentralRepository ; + EUNIT_DECLARE_TEST_TABLE;