diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp --- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -18,7 +18,7 @@ #include "ut_cphonestateidle.h" #include #include - +#include #include #include #include "cpeengineinfo.h" @@ -56,11 +56,6 @@ MWsClientClass::MWsClientClass() {} RWindowTreeNode::RWindowTreeNode() {} -#include -TApaTaskList::TApaTaskList(RWsSession &aSession ) : iWsSession( aSession ) {} -TApaTask TApaTaskList::FindApp(TUid) {} -TInt TApaTask::Exists() const {return EFalse;} - // needed for mocking CPhoneMainResourceResolver::Instance() class CPhoneMainResourceResolverMock : public CPhoneMainResourceResolver { @@ -137,7 +132,10 @@ void ut_cphonestateidle::SetupL( ) { iMockContext->InitializeL(); - + + RWsSession wsSession; + iTask = new TApaTask(wsSession); + SmcDefaultValue::SetL( *iTask ); iCoeEnvMock = new (ELeave ) CCoeEnv(); SmcDefaultValue::SetL( iCoeEnvMock ); @@ -181,6 +179,9 @@ delete iCoeEnvMock; iCoeEnvMock = NULL; SmcDefaultValue::Reset(); + SmcDefaultValue::Reset(); + delete iTask; + iTask = NULL; } @@ -368,7 +369,7 @@ ReturnsL( phoneNumber ); iMockContext->ExpectCallL( "CPEEngineInfoImpl::SetPhoneNumber" ). WithL( KPhoneNumber() ); - iMockContext->ExpectCallL( "CPhoneState::DialMultimediaCallL" ); + iMockContext->ExpectCallL( "CPhoneState::DialMultimediaCall" ); //DialVideoCallL is used via handlecommand because it's private method. iStateIdle->HandleCommandL( EPhoneNumberAcqCmdVideoCall );