phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp Fri Oct 15 12:58:46 2010 +0300
@@ -98,11 +98,12 @@
iViewCmdHandleMock = new CPhoneViewCommandHandleMock();
iStateMachineMock = CPhoneStateMachineGSM::NewL( iViewCmdHandleMock );
- iMockContext->ExpectCallL( "TPhoneCmdParamCallStateData::CallId" ).
+ iMockContext->ExpectCallL( "PhoneCallUtil::CallIdByState" ).
ReturnsL( 2 );
iStateConferenceAndWaiting = CPhoneConferenceAndWaiting::NewL(
iStateMachineMock, iViewCmdHandleMock, NULL );
+ iMockContext->Reset();
}
void ut_cphoneconferenceandwaiting::Setup_NoRingingCallIdL( )
@@ -115,10 +116,11 @@
iViewCmdHandleMock = new CPhoneViewCommandHandleMock();
iStateMachineMock = CPhoneStateMachineGSM::NewL( iViewCmdHandleMock );
- iMockContext->ExpectCallL( "TPhoneCmdParamCallStateData::CallId" ).
+ iMockContext->ExpectCallL( "PhoneCallUtil::CallIdByState" ).
ReturnsL( -1 );
iStateConferenceAndWaiting = CPhoneConferenceAndWaiting::NewL(
iStateMachineMock, iViewCmdHandleMock, NULL );
+ iMockContext->Reset();
}