# HG changeset patch # User ivan.fildichev@opencode.com # Date 1290087736 -7200 # Node ID 5e27cc612ac7d65675f5f9ec20abe38bbd2dbac8 # Parent 434681fe53c80f0612cf42d8529f7d8241756915 Latest bug-fixes with added tests. diff -r 434681fe53c8 -r 5e27cc612ac7 telephonyserver/etelmultimode/CETEL/mm_messaging.cpp --- a/telephonyserver/etelmultimode/CETEL/mm_messaging.cpp Sat Nov 06 18:38:12 2010 +0200 +++ b/telephonyserver/etelmultimode/CETEL/mm_messaging.cpp Thu Nov 18 15:42:16 2010 +0200 @@ -1186,6 +1186,8 @@ const TDesC8& aMsgAttributes, TInt aCommand) const /** This member function sends a USSD message to the network. + The received responce is later transfered to the default handler if + ETransferToDefaultHandler == aCommand (the only available command for now). See 3GPP spec. 04.90 for more details on expected responses from the network. @@ -1196,6 +1198,8 @@ @param aReqStatus On return, KErrNone if successful. @param aMsgData The message data. @param aMsgAttributes The TMobileUssdAttributesV1Pckg with the message attributes. + @param aCommand For now only ETransferToDefaultHandler is handled. In the future + more commands might be introduced. @see TMobileUssdAttributesV1 @@ -1205,10 +1209,10 @@ */ { if(ETransferToDefaultHandler != aCommand) - { - aReqStatus = KErrArgument; - return; - } + { + aReqStatus = KErrArgument; + return; + } Set(EMobileUssdMessagingSendMessageDefaultHandler, aReqStatus, aMsgData, aMsgAttributes); } diff -r 434681fe53c8 -r 5e27cc612ac7 telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP --- a/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Sat Nov 06 18:38:12 2010 +0200 +++ b/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Thu Nov 18 15:42:16 2010 +0200 @@ -1193,11 +1193,6 @@ } else if (reqMode&KReqModeMultipleCompletionWithInterestLevel && error ==KErrNone) { - // TODO if delivery is active for this req then return - // KErrInUse / KErrServerBusy? - // TODO what if one CTelObject has multiple requests which are - // KReqModeMultipleCompletionWithInterestLevel. Would we need multiple - // delivery managers? if (!IsSessionInProgress()) { // Find an owner for the new session by offering it to the @@ -1341,7 +1336,6 @@ && reqEntry->iTelObject==aUpdatedReqEntry->iTelObject && reqEntry->iBuffer->Size()==aUpdatedReqEntry->iBuffer->Size() && IsSessionOwner(reqEntry)) - //TODO uncommented IsSessionOwner(reqEntry) to make sure //request is delievered to the session owner(sometimes the default handler) { if (aUpdatedReqEntry != reqEntry) @@ -2627,3 +2621,4 @@ //Use the RMessage2 and EKA2 adopt functions to adopt the file. Slots 0 & 2 contain relevant session handles. User::LeaveIfError(iFile.AdoptFromClient(aMsg, 0, 2)); } + diff -r 434681fe53c8 -r 5e27cc612ac7 telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Sat Nov 06 18:38:12 2010 +0200 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Thu Nov 18 15:42:16 2010 +0200 @@ -551,7 +551,8 @@ TFLOGSTRING("TSY: CMmUssdTsy::CompleteReceiveMessage.\n" ); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeUssdReceiveMessage ); - + + if ( ( EMultimodeUssdReqHandleUnknown != reqHandle ) ) { // reset req handle. Returns the deleted req handle @@ -573,7 +574,9 @@ { aError = KErrArgument; } + } + ReqCompleted( reqHandle, aError ); } } @@ -616,16 +619,8 @@ if ( iUssdNoFdnCheckFlag == EUssdNoFdnCheckNotUsed ) { // Send request to the Domestic OS layer. - if(EFalse == iSendToDefaultHandler) - { - ret = iMmPhone->MessageManager()->HandleRequestL( - EMobileUssdMessagingSendMessage, &package ); - } - else //default handler - { - ret = iMmPhone->MessageManager()->HandleRequestL( - EMobileUssdMessagingSendMessageDefaultHandler, &package ); - } + ret = iMmPhone->MessageManager()->HandleRequestL( + EMobileUssdMessagingSendMessage, &package ); } iSsTransactionOngoing = ETrue; } @@ -770,8 +765,10 @@ if ( KErrNone == aError ) { if(EFalse == iSendToDefaultHandler) - { - SetSessionOwnerByTsyHandle( reqHandle ); + { + //This is the non-default handler case. Session owner remains the same. + //This session owner will get the newly received message. + SetSessionOwnerByTsyHandleAndIpc( reqHandle, NULL ); } else // default handler { diff -r 434681fe53c8 -r 5e27cc612ac7 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp Sat Nov 06 18:38:12 2010 +0200 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp Thu Nov 18 15:42:16 2010 +0200 @@ -351,8 +351,7 @@ // USSD functionality case EMobileUssdMessagingSendRelease: - case EMobileUssdMessagingSendMessage: - case EMobileUssdMessagingSendMessageDefaultHandler: + case EMobileUssdMessagingSendMessage: case EMobileUssdMessagingSendMessageNoFdnCheck: case EMobileUssdMessagingReceiveMessage: case EMobileUssdMessagingNotifyNetworkRelease: @@ -1512,8 +1511,7 @@ } #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW - //USSD - case EMobileUssdMessagingSendMessageDefaultHandler: + //USSD case EMobileUssdMessagingSendMessage: static_cast( mmObject )-> CompleteSendMessage( aResult ); diff -r 434681fe53c8 -r 5e27cc612ac7 telephonyserverplugins/common_tsy/test/component/inc/cctsyussdmessagingfu.h --- a/telephonyserverplugins/common_tsy/test/component/inc/cctsyussdmessagingfu.h Sat Nov 06 18:38:12 2010 +0200 +++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsyussdmessagingfu.h Thu Nov 18 15:42:16 2010 +0200 @@ -92,6 +92,8 @@ void TestReceiveMessage0002gL(); void TestReceiveMessage0002hL(); void TestReceiveMessage0002iL(); + void TestReceiveMessage0002jL(); + void TestReceiveMessage0002kL(); void TestReceiveMessage0003L(); void TestReceiveMessage0004L(); void TestReceiveMessage0004bL(); diff -r 434681fe53c8 -r 5e27cc612ac7 telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script Sat Nov 06 18:38:12 2010 +0200 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script Thu Nov 18 15:42:16 2010 +0200 @@ -735,6 +735,28 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUssdMessagingFU.TestReceiveMessage0002iL END_TESTCASE BA-CTSY-USSDM-URM-0002i +START_TESTCASE BA-CTSY-USSDM-URM-0002j +//!@SYMTestCaseID BA-CTSY-USSDM-URM-0002j +//!@SYMComponent telephony_ctsy +//!@SYMTestCaseDesc Test support of RMobileUssdMessaging::ReceiveMessage for reception of USSD notification while other client is handling USSD session. +//!@SYMTestPriority High +//!@SYMTestActions Two clients present which receive and accept network initiated USSD messages. +//!@SYMTestExpectedResults Pass +//!@SYMTestType CT +RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUssdMessagingFU.TestReceiveMessage0002jL +END_TESTCASE BA-CTSY-USSDM-URM-0002j + +START_TESTCASE BA-CTSY-USSDM-URM-0002k +//!@SYMTestCaseID BA-CTSY-USSDM-URM-0002k +//!@SYMComponent telephony_ctsy +//!@SYMTestCaseDesc Test support of RMobileUssdMessaging::ReceiveMessage for network iniated requests. +//!@SYMTestPriority High +//!@SYMTestActions Two clients handling network initiated requests. +//!@SYMTestExpectedResults Pass +//!@SYMTestType CT +RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUssdMessagingFU.TestReceiveMessage0002kL +END_TESTCASE BA-CTSY-USSDM-URM-0002k + START_TESTCASE BA-CTSY-USSDM-URM-0003 //!@SYMTestCaseID BA-CTSY-USSDM-URM-0003 //!@SYMComponent telephony_ctsy diff -r 434681fe53c8 -r 5e27cc612ac7 telephonyserverplugins/common_tsy/test/component/src/cctsyussdmessagingfu.cpp --- a/telephonyserverplugins/common_tsy/test/component/src/cctsyussdmessagingfu.cpp Sat Nov 06 18:38:12 2010 +0200 +++ b/telephonyserverplugins/common_tsy/test/component/src/cctsyussdmessagingfu.cpp Thu Nov 18 15:42:16 2010 +0200 @@ -58,6 +58,8 @@ ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0002gL); ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0002hL); ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0002iL); + ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0002jL); + ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0002kL); ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0003L); ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0004L); ADD_TEST_STEP_ISO_CPP(CCTsyUssdMessagingFU, TestReceiveMessage0004bL); @@ -635,7 +637,7 @@ //------------------------------------------------------------------------- - iMockLTSY.ExpectL(EMobileUssdMessagingSendMessageDefaultHandler, data, KErrNotSupported); + iMockLTSY.ExpectL(EMobileUssdMessagingSendMessage, data, KErrNotSupported); ussdMessaging.SendMessage(requestStatus, msgData, msgAttributes, RMobileUssdMessaging::ETransferToDefaultHandler); @@ -647,8 +649,8 @@ // TEST B: failure on completion of pending request from LTSY->CTSY //------------------------------------------------------------------------- - iMockLTSY.ExpectL(EMobileUssdMessagingSendMessageDefaultHandler, data); - iMockLTSY.CompleteL(EMobileUssdMessagingSendMessageDefaultHandler, KErrGeneral); + iMockLTSY.ExpectL(EMobileUssdMessagingSendMessage, data); + iMockLTSY.CompleteL(EMobileUssdMessagingSendMessage, KErrGeneral); ussdMessaging.SendMessage(requestStatus, msgData, msgAttributes, RMobileUssdMessaging::ETransferToDefaultHandler); @@ -661,8 +663,8 @@ // RMobileUssdMessaging::SendMessage when result is not cached. //------------------------------------------------------------------------- - iMockLTSY.ExpectL(EMobileUssdMessagingSendMessageDefaultHandler, data); - iMockLTSY.CompleteL(EMobileUssdMessagingSendMessageDefaultHandler, KErrNone); + iMockLTSY.ExpectL(EMobileUssdMessagingSendMessage, data); + iMockLTSY.CompleteL(EMobileUssdMessagingSendMessage, KErrNone); ussdMessaging.SendMessage(requestStatus, msgData, msgAttributes, RMobileUssdMessaging::ETransferToDefaultHandler); @@ -678,7 +680,7 @@ TRequestStatus mockLtsyStatus; iMockLTSY.NotifyTerminated(mockLtsyStatus); - iMockLTSY.CompleteL(EMobileUssdMessagingSendMessageDefaultHandler, KErrNone); + iMockLTSY.CompleteL(EMobileUssdMessagingSendMessage, KErrNone); User::WaitForRequest(mockLtsyStatus); AssertMockLtsyStatusL(); ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int()); @@ -2683,6 +2685,219 @@ CleanupStack::PopAndDestroy(4, this); // this, data, ussd1, ussd2 } +/** +@SYMTestCaseID BA-CTSY-USSDM-URM-0002j +@SYMComponent telephony_ctsy +@SYMTestCaseDesc est support of RMobileUssdMessaging::ReceiveMessage for reception of USSD notification while other client is handling USSD session. +@SYMTestPriority High +@SYMTestActions Two clients present which receive and accept network initiated USSD messages. +@SYMTestExpectedResults Pass +@SYMTestType CT +*/ +void CCTsyUssdMessagingFU::TestReceiveMessage0002jL() + { + OpenEtelServerL(EUseExtendedError); + CleanupStack::PushL(TCleanupItem(Cleanup,this)); + OpenPhoneL(); + + RBuf8 dataCl1; + CleanupClosePushL(dataCl1); + + RBuf8 dataCl2; + CleanupClosePushL(dataCl2); + + RMobileUssdMessaging ussd1; + RMobileUssdMessaging ussd2; + TInt ret1 = ussd1.Open(iPhone); + TInt ret2 = ussd2.Open(iPhone); + ASSERT_EQUALS(KErrNone, ret1); + ASSERT_EQUALS(KErrNone, ret2); + CleanupClosePushL(ussd1); + CleanupClosePushL(ussd2); + + TRequestStatus requestStatus1; + TRequestStatus requestStatus2; + + //------------------------------------------------------------------------- + TUint32 flags = 100; + RMobileUssdMessaging::TMobileUssdDataFormat format = RMobileUssdMessaging::EFormatUnspecified; + RMobileUssdMessaging::TMobileUssdMessageType typeNotify = RMobileUssdMessaging::EUssdMTNotify; + RMobileUssdMessaging::TMobileUssdMessageType typeReply = RMobileUssdMessaging::EUssdMTRequest; + TUint8 dcs = 200; + + // function parameters + + RMobileUssdMessaging::TMobileUssdAttributesV1 attributes; + TPckg msgAttributes(attributes); + + RMobileUssdMessaging::TGsmUssdMessageData name; + + //------------------------------------------------------------------------- + + RMobileUssdMessaging::TMobileUssdAttributesV1 completeAttributesClient1; + + completeAttributesClient1.iFlags = flags; + completeAttributesClient1.iFormat = format; + completeAttributesClient1.iType = typeNotify; + completeAttributesClient1.iDcs = dcs; + + TBuf8 completeName = _L8("Name1"); + + TMockLtsyData2, RMobileUssdMessaging::TMobileUssdAttributesV1> + mockData2(completeName, completeAttributesClient1); + + mockData2.SerialiseL(dataCl1); + + //------------------------------------------------------------------------- + + RMobileUssdMessaging::TMobileUssdAttributesV1 completeAttributesClient2; + + completeAttributesClient2.iFlags = flags; + completeAttributesClient2.iFormat = format; + completeAttributesClient2.iType = typeReply; + completeAttributesClient2.iDcs = dcs; + + TBuf8 completeNameCl2 = _L8("Name2"); + + TMockLtsyData2, RMobileUssdMessaging::TMobileUssdAttributesV1> + mockData2Cl2(completeNameCl2, completeAttributesClient2); + + mockData2Cl2.SerialiseL(dataCl2); + + //------------------------------------------------------------------------- + // TEST: The first client accepts a network initiated USSD request. + // The SECOND client accepts a USSD notification. + //------------------------------------------------------------------------- + + //network initiated USSD request + ussd1.ReceiveMessage(requestStatus1, name, msgAttributes); + iMockLTSY.CompleteL(EMobileUssdMessagingReceiveMessage, KErrNone, dataCl1); + + User::WaitForRequest(requestStatus1); + AssertMockLtsyStatusL(); + + ASSERT_EQUALS(KErrNone, requestStatus1.Int()); + ussd1.AcceptIncomingDialogue(); + + //USSD notification + ussd2.ReceiveMessage(requestStatus2, name, msgAttributes); + iMockLTSY.CompleteL(EMobileUssdMessagingReceiveMessage, KErrNone, dataCl2); + + User::WaitForRequest(requestStatus2); + AssertMockLtsyStatusL(); + + ASSERT_EQUALS(KErrNone, requestStatus2.Int()); + ussd2.AcceptIncomingDialogue(); + + CleanupStack::PopAndDestroy(5, this); // this, dataCl1, dataCl2, ussd1, ussd2 + } + +/** +@SYMTestCaseID BA-CTSY-USSDM-URM-0002k +@SYMComponent telephony_ctsy +@SYMTestCaseDesc Test support of RMobileUssdMessaging::ReceiveMessage for network iniated requests. +@SYMTestPriority High +@SYMTestActions Two clients handling network initiated requests. +@SYMTestExpectedResults Pass +@SYMTestType CT +*/ +void CCTsyUssdMessagingFU::TestReceiveMessage0002kL() + { + OpenEtelServerL(EUseExtendedError); + CleanupStack::PushL(TCleanupItem(Cleanup,this)); + OpenPhoneL(); + + RBuf8 dataCl1; + CleanupClosePushL(dataCl1); + + RBuf8 dataCl2; + CleanupClosePushL(dataCl2); + + RMobileUssdMessaging ussd1; + RMobileUssdMessaging ussd2; + TInt ret1 = ussd1.Open(iPhone); + TInt ret2 = ussd2.Open(iPhone); + ASSERT_EQUALS(KErrNone, ret1); + ASSERT_EQUALS(KErrNone, ret2); + CleanupClosePushL(ussd1); + CleanupClosePushL(ussd2); + + TRequestStatus requestStatus1; + TRequestStatus requestStatus2; + + //------------------------------------------------------------------------- + TUint32 flags = 100; + RMobileUssdMessaging::TMobileUssdDataFormat format = RMobileUssdMessaging::EFormatUnspecified; + RMobileUssdMessaging::TMobileUssdMessageType typeNotify = RMobileUssdMessaging::EUssdMTNotify; + RMobileUssdMessaging::TMobileUssdMessageType typeReply = RMobileUssdMessaging::EUssdMTRequest; + TUint8 dcs = 200; + + // function parameters + + RMobileUssdMessaging::TMobileUssdAttributesV1 attributes; + TPckg msgAttributes(attributes); + + RMobileUssdMessaging::TGsmUssdMessageData name; + + //------------------------------------------------------------------------- + + RMobileUssdMessaging::TMobileUssdAttributesV1 completeAttributesClient1; + + completeAttributesClient1.iFlags = flags; + completeAttributesClient1.iFormat = format; + completeAttributesClient1.iType = typeNotify; + completeAttributesClient1.iDcs = dcs; + + TBuf8 completeName = _L8("Name1"); + + TMockLtsyData2, RMobileUssdMessaging::TMobileUssdAttributesV1> + mockData2(completeName, completeAttributesClient1); + + mockData2.SerialiseL(dataCl1); + + //------------------------------------------------------------------------- + + RMobileUssdMessaging::TMobileUssdAttributesV1 completeAttributesClient2; + + completeAttributesClient2.iFlags = flags; + completeAttributesClient2.iFormat = format; + completeAttributesClient2.iType = typeReply; + completeAttributesClient2.iDcs = dcs; + + TBuf8 completeNameCl2 = _L8("Name2"); + + TMockLtsyData2, RMobileUssdMessaging::TMobileUssdAttributesV1> + mockData2Cl2(completeNameCl2, completeAttributesClient2); + + mockData2Cl2.SerialiseL(dataCl2); + + //------------------------------------------------------------------------- + // TEST: The first client accepts a network initiated USSD request. + // The SECOND client rejects a USSD notification. + //------------------------------------------------------------------------- + + //network initiated USSD request + ussd1.ReceiveMessage(requestStatus1, name, msgAttributes); + iMockLTSY.CompleteL(EMobileUssdMessagingReceiveMessage, KErrNone, dataCl1); + + User::WaitForRequest(requestStatus1); + AssertMockLtsyStatusL(); + + ASSERT_EQUALS(KErrNone, requestStatus1.Int()); + ussd1.AcceptIncomingDialogue(); + + //USSD notification + ussd2.ReceiveMessage(requestStatus2, name, msgAttributes); + iMockLTSY.CompleteL(EMobileUssdMessagingReceiveMessage, KErrNone, dataCl2); + + User::WaitForRequest(requestStatus2); + AssertMockLtsyStatusL(); + + ASSERT_EQUALS(KErrNone, requestStatus2.Int()); + ussd2.RejectIncomingDialogue(); + + CleanupStack::PopAndDestroy(5, this); // this, dataCl1, dataCl2, ussd1, ussd2 + } /** @SYMTestCaseID BA-CTSY-USSDM-URM-0003 @@ -5626,7 +5841,7 @@ @SYMComponent telephony_ctsy @SYMTestCaseDesc Test support in CTSY client requests to RMobileUssdMessaging::SendMessage with default handler @SYMTestPriority High -@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessageDefaultHandler option +@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessage with DefaultHandler option @SYMTestExpectedResults Pass @SYMTestType CT */ @@ -5716,8 +5931,8 @@ } //------------------------------------------------------------------------- - iMockLTSY.ExpectL(EMobileUssdMessagingSendMessageDefaultHandler, data); - iMockLTSY.CompleteL(EMobileUssdMessagingSendMessageDefaultHandler, KErrNone); + iMockLTSY.ExpectL(EMobileUssdMessagingSendMessage, data); + iMockLTSY.CompleteL(EMobileUssdMessagingSendMessage, KErrNone); ussdMessaging.SendMessage(requestStatus, msgData, msgAttributes, RMobileUssdMessaging::ETransferToDefaultHandler); User::WaitForRequest(requestStatus); @@ -5778,7 +5993,7 @@ @SYMComponent telephony_ctsy @SYMTestCaseDesc Test support in CTSY client requests to RMobileUssdMessaging::SendMessage with two default clients @SYMTestPriority High -@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessageDefaultHandler option +@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessage with DefaultHandler option @SYMTestExpectedResults Pass @SYMTestType CT */ @@ -5870,8 +6085,8 @@ } //------------------------------------------------------------------------- - iMockLTSY.ExpectL(EMobileUssdMessagingSendMessageDefaultHandler, data); - iMockLTSY.CompleteL(EMobileUssdMessagingSendMessageDefaultHandler, KErrNone); + iMockLTSY.ExpectL(EMobileUssdMessagingSendMessage, data); + iMockLTSY.CompleteL(EMobileUssdMessagingSendMessage, KErrNone); ussdMessaging.SendMessage(requestStatus, msgData, msgAttributes, RMobileUssdMessaging::ETransferToDefaultHandler); User::WaitForRequest(requestStatus); @@ -5932,7 +6147,7 @@ @SYMComponent telephony_ctsy @SYMTestCaseDesc Test support in CTSY client requests to RMobileUssdMessaging::SendMessage with default and priority clients @SYMTestPriority High -@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessageDefaultHandler option +@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessage with DefaultHandler option @SYMTestExpectedResults Pass @SYMTestType CT */ @@ -6024,8 +6239,8 @@ } //------------------------------------------------------------------------- - iMockLTSY.ExpectL(EMobileUssdMessagingSendMessageDefaultHandler, data); - iMockLTSY.CompleteL(EMobileUssdMessagingSendMessageDefaultHandler, KErrNone); + iMockLTSY.ExpectL(EMobileUssdMessagingSendMessage, data); + iMockLTSY.CompleteL(EMobileUssdMessagingSendMessage, KErrNone); ussdMessaging.SendMessage(requestStatus, msgData, msgAttributes, RMobileUssdMessaging::ETransferToDefaultHandler); User::WaitForRequest(requestStatus); @@ -6085,7 +6300,7 @@ @SYMComponent telephony_ctsy @SYMTestCaseDesc Test support in CTSY client requests to RMobileUssdMessaging::SendMessage with default, normal and priority clients @SYMTestPriority High -@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessageDefaultHandler option +@SYMTestActions Invokes request to RMobileUssdMessaging::SendMessage with EMobileUssdMessagingSendMessage with DefaultHandler option @SYMTestExpectedResults Pass @SYMTestType CT */ @@ -6178,8 +6393,8 @@ } //------------------------------------------------------------------------- - iMockLTSY.ExpectL(EMobileUssdMessagingSendMessageDefaultHandler, data); - iMockLTSY.CompleteL(EMobileUssdMessagingSendMessageDefaultHandler, KErrNone); + iMockLTSY.ExpectL(EMobileUssdMessagingSendMessage, data); + iMockLTSY.CompleteL(EMobileUssdMessagingSendMessage, KErrNone); ussdMessaging.SendMessage(requestStatus, msgData, msgAttributes, RMobileUssdMessaging::ETransferToDefaultHandler); User::WaitForRequest(requestStatus);