FCL/sf/os/cellularsrv: comparison smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt

equal deleted inserted replaced

-:1f776524b15c
+:244d7c5f118e
 /**
 @file
 */
 #include "te_smsprt_R6.h"
-#include "e32def.h"
-#include "gsmunonieoperations.h"
+#include <gsmunonieoperations.h>
+#include <gsmubuf.h>
+#include <gsmuset.h>
+#include <gsmuieoperations.h>
+#include "smsstacktestconsts.h"
+#include "smsstacktestutilities.h"
 TVerdict CTestSinglePDUHyperLinks::doTestStepL()
 /**
 *  Test a simple Transmit and Receive of a TPDU
 */
 	{
 	INFO_PRINTF1(_L("Test HyperLinks in SMS message"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 70);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	//This is a 95 character msg.
 	_LIT(KTestMsg,"HyperLink message, Symbian. http://www.symbian.com Some content Intranet http://web.intra/homes");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	INFO_PRINTF2(_L("Destination number:..... %S "),&iTelephoneNumber);
 	INFO_PRINTF2(_L("ServiceCenter number:... %S "),&iServiceCenterNumber);
 	//Get the operations
 	//Single Hyperlink SMS
 	INFO_PRINTF1(_L("waiting for incoming SMS with single hyperlink...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
 	CleanupStack::PushL(smsMessage);
 	TestSmsContentsL(smsMessage,KTestMsg);
 	//Get the operations
 	CSmsHyperLinkOperations& deliverPDUOperations = static_cast<CSmsHyperLinkOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsHyperLinkFormat));
 	//NumberOfHyperLinks
 	//Multiple Hyperlink SMS
 	INFO_PRINTF1(_L("waiting for incoming SMS with two hyperlinks...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
 	CleanupStack::PushL(smsMessage);
 	TestSmsContentsL(smsMessage,KTestMsg);
 	//Get the operations
 	CSmsHyperLinkOperations& multipleHyperLinkOperations = static_cast<CSmsHyperLinkOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsHyperLinkFormat));
 	//NumberOfHyperLinks
 	count=multipleHyperLinkOperations.NumberOfHyperLinksL();
 	count=noneHyperLinkOperations.NumberOfHyperLinksL();
 	TEST(count==0);
 	CleanupStack::PopAndDestroy(smsMessage);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult() ;
 }
-//Multiple PDU's
 TVerdict CTestMultiplePDUHyperLinks::doTestStepL()
 /**
 *  Test a simple Transmit and Receive of a TPDU
 */
 	{
 	INFO_PRINTF1(_L("Test multiple PDUs with hyperLinks in SMS message"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 71);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	_LIT(KLongText,"YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCC");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KLongText,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KLongText,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Check number of hyperlinks
 	//Get the operations
 	CSmsHyperLinkOperations& operations =
 		static_cast<CSmsHyperLinkOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsHyperLinkFormat));
 	count=noHyperlinksInFirstPDUOperations.NumberOfHyperLinksL();
 	TEST(count==9);
 	CleanupStack::PopAndDestroy(smsMessage);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult() ;
 }
 TVerdict CTestSinglePDUReplyAddress::doTestStepL()
 /**
 *  Test reply address can be different to the senders address
 */
 	{
-	__UHEAP_MARK;
 	INFO_PRINTF1(_L("Test reply address in SMS message"));
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 72);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	//This is character msg
 	_LIT(KTestMsg,"Reply address message.  Message will be sent to other address than sender");
 	_LIT(KEmptyMsg,"");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* specialMessageAndReplyAddresMessage=CreateSmsMessageL(KEmptyMsg,alphabet);
+	CSmsMessage* specialMessageAndReplyAddresMessage=CreateSmsMessageLC(KEmptyMsg,alphabet);
-	CleanupStack::PushL(specialMessageAndReplyAddresMessage);
 	//Get the operations
 	CSmsReplyAddressOperations& replyAddressOperations =
 		static_cast<CSmsReplyAddressOperations&>(specialMessageAndReplyAddresMessage->GetOperationsForIEL(CSmsInformationElement::ESmsReplyAddressFormat));
 	//PDU maximym of 140 octects = C8
 	//Each special message is 4 octects.
 	//Maximum variations on the type of messages for 5 bits is 32
 	for(TInt indicationType=EGsmSmsVoiceMessageWaiting; indicationType<=EGsmSmsExtendedMessageTypeWaiting;
-				indicationType++)
+				++indicationType)
 	{
 		TBool toStore=EFalse;
 		TSmsMessageProfileType messageProfileType=EGsmSmsProfileId1;
 		TUint8 messageCount=5;
 		for(TUint extendedType=EGsmSmsNoExtendedMessageTypeIndication;
-					extendedType<=EGsmSmsExtendedIndicationType7; extendedType++)
+					extendedType<=EGsmSmsExtendedIndicationType7; ++extendedType)
 		{
 			TRAP(err,specialMessageOperations.AddSpecialMessageIndicationL(toStore,TSmsMessageIndicationType(indicationType),
 									TExtendedSmsIndicationType(extendedType),messageProfileType,messageCount));
 			TEST(err==KErrNone);
 		}
 	}
 	//Add six zero length information elements
 	//Get the PDU
 	CSmsPDU &pdu=specialMessageAndReplyAddresMessage->SmsPDU();
 	//Get the UserData
 	CSmsUserData &userData=pdu.UserData();
-	_LIT8(KEmptyString,"");
 	//Add the information element
 	//TSmsId
 	for(TUint informationElement=CSmsInformationElement::ESmsIEISIMToolkitSecurityHeaders1;
-				informationElement<=CSmsInformationElement::ESmsIEISIMToolkitSecurityHeaders5;
+		informationElement<=CSmsInformationElement::ESmsIEISIMToolkitSecurityHeaders5;
-				informationElement++)
+		++informationElement)
-	{
+	    {
-		//CSmsInformationElement::TSmsInformationElementIdentifier informationElement;
 		TRAP(err,userData.AddInformationElementL(
-			CSmsInformationElement::TSmsInformationElementIdentifier(informationElement),KEmptyString()));
+			CSmsInformationElement::TSmsInformationElementIdentifier(informationElement),KNullDesC8()));
 		TEST(err==KErrNone);
-	}
+	    }
 	//Add address
 	TPtrC replyAddress;
 	GetStringFromConfig(ConfigSection(), _L("replyAddressInternational"), replyAddress);
 	TRAP(err,replyAddressOperations.AddReplyAddressL(replyAddress));
 	TEST(!result);
 	CleanupStack::PopAndDestroy(specialMessageAndReplyAddresMessage);
 	//Create a new message
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Get the operations
 	CSmsReplyAddressOperations& operations =
 		static_cast<CSmsReplyAddressOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsReplyAddressFormat));
 	//Receive a message with no reply address
 	INFO_PRINTF1(_L("waiting for incoming SMS with no reply address...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
-	INFO_PRINTF1(_L("incoming SMS") );
 	CleanupStack::PushL(smsMessage);
 	TestSmsContentsL(smsMessage,KTestMsg);
 	//Get the operations
 	CSmsReplyAddressOperations& deliverOperations =
 	//-------- END Receive with no reply address
 	INFO_PRINTF1(_L("waiting for incoming SMS with reply address...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
+	CleanupStack::PushL(smsMessage);
-	INFO_PRINTF1(_L("incoming SMS") );
-	CleanupStack::PushL(smsMessage);
 	TestSmsContentsL(smsMessage,KTestMsg);
 	//Get the operations
 	CSmsReplyAddressOperations& deliverReplyOperations =
 		static_cast<CSmsReplyAddressOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsReplyAddressFormat));
 	//-------- END Receive with reply address
 	INFO_PRINTF1(_L("waiting for incoming SMS with parsed reply address...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
+	CleanupStack::PushL(smsMessage);
-	INFO_PRINTF1(_L("incoming SMS") );
-	CleanupStack::PushL(smsMessage);
 	TestSmsContentsL(smsMessage,KTestMsg);
 	//Get the operations
 	CSmsReplyAddressOperations& deliverParsedReplyOperations =
 		static_cast<CSmsReplyAddressOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsReplyAddressFormat));
 	//This PDU has three reply address in it.  We are looking for the stack to store only the last occurence
 	INFO_PRINTF1(_L("waiting for incoming SMS with three reply addresses...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
-	INFO_PRINTF1(_L("incoming SMS") );
 	CleanupStack::PushL(smsMessage);
 	//TestSmsContentsL(smsMessage,KTestMsg);
 	//Get the operations
 	CSmsReplyAddressOperations& deliverMultipleReplyOperations =
 	CleanupStack::PopAndDestroy(smsMessage);
 	//-------- END receive with corrupt reply address
 	//-------- END receive
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 }
 TVerdict CTestMultiplePDUReplyAddress::doTestStepL()
 /**
 *  Test a simple Transmit and Receive of a TPDU
 */
 	{
+// TODO: redundant test case???
 	INFO_PRINTF1(_L("Test multiple PDUs with reply address in SMS message"));
 	return TestStepResult();
 	}
 /**
 *  Test the operations available for special message waiting
 */
 	{
 	INFO_PRINTF1(_L("Test special message waiting operations"));
-	__UHEAP_MARK;
 	//This is character msg - 96 characters
 	_LIT(KTestMsg,"This message is a special message waiting message. You have a special message waiting for you :)");
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Get the operations for a version 0 message i.e. before operations for IE were added
 	smsMessage->SetVersion(CSmsMessage::ESmsMessageV0);
 	TRAPD(err,smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsIEISpecialSMSMessageIndication));
 	TEST(err==KErrNotSupported);
 	INFO_PRINTF1(_L("Test step end !"));
 	CleanupStack::PopAndDestroy(smsMessage);
 	//-------- END API Test for special message operations
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 TVerdict CTestSinglePDUSpecialMessageWaiting::doTestStepL()
 /**
 *  Test a simple Transmit and Receive of a TPDU
 */
 	{
 	INFO_PRINTF1(_L("Test special message waiting in single PDU SMS message"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 73);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	//This is a 95 character msg.
 	_LIT(KTestMsg,"This message is a special message waiting message. You have a special message waiting for you :)");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	INFO_PRINTF2(_L("Destination number:..... %S "),&iTelephoneNumber);
 	INFO_PRINTF2(_L("ServiceCenter number:... %S "),&iServiceCenterNumber);
 	//Get the operations
 	CleanupStack::PopAndDestroy(smsMessage);
 	//-------- END Sending Single PDU
 	//-------- START receiving
-	INFO_PRINTF1(_L("waiting for incoming SMS...") );
+	WaitForRecvL(socket);
-	WaitForRecvL(socket);
+	smsMessage = RecvSmsL(socket);
-	smsMessage = RecvSmsL(socket);
 	CleanupStack::PushL(smsMessage);
 	//Get the operations
 	CSmsSpecialSMSMessageOperations& noSpecialMessageOperations = static_cast<CSmsSpecialSMSMessageOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsIEISpecialSMSMessageIndication));
 	count=noSpecialMessageOperations.GetCountOfSpecialMessageIndicationsL();
 	CleanupStack::PopAndDestroy(smsMessage);
 	//-------- END receive multiple instances of enhanced IE
 	//-------- END receive
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 TVerdict CTestMultiplePDUSpecialMessageWaiting::doTestStepL()
 /**
 *  Test a simple Transmit and Receive of a TPDU
 */
 	INFO_PRINTF1(_L("Test special message waiting in multiple PDU SMS message"));
 	return TestStepResult();
 	}
 TVerdict CTestEnhancedVoiceMailOperations::doTestStepL()
 /**
 *  Test the operations available for special message waiting
 */
 	{
 	INFO_PRINTF1(_L("Test enhanced voice mail message operations"));
-	__UHEAP_MARK;
 	//This is character msg - 96 characters
 	_LIT(KTestMsg,"This is a enhanced voice mail information message!");
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Get the operations
 	CSmsEnhancedVoiceMailOperations& operations =
 			static_cast<CSmsEnhancedVoiceMailOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsEnhanceVoiceMailInformation));
 	voiceMailNotification->SetPriorityIndication(ETrue);
 	//Test the boundary values for calling line identity
 	TUint count=0;
 	//Do this test for both parsed address and international numbers
-	for (TUint addressType=EInternational;addressType<=EParsed;addressType++)
+	for (TUint addressType=EInternational; addressType<=EParsed; ++addressType)
 	{
-		for(TUint boundaryCheck=EInside; boundaryCheck<=EOutside;boundaryCheck++)
+		for(TUint boundaryCheck=EInside; boundaryCheck<=EOutside; ++boundaryCheck)
 		{
 			//Just before the boundary
 			TPtrC boundaryCallingLineIdentity;
 			if (boundaryCheck==EInside)
 			{
 				count=notNeededEnhancedVoiceMailNotification->NumberOfVoiceMails();
 				TEST(count==1);
 				delete notNeededEnhancedVoiceMailNotification;
 			}
 		}
 	}
 	voiceMailNotification->SetParsedCallingLineIdentityL(accessAddressTGsm);
 	//Get the notifications in the enhanced message
 	RPointerArray<CVoiceMailNotification>& newNotificationsList=
 					enhancedVoiceMailNotification->GetVoiceMailNotifications();
 	count=newNotificationsList.Count();
 	//Remove all pointers to notifications
 	if(count)
-	{
+	    {
-		newNotificationsList.Reset();
+newNotificationsList.Reset();
-	}
+	    }
 	result=newNotificationsList.Append(voiceMailNotification);
 	TEST(result==KErrNone);
 	count=enhancedVoiceMailNotification->NumberOfVoiceMails();
 	TEST(count==1);
 	TEST(!result);
 	CleanupStack::PopAndDestroy(retrievedNotification);
 	CleanupStack::PopAndDestroy(enhancedVoiceMailNotification);
 	CleanupStack::PopAndDestroy(smsMessage);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 //Helper function:  Adds the address to a notification
 void CTestEnhancedVoiceMailOperations::AddAddressToNotifcationL(
 			CEnhancedVoiceMailNotification* aEnhancedVoiceMailNotification,
 			CVoiceMailNotification* aVoiceMailNotification,
 			TPtrC aCallingLineIdentity,TUint aAddressType)
 {
 	//Get the notifications in the enhanced message
 	RPointerArray<CVoiceMailNotification>& notificationsList=
 					aEnhancedVoiceMailNotification->GetVoiceMailNotifications();
 	TUint count=notificationsList.Count();
 	if(count==1)
-	{
+	   {
 		notificationsList.Remove(0);
-	}
+	   }
 	//Add the address
 	if(aAddressType==EParsed)
-	{
+	   {
 		//Create Calling Line Identity
 		TGsmSmsTelNumber callingLineIdentityTGsm;
 		callingLineIdentityTGsm.iTelNumber=aCallingLineIdentity;
 		callingLineIdentityTGsm.iTypeOfAddress=EGsmSmsTONAlphaNumeric;
 		aVoiceMailNotification->SetParsedCallingLineIdentityL(callingLineIdentityTGsm);
 	}
 	else
-	{
+	    {
-		aVoiceMailNotification->SetCallingLineIdentityL(aCallingLineIdentity);
+aVoiceMailNotification->SetCallingLineIdentityL(aCallingLineIdentity);
-	}
+	    }
 	//Add the notification to the voice mail
 	TInt result=notificationsList.Append(aVoiceMailNotification);
 	TEST(result==KErrNone);
 }
 TVerdict CTestSinglePDUEnhancedVoiceMailInformation::doTestStepL()
 /**
 *  Test the sending and receiving of enhanced voice mail
 */
 	{
 	INFO_PRINTF1(_L("Test enhanced voice mail information with a single PDU message"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 74);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	//This is an enhanced voice mail character msg.
 	_LIT(KTestMsg,"");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	INFO_PRINTF2(_L("Destination number:..... %S "),&iTelephoneNumber);
 	INFO_PRINTF2(_L("ServiceCenter number:... %S "),&iServiceCenterNumber);
 	//Get the operations
 	//-----------------------------------
 	//Send message with enhanced voice mail length at boundary values
 	//Single pdu, max size = 137.  That is 140-2(UDHL) -1(IEId) = 137
 	//User data = 8C
 	//Make a new message
-	for (TUint i = 0; i < enhancedVoiceMailNotification->NumberOfVoiceMails(); i++)
+	for (TUint i = 0; i < enhancedVoiceMailNotification->NumberOfVoiceMails(); ++i)
 	    {
 	    delete notificationsList[i];
 	    }
 	notificationsList.Reset();
 	CSmsMessage* boundaryValueVoiceMessage=CreateSmsMessageL(KTestMsg,alphabet);
 	CleanupStack::PushL(boundaryValueVoiceMessage);
 	CleanupStack::PushL(enhancedVoiceMailNotification);
 	CSmsEnhancedVoiceMailOperations& boundaryValueVoiceMailOperations =
 		static_cast<CSmsEnhancedVoiceMailOperations&>(boundaryValueVoiceMessage->GetOperationsForIEL(CSmsInformationElement::ESmsEnhanceVoiceMailInformation));
 	//Add five more notifications
 	const TUint KNumNotifications=4;
-	for(count=0;count<KNumNotifications; count++)
+	for(count=0; count<KNumNotifications; ++count)
-	{
+	   {
 		CVoiceMailNotification* voiceMailNotification=CreateVoiceMailNotificationL(callingLineIdentityTGsm);
 		result=notificationsList.Append(voiceMailNotification);
 		TEST(result==KErrNone);
-	}
+	   }
 	//Add the number to make the size on the boundary
 	TPtrC boundaryCallingLineIdentity;
 	GetStringFromConfig(ConfigSection(), _L("boundaryAccessAddress"), boundaryCallingLineIdentity);
 	callingLineIdentityTGsm.iTelNumber=boundaryCallingLineIdentity;
 	CleanupStack::PopAndDestroy(retrievedNotification);
 	CleanupStack::PopAndDestroy(smsMessage);
 	//---------- END receiving
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
+	return TestStepResult();
-	__UHEAP_MARKEND;
-	return TestStepResult();
 	}
-CEnhancedVoiceMailNotification* CTestEnhancedVoiceMail::CreateEnhancedVoiceMailNotificationL(TGsmSmsTelNumber aAccessAddress)
+CEnhancedVoiceMailNotification* CSmsEnhancedVoiceMailTestStep::CreateEnhancedVoiceMailNotificationL(TGsmSmsTelNumber aAccessAddress)
 {
 	CEnhancedVoiceMailNotification* enhancedVoiceMailNotification=CEnhancedVoiceMailNotification::NewL();
 	//Set the properties
 	TSmsMessageProfileType messageProfileType=EGsmSmsProfileId1;
 	enhancedVoiceMailNotification->SetParsedAccessAddressL(aAccessAddress);
 	return enhancedVoiceMailNotification;
 }
+CVoiceMailNotification*  CSmsEnhancedVoiceMailTestStep::CreateVoiceMailNotificationL(TGsmSmsTelNumber aCallingLineIdentity)
-CVoiceMailNotification*  CTestEnhancedVoiceMail::CreateVoiceMailNotificationL(TGsmSmsTelNumber aCallingLineIdentity)
 {
 	CVoiceMailNotification* voiceMailNotification=CVoiceMailNotification::NewL();
 	//Setup the notification
 	TUint16 messageId=2;
 TVerdict CTestMultiplePDUEnhancedVoiceMailInformation::doTestStepL()
 /**
 *  Test the sending and receiving of enhanced voice mail
 */
 	{
+// TODO: redundant test case???
 	INFO_PRINTF1(_L("Test enhanced voice mail information with multiple PDU message"));
 	return TestStepResult();
 	}
 TVerdict CTestEnhancedVoiceMailDeleteOperations::doTestStepL()
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test enhanced voice mail delete confirmation operations"));
-	__UHEAP_MARK;
 	//This is character msg - 96 characters
 	_LIT(KTestMsg,"This is a enhanced voice mail information message!");
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Get the operations
 	CSmsEnhancedVoiceMailOperations& operations =
 			static_cast<CSmsEnhancedVoiceMailOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsEnhanceVoiceMailInformation));
 	TEST(!result);
 	CleanupStack::PopAndDestroy(retrievedDeletion);
 	CleanupStack::PopAndDestroy(enhancedVoiceMailDeleteConfirmation);
 	CleanupStack::PopAndDestroy(smsMessage);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 TVerdict CTestSinglePDUEnhancedVoiceMailDeleteConfirmation::doTestStepL()
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test enhanced voice mail single PDU message delete confirmation"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 75);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	//This is an enhanced voice mail character msg.
 	_LIT(KTestMsg,"");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	INFO_PRINTF2(_L("Destination number:..... %S "),&iTelephoneNumber);
 	INFO_PRINTF2(_L("ServiceCenter number:... %S "),&iServiceCenterNumber);
 	//Get the operations
 						static_cast<CEnhancedVoiceMailDeleteConfirmations*>(retrievedNotification);
 	count=retrievedEnhancedVoiceMailDeleteConfirmation->NumberOfDeletes();
 	TEST(count==1);
 	CleanupStack::PopAndDestroy(retrievedNotification);
 	CleanupStack::PopAndDestroy(smsMessage);
 	//---------- END receiving
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 TVerdict CTestMultiplePDUEnhancedVoiceMailDeleteConfirmation::doTestStepL()
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
+// TODO: redundant test case???
 	INFO_PRINTF1(_L("Test enhanced voice mail multiple PDU message delete confirmation"));
 	return TestStepResult();
 	}
 TVerdict CTest7BitDefaultAlphabet::doTestStepL()
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test 7 bit default alphabet"));
-	__UHEAP_MARK;
 	//Send a message with no alphabet set
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 76);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	//This is a msg.
 	_LIT(KTestMsg,"This message has no coding scheme set.  Assume 7 bit default.");
 	//Set destination and SC numbers
 	smsMessage->UserDataSettings(smsSettings);
 	alphabet=smsSettings.Alphabet();
 	TEST(alphabet==TSmsDataCodingScheme::ESmsAlphabet7Bit);
 	CleanupStack::PopAndDestroy(smsMessage);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 TVerdict CTestZeroLengthIE::doTestStepL()
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test zero length IE, USIM toolkit IE"));
-	__UHEAP_MARK;
 	//Send a message with no alphabet set
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 77);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	_LIT(KTestMsg,"This message has a zero length information element.  USIM toolkit security header.");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//Create message
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	INFO_PRINTF2(_L("Destination number:..... %S "),&iTelephoneNumber);
 	INFO_PRINTF2(_L("ServiceCenter number:... %S "),&iServiceCenterNumber);
 	//Add zero length IE
 	TEST(informationElement==CSmsInformationElement::ESmsIEISIMToolkitSecurityHeaders16);
 	CleanupStack::PopAndDestroy(smsMessage);
 	//-----------
 	//Receive message with multiple USIM security headers - 7F and 70, with zero length
-	INFO_PRINTF1(_L("waiting for incoming SMS with multiple USIM security headers, 7F and 70, with zero length...") );
+	INFO_PRINTF1(_L("Receive SMS with multiple USIM security headers, 7F and 70, with zero length...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
 	CleanupStack::PushL(smsMessage);
 	TestSmsContentsL(smsMessage,KTestMsg);
 	CleanupStack::PopAndDestroy(smsMessage);
 	//-----------
 	//Receive message with multiple USIM security headers - 7F and 7F, with zero length
 	//This is a duplicate information element
-	INFO_PRINTF1(_L("waiting for incoming SMS with multiple USIM security headers, 7F and 7F, with zero length...") );
+	INFO_PRINTF1(_L("Receive SMS with multiple USIM security headers, 7F and 7F, with zero length...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
 	CleanupStack::PushL(smsMessage);
 	TestSmsContentsL(smsMessage,KTestMsg);
 	CleanupStack::PopAndDestroy(smsMessage);
 	//End receiving
 	//-----Send multiple PDU message with one zero length IE =  0x70
 	 _LIT(KLongMessage,"We might as well use our SMS stack in these phones.  It is by far the most robust, and it performs well under stress.  We have built a stack that is worth being inside a phone, processing messages for the wireless communnity :)");
-	CSmsMessage *longSmsMessage=CreateSmsMessageL(KLongMessage,alphabet);
+	CSmsMessage *longSmsMessage=CreateSmsMessageLC(KLongMessage,alphabet);
-	CleanupStack::PushL(longSmsMessage);
 	//Get the PDU
 	CSmsPDU &multiplePdu=longSmsMessage->SmsPDU();
 	//Get the UserData
 	informationElement=secondInformationElement.Identifier();
 	TEST(informationElement==CSmsInformationElement::ESmsIEISIMToolkitSecurityHeaders6);
 	CleanupStack::PopAndDestroy(longSmsMessage);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 /*
 	Class 2 Messages are stored on the SIM.  Automatic deletion in the DCS does not delete these messages
 	from the SIM.  This is the default behaviour.  This behaviour can be changed and it is done in
 	the esk file.  This is tested in test step CTestAutomaticDeletionInDCSAndInESK.
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test automatic deletion of messages marked as such in the code data segment(cds)"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 78);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	_LIT(KTestMsg,"");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Set message to class 2
 	TSmsDataCodingScheme::TSmsClass pduClass=TSmsDataCodingScheme::ESmsClass2;
 	CSmsPDU& pdu = smsMessage->SmsPDU();
 	pdu.SetClass(ETrue,pduClass);
 	//Set message to auto delete
 	TInt autoDeleteHexValue=0x40;
 	pdu.SetBits7To4(TSmsDataCodingScheme::TSmsDCSBits7To4(autoDeleteHexValue));
 	//Send this message
 	SendSmsL(smsMessage,socket);
 	CleanupStack::PopAndDestroy(smsMessage);
 	//----------End Sending
-	//Receive a message of class 2 - message will be stored on the SIM
+	INFO_PRINTF1(_L("Receive a message of class 2 - message will be stored on the SIM..."));
-	INFO_PRINTF1(_L("waiting for incoming SMS...") );
+	WaitForRecvL(socket);
-	WaitForRecvL(socket);
+	smsMessage = RecvSmsL(socket);
-	smsMessage = RecvSmsL(socket);
+	CleanupStack::PushL(smsMessage);
-	CleanupStack::PushL(smsMessage);
 	//Get PDU
 	CSmsPDU& classTwoPdu = smsMessage->SmsPDU();
 	//Class
 	//TSmsDataCodingScheme::TSmsClass pduClass;
 	classTwoPdu.Class(pduClass);
 	//Test the slots
 	count=smsMessage->iSlotArray.Count();
 	TEST(count==1);
 	TGsmSmsSlotEntry smsSlot=smsMessage->iSlotArray[0];
 	TEST(smsSlot.iStore.Compare(_L("S14"))==0);
+	CleanupStack::PopAndDestroy(smsMessage);
-	CleanupStack::PopAndDestroy(smsMessage);
+	INFO_PRINTF1(_L("Receive a message of class 2 with automatic delete - message will be stored on the SIM..."));
-	//Receive a message of class 2 with automatic delete - message will be stored on the SIM
-	INFO_PRINTF1(_L("waiting for incoming SMS class 2 with automatic delete...") );
 	WaitForRecvL(socket);
 	smsMessage = RecvSmsL(socket);
 	CleanupStack::PushL(smsMessage);
 	//Get PDU
 	CSmsPDU& pduClass2 = smsMessage->SmsPDU();
 	TEST(count==1);
 	smsSlot=smsMessage->iSlotArray[0];
 	TEST(smsSlot.iStore.Compare(_L("S14"))==0);
 	CleanupStack::PopAndDestroy(smsMessage);
-	//Receive a message of class 1 with automatic delete
+	INFO_PRINTF1(_L("Receive a message of class 1 with automatic delete...") );
-	INFO_PRINTF1(_L("waiting for incoming SMS class 1 with automatic delete...") );
+	WaitForRecvL(socket);
-	WaitForRecvL(socket);
+	smsMessage = RecvSmsL(socket);
-	smsMessage = RecvSmsL(socket);
+	CleanupStack::PushL(smsMessage);
-	CleanupStack::PushL(smsMessage);
 	//Get PDU
 	CSmsPDU& pduClass1 = smsMessage->SmsPDU();
 	//Class
 	pduClass1.Class(pduClass);
 	TEST(pduClass==TSmsDataCodingScheme::ESmsClass1);
 	//Test the storage
 	storage=smsMessage->Storage();
 	TEST(storage==CSmsMessage::ESmsNoStorage);
 	CleanupStack::PopAndDestroy(smsMessage);
-	//Receive a message of class 3 with automatic delete
+	INFO_PRINTF1(_L("Receive a message of class 3 with automatic delete...") );
-	INFO_PRINTF1(_L("waiting for incoming SMS class 3 with automatic delete...") );
+	WaitForRecvL(socket);
-	WaitForRecvL(socket);
+	smsMessage = RecvSmsL(socket);
-	smsMessage = RecvSmsL(socket);
+	CleanupStack::PushL(smsMessage);
-	CleanupStack::PushL(smsMessage);
 	//Get PDU
 	CSmsPDU& pduClass3 = smsMessage->SmsPDU();
 	//Class
 	pduClass3.Class(pduClass);
 	TEST(pduClass==TSmsDataCodingScheme::ESmsClass3);
 	//Test the storage
 	storage=smsMessage->Storage();
 	TEST(storage==CSmsMessage::ESmsNoStorage);
 	CleanupStack::PopAndDestroy(smsMessage);
-	//Receive a message of class 0 with automatic delete
+	INFO_PRINTF1(_L("Receive a message of class 0 with automatic delete...") );
-	INFO_PRINTF1(_L("waiting for incoming SMS class 0 with automatic delete...") );
+	WaitForRecvL(socket);
-	WaitForRecvL(socket);
+	smsMessage = RecvSmsL(socket);
-	smsMessage = RecvSmsL(socket);
+	CleanupStack::PushL(smsMessage);
-	CleanupStack::PushL(smsMessage);
 	//Get PDU
 	CSmsPDU& pduClass0 = smsMessage->SmsPDU();
 	//Class
 	pduClass0.Class(pduClass);
 	TEST(pduClass==TSmsDataCodingScheme::ESmsClass0);
 	//Test the storage
 	storage=smsMessage->Storage();
 	TEST(storage==CSmsMessage::ESmsNoStorage);
 	CleanupStack::PopAndDestroy(smsMessage);
 	//These are the two class messages received.
 	TEST(count==2);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
-	__UHEAP_MARKEND;
 	return TestStepResult();
 	}
 /*
 	Class 2 Messages are stored on the SIM.  Automatic deletion in the DCS does not delete these messages
 	from the SIM.  This is the default behaviour.  This behaviour can be changed and it is done in
 	the esk file.  This tested in test step CTestAutomaticDeletionInDCSAndInESK.
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test automatic deletion of messages marked in dcs, and set for delete in the ESK file"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 79);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	_LIT(KTestMsg,"Esk file has been set to delete class 2 messages marked for automatic deletion");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme - create message
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Set message to class 2
 	TSmsDataCodingScheme::TSmsClass pduClass=TSmsDataCodingScheme::ESmsClass2;
 	CSmsPDU& pdu = smsMessage->SmsPDU();
 	pdu.SetClass(ETrue,pduClass);
 	count = sbuf();
 	INFO_PRINTF2(_L("%d enumerated messages after receiving messages"), count);
 	TEST(count==0);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
+	return TestStepResult();
-	__UHEAP_MARKEND;
-	return TestStepResult();
 	}
 TVerdict CTestAutomaticDeletionTypeZeroSMS::doTestStepL()
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test automatic deletion of messages of type zero"));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 80);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	_LIT(KTestMsg,"Type 0 Sms message");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme - create message
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Set message to type 0
 	CSmsPDU& pdu = smsMessage->SmsPDU();
 	//Set the PID type
 	TSmsProtocolIdentifier::TSmsPIDType pIdType=TSmsProtocolIdentifier::ESmsPIDShortMessageType;
 	count = sbuf();
 	INFO_PRINTF2(_L("%d enumerated messages"), count);
 	TEST(count==2);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
+	return TestStepResult();
-	__UHEAP_MARKEND;
-	return TestStepResult();
 	}
 TVerdict CTestAutomaticDeletionTypeZeroAndSetInESK::doTestStepL()
 /**
 *  Test the enhanced voice mail delete confirmation
 */
 	{
 	INFO_PRINTF1(_L("Test automatic deletion of messages of type zero, and set for deletion for Class 0 in ESK file."));
-	__UHEAP_MARK;
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 81);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	_LIT(KTestMsg,"Type 0 Sms message");
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	//8 bit coding scheme - create message
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Set message to type 0
 	CSmsPDU& pdu = smsMessage->SmsPDU();
 	//Set the PID type
 	TSmsProtocolIdentifier::TSmsPIDType pIdType=TSmsProtocolIdentifier::ESmsPIDShortMessageType;
 	INFO_PRINTF2(_L("%d enumerated messages"), count);
 	//This is the class 2 message and the class 1 message with PID=00, i.e. Not type 0
 	TEST(count==2);
 	CleanupStack::PopAndDestroy(&socket);
-CleanupStack::PopAndDestroy(&socketServer);
+	return TestStepResult();
-	__UHEAP_MARKEND;
-	return TestStepResult();
 	}
 TVerdict CTestOOMSendR6Sms::doTestStepL()
 /**
 *  Intent:
 *
 *  4) Repeat the test iteratively, incrementing the counter "i" each time until the message is sent
 *  successfully.
 */
 	{
 	INFO_PRINTF1(_L("Test out of memory handling"));
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 82);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	//Set destination and SC numbers
 	iTelephoneNumber=KPekka;
 	iServiceCenterNumber=KRadiolinjaSC;
 	_LIT(KTestMsg1,"test message, 8bits, length 30");
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg1,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg1,alphabet);
-	CleanupStack::PushL(smsMessage);
 	//Get the operations
 	CSmsHyperLinkOperations& hyperLinkOperations = static_cast<CSmsHyperLinkOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsHyperLinkFormat));
 	TUint count=hyperLinkOperations.NumberOfHyperLinksL();
 	count=0;
 	TInt ret=KErrNoMemory;
 	TInt successfullSends=0;  //maximum expected number of succeeded sends is 2 in TSY config file
 	while (successfullSends<8)
 		{
-		socketServer.__DbgFailNext(count);
+		iSocketServer.__DbgFailNext(count);
-		socketServer.__DbgMarkHeap();
+		iSocketServer.__DbgMarkHeap();
 		TRAP(ret,SendSmsDontCheckReturnValueL(smsMessage,socket));
-		socketServer.__DbgMarkEnd(0);
+		iSocketServer.__DbgMarkEnd(0);
 		if(ret==KErrNone)
-			successfullSends++;
+		    {
-		count++;
+			++successfullSends;
+		    }
+		++count;
 		}
 	TEST(ret == KErrNone);
-	socketServer.__DbgFailNext(-1); // Reset heap
+	iSocketServer.__DbgFailNext(-1); // Reset heap
 	INFO_PRINTF1(_L("TPSRR Scheme"));
 	// TPSRR Scheme
 	CSmsTPSRROperations& TPSRROperations = static_cast<CSmsTPSRROperations&>(smsMessage->GetOperationsForNonIEL(ESmsTPSRRParameter));
 	count=0;
 	ret=KErrNoMemory;
 	successfullSends=0;  //maximum expected number of succeeded sends is 2 in TSY config file
 	while (successfullSends<12)
 		{
-		socketServer.__DbgFailNext(count);
+		iSocketServer.__DbgFailNext(count);
-		socketServer.__DbgMarkHeap();
+		iSocketServer.__DbgMarkHeap();
 		TRAP(ret,SendSmsDontCheckReturnValueL(smsMessage,socket));
-		socketServer.__DbgMarkEnd(0);
+		iSocketServer.__DbgMarkEnd(0);
 		if(ret==KErrNone)
-			successfullSends++;
+		    {
-		count++;
+++successfullSends;
+		    }
+		++count;
 		}
 	TEST(ret == KErrNone);
-	socketServer.__DbgFailNext(-1); // Reset heap
+	iSocketServer.__DbgFailNext(-1); // Reset heap
-	CleanupStack::PopAndDestroy(2);	//smsMessage, socket
+	CleanupStack::PopAndDestroy(2, &socket); // socket, smsMessage
-	//Ensure socket server session is closed to remove cache
-CleanupStack::PopAndDestroy(&socketServer);
 	return TestStepResult() ;
 	}
+TVerdict CTestEnhancedVoiceMessageBoundary::doTestStepL()
-TVerdict CEnhancedVoiceMessageBoundaryTest::doTestStepL()
 {
 	/**
 	 *  Create a Enhanced Voice Mail Information Element that occupies 139 bytes.
 	 *  139 bytes is the maximum that fit into a single segment message.
 	 */
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 83);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	CEnhancedVoiceMailNotification* enhancedVoiceMailNotification = CEnhancedVoiceMailNotification::NewL();
 	// Set up base class
 	enhancedVoiceMailNotification->SetProfile(EGsmSmsProfileId3);
 	enhancedVoiceMailNotification->SetAccessAddressL(KPhoneNumber);
 	enhancedVoiceMailNotification->SetNumberOfVoiceMessages(0xFF);
 	RPointerArray<CVoiceMailNotification>& voiceMailNotificationArray = enhancedVoiceMailNotification->GetVoiceMailNotifications();
-	for (TUint i = 0; i < 8; i++)
+	for (TUint i = 0; i < 8; ++i)
 		{
 		// Set up notification 1
 		CVoiceMailNotification* voiceMailNotification = CVoiceMailNotification::NewL();
 		voiceMailNotification->SetMessageId(0xFFFF);
 	voiceMailNotificationArray.Append(voiceMailNotification);
 	}
 	_LIT(KTestMsg1,"");
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg1,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg1,alphabet);
-	CleanupStack::PushL(smsMessage);
 	TSmsUserDataSettings userDataSettings;
 	userDataSettings.SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet8Bit);
 	smsMessage->SetUserDataSettingsL(userDataSettings);
 	delete enhancedVoiceMailNotification;
 	//Send the message
 	SendSmsL(smsMessage,socket);
-	CleanupStack::PopAndDestroy(smsMessage);
+CleanupStack::PopAndDestroy(2, &socket); // socket, smsMessage
-	CleanupStack::PopAndDestroy(&socket);
+	return TestStepResult();
-CleanupStack::PopAndDestroy(&socketServer);
-	return TestStepResult();
 }
+TVerdict CTestEnhancedVoiceMessageBoundary1::doTestStepL()
-TVerdict CEnhancedVoiceMessageBoundaryTest1::doTestStepL()
 {
 	/*Creates the maximum size enhanced voice message ie that will fit
 	* into a concatenated message, size 134 bytes, allowing 5 bytes for
 	* a concatenation ie in the PDU.
 	*/
-	RSocketServ socketServer;
-	PrepareRegTestLC(socketServer, 84);
 	RSocket socket;
-	iSmsStackTestUtils->OpenSmsSocketLC(socketServer,socket,ESmsAddrRecvAny);
+	iSmsStackTestUtils->OpenSmsSocketLC(iSocketServer,socket,ESmsAddrRecvAny);
 	CEnhancedVoiceMailNotification* enhancedVoiceMailNotification = CEnhancedVoiceMailNotification::NewL();
 	// Set up base class
 	enhancedVoiceMailNotification->SetProfile(EGsmSmsProfileId3);
 	enhancedVoiceMailNotification->SetAccessAddressL(KPhoneNumber);
 	enhancedVoiceMailNotification->SetNumberOfVoiceMessages(0xFF);
 	RPointerArray<CVoiceMailNotification>& voiceMailNotificationArray = enhancedVoiceMailNotification->GetVoiceMailNotifications();
-	for (TUint i = 0; i < 8; i++)
+	for (TUint i = 0; i < 8; ++i)
 	{
 		// Set up notification 1
 		CVoiceMailNotification* voiceMailNotification = CVoiceMailNotification::NewL();
 		voiceMailNotification->SetMessageId(0xFFFF);
 			voiceMailNotificationArray.Append(voiceMailNotification);
 	}
 	_LIT(KTestMsg1,"Dundee United");
 	TSmsDataCodingScheme::TSmsAlphabet alphabet=TSmsDataCodingScheme::ESmsAlphabet8Bit;
-	CSmsMessage* smsMessage=CreateSmsMessageL(KTestMsg1,alphabet);
+	CSmsMessage* smsMessage=CreateSmsMessageLC(KTestMsg1,alphabet);
-	CleanupStack::PushL(smsMessage);
 	TSmsUserDataSettings userDataSettings;
 	userDataSettings.SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet8Bit);
 	smsMessage->SetUserDataSettingsL(userDataSettings);
 	delete enhancedVoiceMailNotification;
 	//Send the message
 	SendSmsL(smsMessage,socket);
-	CleanupStack::PopAndDestroy(smsMessage);
+CleanupStack::PopAndDestroy(2, &socket); // socket, smsMessage
-	CleanupStack::PopAndDestroy(&socket);
+	return TestStepResult();
-CleanupStack::PopAndDestroy(&socketServer);
-	return TestStepResult();
 }
+TVerdict CTestSubmitReportDefaultsTo7BitDecoding::doTestStepL()
-TVerdict CSubmitReportDefaultsTo7BitDecoding::doTestStepL()
 {
 	TBuf8<30> buff;
 	buff.SetLength(30);
 	buff[0]  =   1;
 	buff[1]  =   5; // Parameter Id
 // Verify that the message has been decoded with the DCS defaulted to 7 Bit
 	_LIT(KTestMsg,"David Narey");
 	TestSmsContentsL(decodedMessage,KTestMsg);
 	CleanupStack::PopAndDestroy(decodedMessage);
 return TestStepResult();
 }
+TVerdict CTestDeliverReportDefaultsTo7BitDecoding::doTestStepL()
-TVerdict CDeliverReportDefaultsTo7BitDecoding::doTestStepL()
 {
 	TBuf8<30> buff;
 	buff.SetLength(30);
 	buff[0]  =   0; // change from a 1
 	buff[1]  =   5; // Parameter Id
 // Verify that the message has been decoded with the DCS defaulted to 7 Bit
 	_LIT(KTestMsg,"David Narey");
 	TestSmsContentsL(decodedMessage,KTestMsg);
 	CleanupStack::PopAndDestroy(decodedMessage);
 return TestStepResult();
 }
+TVerdict CTestStatusReportDefaultsTo7BitDecoding::doTestStepL()
-TVerdict CStatusReportDefaultsTo7BitDecoding::doTestStepL()
 {
 	TBuf8<40> buff;
 	buff.SetLength(40);
 	buff[0]  = 6;
 // Verify that the message has been decoded with the DCS defaulted to 7 Bit
 	_LIT(KTestMsg,"David Narey");
 	TestSmsContentsL(decodedMessage,KTestMsg);
 	CleanupStack::PopAndDestroy(decodedMessage);
 return TestStepResult();
 }

changeset 20	244d7c5f118e
parent 0	3553901f7fa8
child 24	6638e7f4bd8f
child 38	b6a16c6baaa3