--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapStatusReports.cpp Fri Feb 19 23:59:33 2010 +0200
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapStatusReports.cpp Fri Mar 12 15:49:38 2010 +0200
@@ -16,120 +16,124 @@
//
/**
- @file
+ @file
+ @test
*/
#include "WapStatusReports.h"
+#include <Gsmumsg.h>
+#include <simtsy.h>
+
+#include "WapProtSuiteDefs.h"
+
/**
Preamble for all status report steps
*/
TVerdict CTestWapStatusReports::doTestStepPreambleL()
-{
- CWapProtSuiteStepBase::doTestStepPreambleL();
-
- SetTestNumberL();
-
- // Connect to socket server
- User::LeaveIfError(iSocketServer.Connect());
+ {
+ CWapProtSuiteStepBase::doTestStepPreambleL();
+
+ OpenSocketL(iSocketServer, iSocket);
+
+ SetCodingSchemeL();
+ INFO_PRINTF1(_L("Coding scheme set is successful ..."));
+ SetMessageTypeL();
+ INFO_PRINTF1(_L("Message type setup is successful ..."));
+ ReadWapPortSettingsL(iWapAddr, KWapPort);
+ INFO_PRINTF1(_L("Reading Wap port setting is successful ..."));
+
+ // Bind
+ User::LeaveIfError(iSocket.Bind(iWapAddr));
+
+ TTimeIntervalMicroSeconds32 InitPause=9000000; //Required Pause to Allow SMSStack to Complete its Async Init
+ User::After(InitPause); //call to the TSY and finish its StartUp.
- // Define and open the socket
- User::LeaveIfError(iSocket.Open(iSocketServer,KWAPSMSAddrFamily,KSockDatagram,KWAPSMSDatagramProtocol));
-
- // Waiting for the phone to be initialised
- WaitForInitializeL();
+
+ return TestStepResult();
+ }
- SetCodingSchemeL();
- SetMessageTypeL();
- SetWapAddrL();
-
- return TestStepResult();
-}
+/**
+Postamble for all status report steps
+*/
+TVerdict CTestWapStatusReports::doTestStepPostambleL()
+ {
+ iSocket.Close();
+
+ CWapProtSuiteStepBase::doTestStepPostambleL();
+
+ return TestStepResult();
+ }
/**
Utility for sending a wap message
*/
void CTestWapStatusReports::SendWapMessageL()
-{
- // Indicating to the protocol that it's a new client
- //INFO_PRINTF1(_L("Socket set option for indicating new client"));
- //User::LeaveIfError(iSocket.SetOpt(KWapSmsOptionNewStyleClient,KWapSmsOptionLevel, 0));
-
- //Get the data
- TPtrC textData;
- GetStringFromConfig(ConfigSection(),_L("message"), textData);
-
- //Set the buffer
- TBuf8<1000> data;
- data.Copy(textData);
-
- //Send the message
- TRequestStatus status;
- iSocket.SendTo(data, iWapAddr, 0, status);
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- INFO_PRINTF1(_L("Message sent!"));
-}
-
+ {
+ // Indicating to the protocol that it's a new client
+ //INFO_PRINTF1(_L("Socket set option for indicating new client"));
+ //User::LeaveIfError(iSocket.SetOpt(KWapSmsOptionNewStyleClient,KWapSmsOptionLevel, 0));
+
+ //Get the data
+ TPtrC textData;
+ GetStringFromConfig(ConfigSection(),_L("message"), textData);
+
+ //Set the buffer
+ TBuf8<1000> data;
+ data.Copy(textData);
+
+ //Send the message
+ TRequestStatus status;
+ iSocket.SendTo(data, iWapAddr, 0, status);
+ User::WaitForRequest(status);
+ User::LeaveIfError(status.Int());
+ INFO_PRINTF1(_L("Message sent!"));
+ }
/**
Utility for getting the expected status
*/
void CTestWapStatusReports::GetExpectedStatus()
-{
- //Get the port number from the ini file
- GetIntFromConfig(ConfigSection(),_L("expectedStatus"), iExpectedStatus);
-}
+ {
+ //Get the port number from the ini file
+ GetIntFromConfig(ConfigSection(),_L("expectedStatus"), iExpectedStatus);
+ }
/**
Utility for receiving status reports
*/
TSmsStatus::TSmsStatusValue CTestWapStatusReports::ReceiveStatusReportL()
-{
- INFO_PRINTF1(_L("waiting for incoming status report...") );
- WaitForRecvL(iStatusReportSocket);
- CSmsMessage* smsMessage = RecvSmsL(iStatusReportSocket);
-
- INFO_PRINTF1(_L("incoming SMS") );
-
- //Check the status report
- CleanupStack::PushL(smsMessage);
- TBool isSR = (smsMessage->Type()==CSmsPDU::ESmsStatusReport);
-
- if (isSR)
- {
- INFO_PRINTF1(_L("Received status report"));
- TSmsServiceCenterAddress telephoneNumber=smsMessage->ToFromAddress();
- }
- else
- {
- INFO_PRINTF1(_L("Received SMS is NOT a Status report!"));
- }
-
- TEST(isSR==1);
-
- //Get the status report
- CSmsStatusReport& statusReport = static_cast<CSmsStatusReport&>(smsMessage->SmsPDU());
- TSmsStatus::TSmsStatusValue status = statusReport.Status();
-
- CleanupStack::PopAndDestroy(smsMessage);
-
- return status;
-}
-
-
-/**
-Postamble for all status report steps
-*/
-TVerdict CTestWapStatusReports::doTestStepPostambleL()
-{
- iSocket.Close();
- iSocketServer.Close();
-
- CWapProtSuiteStepBase::doTestStepPostambleL();
-
- return TestStepResult();
-}
+ {
+ INFO_PRINTF1(_L("waiting for incoming status report...") );
+ WaitForRecvL(iStatusReportSocket);
+ CSmsMessage* smsMessage = RecvSmsL(iStatusReportSocket);
+
+ INFO_PRINTF1(_L("incoming SMS") );
+
+ //Check the status report
+ CleanupStack::PushL(smsMessage);
+ TBool isSR = (smsMessage->Type()==CSmsPDU::ESmsStatusReport);
+
+ if (isSR)
+ {
+ INFO_PRINTF1(_L("Received status report"));
+ TSmsServiceCenterAddress telephoneNumber=smsMessage->ToFromAddress();
+ }
+ else
+ {
+ INFO_PRINTF1(_L("Received SMS is NOT a Status report!"));
+ }
+
+ TEST(isSR);
+
+ //Get the status report
+ CSmsStatusReport& statusReport = static_cast<CSmsStatusReport&>(smsMessage->SmsPDU());
+ TSmsStatus::TSmsStatusValue status = statusReport.Status();
+
+ CleanupStack::PopAndDestroy(smsMessage);
+
+ return status;
+ }
//-----------------------------------------------------------------------------
@@ -137,78 +141,80 @@
Setup the SMS for TP-SRR operations on the SMS
*/
TVerdict CTestRequestingStatusReports::doTestStepPreambleL()
-{
- //Call the base class preamble
- CTestWapStatusReports::doTestStepPreambleL();
-
- return TestStepResult();
-}
+ {
+ //Call the base class preamble
+ CTestWapStatusReports::doTestStepPreambleL();
+
+ return TestStepResult();
+ }
/**
Common test steps for all status reports steps
*/
TVerdict CTestRequestingStatusReports::doTestStepL()
-{
- SendWapMessageL();
-
- return TestStepResult();
-}
+ {
+ SendWapMessageL();
+
+ return TestStepResult();
+ }
+
//-----------------------------------------------------------------------------
/**
Setup the SMS for TP-SRR operations on the SMS
*/
TVerdict CTestRequestingStatusReportsWithOption::doTestStepPreambleL()
-{
- //Call the base class preamble
- CTestRequestingStatusReports::doTestStepPreambleL();
-
- INFO_PRINTF1(_L("Socket set option for indicating last PDU status report"));
- User::LeaveIfError(iSocket.SetOpt(KWapSmsStatusReportScheme, KWapSmsOptionLevel, EWapSmsTPSRR));
+ {
+ //Call the base class preamble
+ CTestRequestingStatusReports::doTestStepPreambleL();
- return TestStepResult();
-}
+ INFO_PRINTF1(_L("Socket set option for indicating last PDU status report"));
+ User::LeaveIfError(iSocket.SetOpt(KWapSmsStatusReportScheme, KWapSmsOptionLevel, EWapSmsTPSRR));
+
+ return TestStepResult();
+ }
+
//-----------------------------------------------------------------------------
/**
Setup the SMS for TP-SRR operations on the SMS
*/
TVerdict CTestReceivingStatusReports::doTestStepPreambleL()
-{
- //Call the base class preamble
- CTestWapStatusReports::doTestStepPreambleL();
-
- GetExpectedStatus();
- SetupStatusReportSocketL();
+ {
+ //Call the base class preamble
+ CTestWapStatusReports::doTestStepPreambleL();
- return TestStepResult();
-}
+ GetExpectedStatus();
+ SetupStatusReportSocketL();
+
+ return TestStepResult();
+ }
/**
Common test steps for all status reports steps
*/
TVerdict CTestReceivingStatusReports::doTestStepL()
-{
- SendWapMessageL();
- TSmsStatus::TSmsStatusValue status;
- status=ReceiveStatusReportL();
-
- TESTL(status == iExpectedStatus);
-
- return TestStepResult();
-}
+ {
+ SendWapMessageL();
+ TSmsStatus::TSmsStatusValue status;
+ status=ReceiveStatusReportL();
+
+ TESTL(status == iExpectedStatus);
+
+ return TestStepResult();
+ }
/**
Common test steps for all status reports steps
*/
TVerdict CTestReceivingStatusReports::doTestStepPostambleL()
-{
- iStatusReportSocket.Close();
-
- //Call the base class preamble
- CTestWapStatusReports::doTestStepPostambleL();
-
- return TestStepResult();
-}
+ {
+ iStatusReportSocket.Close();
+
+ //Call the base class preamble
+ CTestWapStatusReports::doTestStepPostambleL();
+
+ return TestStepResult();
+ }
//-----------------------------------------------------------------------------
@@ -216,31 +222,31 @@
Common test steps for all status reports steps
*/
TVerdict CTestReceivingStatusReportsSevenBitMultiplePDUs::doTestStepL()
-{
- CTestReceivingStatusReports::doTestStepL();
-
- //We will receive 2 status reports for this message
- TSmsStatus::TSmsStatusValue status;
- status=ReceiveStatusReportL();
- TESTL(status == iExpectedStatus);
-
- return TestStepResult();
-}
+ {
+ CTestReceivingStatusReports::doTestStepL();
+
+ //We will receive 3 status reports for this message
+ TSmsStatus::TSmsStatusValue status;
+ status=ReceiveStatusReportL();
+ TESTL(status == iExpectedStatus);
+
+ status=ReceiveStatusReportL();
+ TESTL(status == iExpectedStatus);
+ return TestStepResult();
+ }
//-----------------------------------------------------------------------------
TVerdict CTestReceivingStatusReportsWithOption::doTestStepPreambleL()
-{
- //Sets up the socket for receiving status reports
- CTestReceivingStatusReports::doTestStepPreambleL();
-
- //Set the option for last PDU only (TPSRR Scheme)
- INFO_PRINTF1(_L("Socket set option for indicating last PDU status report"));
- User::LeaveIfError(iSocket.SetOpt(KWapSmsStatusReportScheme, KWapSmsOptionLevel, EWapSmsTPSRR));
+ {
+ //Sets up the socket for receiving status reports
+ CTestReceivingStatusReports::doTestStepPreambleL();
+
+ //Set the option for last PDU only (TPSRR Scheme)
+ INFO_PRINTF1(_L("Socket set option for indicating last PDU status report"));
+ User::LeaveIfError(iSocket.SetOpt(KWapSmsStatusReportScheme, KWapSmsOptionLevel, EWapSmsTPSRR));
return TestStepResult();
-}
+ }
//-----------------------------------------------------------------------------
-
-