--- a/smsprotocols/smsstack/smsprot/Test/TE_SMSSTOR/TE_smsstor.cpp	Fri Mar 19 09:55:57 2010 +0200
+++ b/smsprotocols/smsstack/smsprot/Test/TE_SMSSTOR/TE_smsstor.cpp	Fri Apr 16 16:12:37 2010 +0300
@@ -13,21 +13,14 @@
 // Description:
 //
 
+#include "TE_smsstor.h"
+
 #include <bautils.h>
-#include "TE_smsstor.h"
+#include <smspproc.h>
+
 #include "gsmuieoperations.h"
-#include "smspclass0stor.h"
 #include "gsmunonieoperations.h"
 
-#if defined (__WINS__)
-#define PDD_NAME _L("ECDRV")
-#define LDD_NAME _L("ECOMM")
-#else
-#define PDD_NAME _L("EUART1")
-#define LDD_NAME _L("ECOMM")
-#endif
-
-
 TVerdict CSmsSegmentionStorePurge::doTestStepL()
 	{
 	_LIT(KSegmentationStoreFileName,"C:\\Private\\101FE442\\smssegst.dat");
@@ -303,6 +296,7 @@
 	// initialisation of the reassembly store
     iReassemblyStore=CSmsReassemblyStore::NewL(iFs);
 
+    // TODO: check if the correct file is opened (KReassemblyStoreName or KReassemblyStoreFileName)
     iReassemblyStore->OpenL(KReassemblyStoreName,KReassemblyStoreUid);
     iReassemblyStore->PurgeL(iSmsSettings.ReassemblyLifetime(), ETrue);
 
@@ -503,12 +497,12 @@
 
 /*  enum TSmsPDUType
         {
-        ESmsDeliver       = 0, //< Deliver, sent from SC to MS
-        ESmsDeliverReport = 1, //< Deliver report, sent from MS to SC
-        ESmsSubmit        = 2, //< Submit, sent from MS to SC
-        ESmsSubmitReport  = 3, //< Submit report, sent from SC to MS
-        ESmsStatusReport  = 4, //< Status report, sent from SC to MS
-        ESmsCommand       = 5  //< Command, sent from MS to SC
+        ESmsDeliver       = 0, ///< Deliver, sent from SC to MS
+        ESmsDeliverReport = 1, ///< Deliver report, sent from MS to SC
+        ESmsSubmit        = 2, ///< Submit, sent from MS to SC
+        ESmsSubmitReport  = 3, ///< Submit report, sent from SC to MS
+        ESmsStatusReport  = 4, ///< Status report, sent from SC to MS
+        ESmsCommand       = 5  ///< Command, sent from MS to SC
         };*/
 
 /*
@@ -564,7 +558,6 @@
     DoEncodePDUsL( 20, TSmsDataCodingScheme::ESmsAlphabet8Bit,CSmsPDU::ESmsCommand );
     DoEncodePDUsL( 20, TSmsDataCodingScheme::ESmsAlphabetUCS2,CSmsPDU::ESmsCommand );
 
-
 /*
     CleanupStack::PopAndDestroy(); //socket
     ss.Close();
@@ -2913,7 +2906,7 @@
 	return KErrNone;
 	};
 
-void CTestMSmsComm2::DeletePDUs(const CArrayFix<TGsmSmsSlotEntry>& /*aSlotArray*/,MSmsMessageObserver* /*aObserver*/)
+void CTestMSmsComm2::DeletePDUs(const CArrayFix<TGsmSmsSlotEntry>& /*aSlotArray*/, MSmsMessageObserver* /*aObserver*/)
 	{
 	
 	}