--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_StatusReportScheme.h	Fri Mar 19 09:55:57 2010 +0200
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_StatusReportScheme.h	Fri Apr 16 16:12:37 2010 +0300
@@ -14,63 +14,54 @@
 //
 
 
-#ifndef __TE_STATUS_REPORT_SCHEME_H__
-#define __TE_STATUS_REPORT_SCHEME_H__
+#ifndef TE_STATUSREPORTSCHEME_H
+#define TE_STATUSREPORTSCHEME_H
 
+#include "smsstackbaseteststeps.h"
+#include "smsstacktestutilities.h"
+#include "smsstacktestconsts.h"
 
 #include "gsmuieoperations.h"
 #include "gsmunonieoperations.h"
-#include "TE_smsprt.h"
 
 /**
   Base class housing common functionality used by all test steps exercising 
   status report functionality
 */
-class CTestStatusReportScheme : public CSmsPrtTestStep
-{
+class CSmsStatusReportSchemeTestStep : public CSmsBaseTestStep
+    {
 public:
-	enum TCodingScheme{ESevenBit=7, EEightBit};
+    virtual TVerdict doTestStepPreambleL();
+    virtual TVerdict doTestStepPostambleL();
 
-	CTestStatusReportScheme();
-	~CTestStatusReportScheme();
-	
-	//Utilites
-	void CreateSmsL(TCodingScheme, TPtrC);
-	void SendSmsMessageL();
-	void TriggerReceiveL();
-	void GetNumberOfPDUs();
+    CSmsStatusReportSchemeTestStep();
+    ~CSmsStatusReportSchemeTestStep();
 
-	//TPSRR
-	void SetAllTPSRRsL();
-	void SetLastTPSRRL();
-	void SetSomeTPSRRL(TInt, TInt, TInt);
-	
-	//SMS
-	void SetAllSMSCL();
-	void SetLastSMSCL();
-	void SetSomeSMSCL(TInt, TInt, TInt);
-		
-	//TEF framework	
-	//virtual TVerdict doTestStepL();
- 	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
+    //Utilites - legacy methods, will be replaced by ones from the base class
+    void CreateSmsL(TCodingScheme, TPtrC);
+    void SendSmsMessageL();
+    void TriggerReceiveL();
+    void GetNumberOfPDUs();
+
+    //TPSRR
+    void SetAllTPSRRsL();
+    void SetLastTPSRRL();
+    void SetSomeTPSRRL(TInt, TInt, TInt);
+
+    //SMS
+    void SetAllSMSCL();
+    void SetLastSMSCL();
+    void SetSomeSMSCL(TInt, TInt, TInt);
 
 protected:
-	TCodingScheme iDataCodingScheme;
-	CSmsMessage* iSmsMessage;
-	TInt iNumberOfPDUs;
-	
-private:
-	void SetTestNumberL();
-	void OpenSocketServerL();
-	void SetCodingScheme();
+    RSocket iSocket;
+    TCodingScheme iDataCodingScheme;
+    CSmsMessage* iSmsMessage;
+    TInt iNumberOfPDUs;
 
-protected:
-	RSocketServ iSocketServer;
-	RSocket iSocket;
-};
+private:
+    void OpenSocketServerL();
+    void SetCodingScheme();
+    };
 
-#endif
-
-
-
+#endif // TE_STATUSREPORTSCHEME_H