--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_StatusReportSchemeTransfer.cpp Fri Mar 19 09:55:57 2010 +0200
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_StatusReportSchemeTransfer.cpp Fri Apr 16 16:12:37 2010 +0300
@@ -18,15 +18,14 @@
*/
#include "Te_StatusReportSchemeTransfer.h"
+
/**
Create a SMS and get the SMSC and TPSRR operations
*/
TVerdict CTestSchemeSending::doTestStepPreambleL()
{
//Call the base class preamble
- CTestStatusReportScheme::doTestStepPreambleL();
-
- __UHEAP_MARK;
+ CSmsStatusReportSchemeTestStep::doTestStepPreambleL();
//Create SMS message from ini file specified as "message"
CreateSmsL(iDataCodingScheme ,_L("message"));
@@ -41,89 +40,80 @@
{
delete iSmsMessage;
iSmsMessage = NULL;
-
- __UHEAP_MARKEND;
- CTestStatusReportScheme::doTestStepPostambleL();
+ CSmsStatusReportSchemeTestStep::doTestStepPostambleL();
return TestStepResult();
}
-
/**
Get the TP-SRR operations on the SMS
*/
TVerdict CTestSendingTPSRRScheme::doTestStepPreambleL()
-{
- //Call the base class preamble
- CTestSchemeSending::doTestStepPreambleL();
-
- INFO_PRINTF1(_L("Test sending a message with TP-SRR scheme"));
-
- return TestStepResult();
-}
+ {
+ //Call the base class preamble
+ CTestSchemeSending::doTestStepPreambleL();
+ INFO_PRINTF1(_L("Test sending a message with TP-SRR scheme"));
+ return TestStepResult();
+ }
/**
SIM TSY verifies the message sent
*/
TVerdict CTestSendingTPSRRScheme::doTestStepL()
-{
- SendSmsMessageL();
-
- return TestStepResult();
-}
+ {
+ SendSmsMessageL();
+ return TestStepResult();
+ }
/**
Send the message
*/
TVerdict CTestSendingTPSRRScheme::doTestStepPostambleL()
-{
- //Call the base class preamble
- CTestSchemeSending::doTestStepPostambleL();
-
- return TestStepResult();
-}
+ {
+ //Call the base class preamble
+ CTestSchemeSending::doTestStepPostambleL();
+ return TestStepResult();
+ }
/**
Get the SMSC operations on the SMS
*/
TVerdict CTestSendingSMSCScheme::doTestStepPreambleL()
-{
- //Call the base class preamble
- CTestSchemeSending::doTestStepPreambleL();
-
- INFO_PRINTF1(_L("Test sending a message with SMSC scheme"));
-
- return TestStepResult();
-}
+ {
+ //Call the base class preamble
+ CTestSchemeSending::doTestStepPreambleL();
+ INFO_PRINTF1(_L("Test sending a message with SMSC scheme"));
+ return TestStepResult();
+ }
/**
SIM TSY verifies the message sent
*/
TVerdict CTestSendingSMSCScheme::doTestStepL()
-{
- SendSmsMessageL();
-
- return TestStepResult();
-}
+ {
+ SendSmsMessageL();
+
+ return TestStepResult();
+ }
/**
Send the message
*/
TVerdict CTestSendingSMSCScheme::doTestStepPostambleL()
-{
- //Call the base class preamble
- CTestSchemeSending::doTestStepPostambleL();
-
- return TestStepResult();
-}
+ {
+ //Call the base class preamble
+ CTestSchemeSending::doTestStepPostambleL();
+
+ return TestStepResult();
+ }
/**
Preamble for all receiving test cases
@@ -131,12 +121,11 @@
TVerdict CTestSchemeReceiving::doTestStepPreambleL()
{
//Call base class preamble
- CTestStatusReportScheme::doTestStepPreambleL();
+ CSmsStatusReportSchemeTestStep::doTestStepPreambleL();
return TestStepResult();
}
-
/**
All receiving of status reports
*/
@@ -145,93 +134,80 @@
//Call base class preamble
CTestSchemeReceiving::doTestStepPreambleL();
- //Create a message
- __UHEAP_MARK;
-
//Create SMS message from ini file specified as "message"
CreateSmsL(iDataCodingScheme ,_L("message"));
return TestStepResult();
}
-
/**
Receive a status report and return its status
*/
void CTestReceivingStatusReports::ReceiveStatusReportL(TSmsStatus::TSmsStatusValue& aStatus )
-{
- //Get the expectd status
- TInt intStatus;
- GetIntFromConfig(ConfigSection(), _L("status"), intStatus);
- iExpectedStatus = (TSmsStatus::TSmsStatusValue)intStatus;
+ {
+ //Get the expectd status
+ TInt intStatus;
+ GetIntFromConfig(ConfigSection(), _L("status"), intStatus);
+ iExpectedStatus = (TSmsStatus::TSmsStatusValue)intStatus;
- //Get the service center
- TSmsServiceCenterAddress telephoneNumber;
- telephoneNumber.Copy( KTestNumber );
+ //Get the service center
+ TSmsServiceCenterAddress telephoneNumber;
+ telephoneNumber.Copy( KTestNumber );
- //Receive status report and return the status
- aStatus = RecvStatusReportL(telephoneNumber, iSocket);
-}
+ //Receive status report and return the status
+ aStatus = RecvStatusReportL(telephoneNumber, iSocket);
+ }
/**
All receiving status reports tests do the same steps
*/
TVerdict CTestReceivingStatusReports::doTestStepL()
-{
- SendSmsMessageL();
- TSmsStatus::TSmsStatusValue status;
- ReceiveStatusReportL(status);
- TESTL(status == iExpectedStatus);
-
- return TestStepResult();
-}
+ {
+ SendSmsMessageL();
+ TSmsStatus::TSmsStatusValue status;
+ ReceiveStatusReportL(status);
+ TESTL(status == iExpectedStatus);
+
+ return TestStepResult();
+ }
/**
Delete the SMS
*/
TVerdict CTestReceivingStatusReports::doTestStepPostambleL()
-{
- delete iSmsMessage;
- iSmsMessage = NULL;
-
- __UHEAP_MARKEND;
+ {
+ delete iSmsMessage;
+ iSmsMessage = NULL;
- CTestSchemeReceiving::doTestStepPostambleL();
-
- return TestStepResult();
-}
+ CTestSchemeReceiving::doTestStepPostambleL();
+ return TestStepResult();
+ }
/**
All receiving of status reports
*/
TVerdict CTestReceivingMessages::doTestStepPreambleL()
-{
- //Call base class preamble
- CTestSchemeReceiving::doTestStepPreambleL();
-
- //Create a message
- __UHEAP_MARK;
+ {
+ //Call base class preamble
+ CTestSchemeReceiving::doTestStepPreambleL();
- //Receive an SMS Message
- WaitForRecvL(iSocket);
- iSmsMessage = RecvSmsL(iSocket);
-
- return TestStepResult();
-}
+ //Receive an SMS Message
+ WaitForRecvL(iSocket);
+ iSmsMessage = RecvSmsL(iSocket);
+ return TestStepResult();
+ }
/**
Delete the SMS
*/
TVerdict CTestReceivingMessages::doTestStepPostambleL()
-{
- delete iSmsMessage;
- iSmsMessage = NULL;
+ {
+ delete iSmsMessage;
+ iSmsMessage = NULL;
- __UHEAP_MARKEND;
+ CTestSchemeReceiving::doTestStepPostambleL();
- CTestSchemeReceiving::doTestStepPostambleL();
-
- return TestStepResult();
-}
+ return TestStepResult();
+ }