Revision: 201033
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 18 Aug 2010 10:57:47 +0300
changeset 62 8ef833fbf5aa
parent 49 f50f4094acd7
child 68 d0d9cc530d21
Revision: 201033 Kit: 201033
basebandabstraction/basebandchanneladaptor/Test/TE_BCA/group/TE_Bca.pkg
basebandabstraction/basebandchanneladaptor/doc_pub/NIF_BCA_interface_design.doc
basebandadaptationplugins/basebandchanneladaptorforc32/doc_pub/C32BCA_design
basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/group/TE_C32Bca.pkg
cellularsrv_info/doc_pub/How_to_write_a_TSY.doc
cellularsrv_info/doc_pub/Telephony_Subsystem_Architectural_Description.doc
cellularsrv_info/doc_pub/Telephony_Subsystem_Functional_Specification.doc
group/bld.inf
package_definition.xml
package_map.xml
smsprotocols/doc_pub/NBProtocols_Subsystem_Architectural_Description.doc
smsprotocols/doc_pub/NbProtocols_Functional_Specification.doc
smsprotocols/smsstack/common/inc/smsstacklog.h
smsprotocols/smsstack/common/src/smsstacklog.cpp
smsprotocols/smsstack/doc_pub/SmsStack_GSM_SMS_Use_Case_Analysis.doc
smsprotocols/smsstack/gsmu/group/gsmu_test.pkg
smsprotocols/smsstack/gsmu/inc/Gsmuelem.h
smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp
smsprotocols/smsstack/gsmu/traces/fixed_id.definitions
smsprotocols/smsstack/smsprot/Group/bld.inf
smsprotocols/smsstack/smsprot/Group/smsport_test.pkg
smsprotocols/smsstack/smsprot/Src/smspread.cpp
smsprotocols/smsstack/smsprot/Src/smspsend.cpp
smsprotocols/smsstack/smsprot/Test/TE_Smsprt/TE_smsprt.script
smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_gsmu.script
smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_prot.script
smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_smsstack.script
smsprotocols/smsstack/smsprot/Test/group/bld.inf
smsprotocols/smsstack/smsprot/traces/fixed_id.definitions
smsprotocols/smsstack/smsu/inc/smsuaddr.H
smsprotocols/smsstack/test/group/te_smsstack.iby
smsprotocols/smsstack/test/smsstack_test.pkg
smsprotocols/smsstack/test/smsstacktestutilities.cpp
smsprotocols/smsstack/test/traces/fixed_id.definitions
smsprotocols/smsstack/wapprot/Group/wapport_test.pkg
smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions
smsprotocols/smsstack/wapprot/traces/fixed_id.definitions
telephonyprotocols/pdplayer/group/bld.inf
telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp
telephonyprotocols/pdplayer/test/controlplane/group/te_PDP_ControlPlane.pkg
telephonyprotocols/pdplayer/test/controlplane/group/te_pdpcontrolplane.iby
telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/Te_UmtsGprsSCPR.pkg
telephonyprotocols/pdplayer/umts/test/te_mbms/group/te_mbms.pkg
telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_Spud.pkg
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_SpudNetworkSide.xml
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/te_spudNetworkSide.pkg
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script
telephonyprotocols/pdplayer/umts/test/te_spudRSubConn/group/te_spudRSubConn.pkg
telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconnExtFactory.cpp
telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconparams.cpp
telephonyprotocols/rawipnif/doc_pub/Raw_IP_NIF_Detailed_Design.doc
telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_EtelMM.script
telephonyserver/etelmultimode/doc_pub/ETelMM_API_Design_Document.doc
telephonyserver/etelmultimode/doc_pub/ETelMM_Architecture_Design.doc
telephonyserver/etelmultimode/doc_pub/ETelMM_UseCase_Analysis.doc
telephonyserver/etelmultimode/group/etelmm_test.pkg
telephonyserver/etelpacketdata/doc_pub/ETel_Packet_API_Design.doc
telephonyserver/etelpacketdata/group/etelpckt_test.pkg
telephonyserver/etelserverandcore/doc_pub/ETel_Core_API_Design.doc
telephonyserver/etelserverandcore/doc_pub/ETel_Telephony_Server_Design.doc
telephonyserver/etelserverandcore/group/etel_test.pkg
telephonyserver/etelsimtoolkit/doc_pub/(U)SAT_ETel_API_Specification.doc
telephonyserver/etelsimtoolkit/group/etelsat_test.pkg
telephonyserver/etelsimtoolkit/tetel/Te_EtelSat/TE_EtelSat.script
telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h
telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmsecuritytsy.h
telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp
telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp
telephonyserverplugins/common_tsy/test/component/group/component_test.pkg
telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component_test.pkg
telephonyserverplugins/common_tsy/test/component/inc/cctsyonstorefu.h
telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script
telephonyserverplugins/common_tsy/test/component/src/cctsyonstorefu.cpp
telephonyserverplugins/common_tsy/test/component/src/cctsypacketqosfu.cpp
telephonyserverplugins/common_tsy/test/integration/group/integration_test.pkg
telephonyserverplugins/ctsydispatchlayer/test/dispatchertests/group/te_ctsydispatcher_component.pkg
telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp
telephonyserverplugins/licenseetsystub/simatk_tsy_stub/group/simatktsy.mmp
telephonyserverplugins/multimodetsy/group/te_mmtsy_test.pkg
telephonyserverplugins/simatktsy/tests/group/te_csat_component.pkg
telephonyserverplugins/simtsy/group/simtsy_test.pkg
telephonyserverplugins/simtsy/src/CSimContextHelper.cpp
telephonyutils/dial/group/dial_test.pkg
telephonyutils/etel3rdpartyapi/Group/etelisv_test.pkg
telephonyutils/etel3rdpartyapi/Test/te_etelisvcaps/group/tetelisvcaps_test.pkg
telephonyutils/etel3rdpartyapi/src/TelephonyFuncCall.cpp
telephonyutils/etel3rdpartyapi/src/TelephonyFunctions.cpp
telephonyutils/telephonywatchers/group/telwatcher_test.pkg
wapstack/wapmessageapi/client/wapmessage.cpp
wapstack/wapmessageapi/group/swapmsg.mmp
wapstack/wapmessageapi/group/wapmessage_test.pkg
wapstack/wapmessageapi/inc/wapmessage.h
wapstack/wapmessageapi/sws/ActiveSocket.cpp
wapstack/wapmessageapi/sws/CLWSPPduHandler.cpp
wapstack/wapmessageapi/sws/WapMessageApiAgent.cpp
wapstack/wapmessageapi/sws/WapSwsLog.cpp
wapstack/wapmessageapi/sws/WapSwsLog.h
wapstack/wapmessageapi/sws/swswapmsgsource.mmpi
wapstack/wapmessageapi/traces/OstTraceDefinitions.h
wapstack/wapmessageapi/traces/fixed_id.definitions
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandabstraction/basebandchanneladaptor/Test/TE_BCA/group/TE_Bca.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,1 @@
+"\sf\os\cellularsrv\basebandabstraction\basebandchanneladaptor\Test\TE_BCA\scripts\TE_BcaUnit.script"-"c:\testdata\scripts\TE_BcaUnit.script"
Binary file basebandabstraction/basebandchanneladaptor/doc_pub/NIF_BCA_interface_design.doc has changed
Binary file basebandadaptationplugins/basebandchanneladaptorforc32/doc_pub/C32BCA_design has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/group/TE_C32Bca.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,16 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\te_c32bca\scripts\TE_C32BcaUnit.script"-"c:\testdata\scripts\TE_C32BcaUnit.script"
Binary file cellularsrv_info/doc_pub/How_to_write_a_TSY.doc has changed
Binary file cellularsrv_info/doc_pub/Telephony_Subsystem_Architectural_Description.doc has changed
Binary file cellularsrv_info/doc_pub/Telephony_Subsystem_Functional_Specification.doc has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/bld.inf	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Build information file for all project in cellularsrv subsystem 
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+
+#include "../basebandabstraction/basebandchanneladaptor/group/bld.inf"
+#include "../basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf"
+#include "../smsprotocols/smsstack/group/bld.inf"
+#include "../telephonyprotocols/csdagt/group/bld.inf"
+#include "../telephonyprotocols/psdagt/group/bld.inf"
+#include "../telephonyprotocols/gprsumtsqosprt/group/bld.inf"
+#include "../telephonyprotocols/gprsumtsqosinterface/group/bld.inf"
+#include "../telephonyprotocols/qosextnapi/group/bld.inf"
+#include "../telephonyprotocols/qos3gppcpr/group/bld.inf"
+#include "../telephonyprotocols/pdplayer/group/bld.inf"
+#include "../telephonyprotocols/rawipnif/group/bld.inf"
+#include "../telephonyserver/etelserverandcore/group/bld.inf"
+#include "../telephonyserver/etelmultimode/group/bld.inf"
+#include "../telephonyserver/etelpacketdata/group/bld.inf"
+#include "../telephonyserver/etelsimtoolkit/group/bld.inf"
+#include "../telephonyserverplugins/common_tsy/group/bld.inf"
+#include "../telephonyserverplugins/licenseetsystub/group/bld.inf"
+#include "../telephonyserverplugins/multimodetsy/group/bld.inf"
+#include "../telephonyserverplugins/simtsy/group/bld.inf"
+#include "../telephonyserverplugins/ctsydispatchlayer/group/bld.inf"
+#include "../telephonyserverplugins/simatktsy/group/bld.inf"
+#include "../telephonyutils/dial/group/bld.inf"
+#include "../telephonyutils/telephonywatchers/group/bld.inf"
+#include "../telephonyutils/etel3rdpartyapi/Group/bld.inf"
+#include "../hwpluginsimulation/mocksy/group/bld.inf"
+#include "../wapstack/wapmessageapi/group/bld.inf"
+
+
+PRJ_TESTMMPFILES
--- a/package_definition.xml	Tue Jul 06 15:36:38 2010 +0300
+++ b/package_definition.xml	Wed Aug 18 10:57:47 2010 +0300
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+    <meta rel="License">
+      <license type="EPL"><supplier>Nokia</supplier></license>	
+    </meta>
     <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
       <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
         <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
       </component>
-      <component id="isc_if" filter="s60" name="Inter-System Communication Interface">
-        <unit bldFile="basebandabstraction/isc_if/group"/>
-      </component>
     </collection>
     <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
       <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
@@ -36,6 +36,9 @@
       <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
         <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
       </component>
+      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP Context UMTS Driver" introduced="8.1" deprecated="^3" purpose="optional" filter="test">
+        <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+      </component>
       <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
         <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
       </component>
@@ -67,7 +70,7 @@
       <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
       </component>
-      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
+      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
         <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
       </component>
       <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
@@ -83,14 +86,6 @@
         <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
       </component>
     </collection>
-    <collection id="commonnetworkinterface" name="Common Network Interface" level="hw-if">
-      <component id="gennif" filter="s60" name="Generic NIF">
-        <unit bldFile="commonnetworkinterface/gennif/group"/>
-      </component>
-      <component id="gprsumtsagent" filter="s60" name="GPRS UMTS Agent">
-        <unit bldFile="commonnetworkinterface/gprsumtsagent/group"/>
-      </component>
-    </collection>
     <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
       <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
         <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
@@ -103,9 +98,6 @@
       </component>
     </collection>
     <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
-      <component id="cellularsrv_plat" filter="s60" name="Cellular Baseband Services Platform Interfaces" class="api">
-        <unit bldFile="cellularsrv_plat/group"/>
-      </component>
       <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
         <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
       </component>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="os"/>
Binary file smsprotocols/doc_pub/NBProtocols_Subsystem_Architectural_Description.doc has changed
Binary file smsprotocols/doc_pub/NbProtocols_Functional_Specification.doc has changed
--- a/smsprotocols/smsstack/common/inc/smsstacklog.h	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/common/inc/smsstacklog.h	Wed Aug 18 10:57:47 2010 +0300
@@ -23,7 +23,7 @@
 // Functions to perform specific logging where necessary.
 //
 
-    void LogSmsIfPDU(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu);
+    void LogSmsIfPDUL(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu);
     void LogSmsIfHexBuf(const TDesC8& aText, const TDesC8& aHexBuf);
     void LogSmsIfTypeOfNumber(const TDesC8& aText, RMobilePhone::TMobileTON aTON);
     void LogSmsIfNumberingPlan(const TDesC8& aText, RMobilePhone::TMobileNPI aNPI);
--- a/smsprotocols/smsstack/common/src/smsstacklog.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/common/src/smsstacklog.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -28,7 +28,7 @@
 
 #include "gsmupdu.h"
 #include "smsstacklog.h"
-#include <S32MEM.H>
+#include <s32mem.h>
 
 //
 // All functions in this file are available only if logging is enabled.
@@ -48,7 +48,7 @@
  *  @param aPDU         PDU to log.
  *  @param aCommandPdu  Flag to say if this is a command PDU.
  */
-void LogSmsIfPDU(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu)
+void LogSmsIfPDUL(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu)
 	{
 	TBuf8<128>  tmpBuf;
 
@@ -203,8 +203,8 @@
 		tmpBuf.Append(_L8("    -      -"));
 		}
 
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_1, "%s      HEX   MTI        RP UDHI  SRX  MMS   RD     VP", aText);
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_2, "%sFO:   0x%02X  %s", aText, (TUint)firstOctet, tmpBuf);
+	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_1, "%s      HEX   MTI        RP UDHI  SRX  MMS   RD     VP", aText);
+	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_2, "%sFO:   0x%02X  %s", aText, (TUint)firstOctet, tmpBuf);
 
 	if (pduType == -1)
 		{
@@ -220,7 +220,7 @@
 	    pduType == CSmsPDU::ESmsStatusReport  ||
 	    pduType == CSmsPDU::ESmsCommand)
 		{
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_3, "%sMR:   0x%02X", aText, aPDU[octetOffset]);
+        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_3, "%sMR:   0x%02X", aText, aPDU[octetOffset]);
         octetOffset++;
 		}
 
@@ -229,13 +229,13 @@
 	//
 	if (pduType == CSmsPDU::ESmsCommand)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_4, "%sPID:  0x%02X", aText, aPDU[octetOffset]);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_4, "%sPID:  0x%02X", aText, aPDU[octetOffset]);
         octetOffset++;
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_5, "%sCT:   0x%02X", aText, aPDU[octetOffset]);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_5, "%sCT:   0x%02X", aText, aPDU[octetOffset]);
         octetOffset++;
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_6, "%sMN:   0x%02X", aText, aPDU[octetOffset]);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_6, "%sMN:   0x%02X", aText, aPDU[octetOffset]);
         octetOffset++;
 		}
 
@@ -261,11 +261,11 @@
 		
 		tmpBuf.SetLength(telLength);
 
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_7, "%sTEL:  0x%02X  %s", aText, (TUint)typeOfNumber, tmpBuf);
+		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_7, "%sTEL:  0x%02X  %s", aText, (TUint)typeOfNumber, tmpBuf);
 		}
 	else
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_8, "%sTEL:  Illegal length value (%d)!", aText, telLength);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_8, "%sTEL:  Illegal length value (%d)!", aText, telLength);
 		return;
 		}
 
@@ -274,7 +274,7 @@
 	//
 	if (pduType == CSmsPDU::ESmsSubmit  ||  pduType == CSmsPDU::ESmsDeliver)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_9, "%sPID:  0x%02X", aText, aPDU[octetOffset]);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_9, "%sPID:  0x%02X", aText, aPDU[octetOffset]);
 		octetOffset++;
 
 		tmpBuf.Zero();
@@ -409,8 +409,8 @@
 			tmpBuf.Append(_L8("-"));
 			}
 
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_10, "%sDCS:  HEX   CLASS      DCS     INDICATION TYPE", aText);
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_11, "%s      0x%02X  %s", aText, (TUint) dcs, tmpBuf);
+		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_10, "%sDCS:  HEX   CLASS      DCS     INDICATION TYPE", aText);
+		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_11, "%s      0x%02X  %s", aText, (TUint) dcs, tmpBuf);
 		}
 
 	//
@@ -420,7 +420,7 @@
 		{
 		if (vpf == EVpRel)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_12, "%sVP:   %d (Relative)", aText, aPDU[octetOffset++]);
+			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_12, "%sVP:   %d (Relative)", aText, aPDU[octetOffset++]);
 			}
 		else if (vpf == EVpAbs)
 			{
@@ -432,7 +432,7 @@
 				tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 				}
 			
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_13, "%sVP:   %s (Absolute)", aText, tmpBuf);
+			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_13, "%sVP:   %s (Absolute)", aText, tmpBuf);
 			octetOffset += 7;
 			}
 		else if (vpf == EVpEnh)
@@ -445,7 +445,7 @@
 				tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 				}
 			
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_14, "%sVP:   %s (Enhanced)", aText, tmpBuf);
+			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_14, "%sVP:   %s (Enhanced)", aText, tmpBuf);
 			octetOffset += 7;
 			}
 		}
@@ -462,7 +462,7 @@
 			tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 			}
 			
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_15, "%sSCTS: %s", aText, tmpBuf);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_15, "%sSCTS: %s", aText, tmpBuf);
 		octetOffset += 7;
 		}
 	
@@ -480,10 +480,10 @@
 			tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 			}
 			
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_16, "%sDT:   %s", aText, tmpBuf);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_16, "%sDT:   %s", aText, tmpBuf);
 		octetOffset += 7;
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_17, "%sST:   %02X", aText, aPDU[octetOffset]);
+		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_17, "%sST:   %02X", aText, aPDU[octetOffset]);
 		octetOffset++;
 		}
 
@@ -527,15 +527,15 @@
 					}
 				else
 					{
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_18, "%sUDL:  Problems with the ieidl_a %d being less that UDHL",aText, ieidl_a);
+					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_18, "%sUDL:  Problems with the ieidl_a %d being less that UDHL",aText, ieidl_a);
 					}
 	
 				if ((ieidl_a + 1) > udhl)
 					{
-					OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_19, "%sUDL:  Corrupted or implement decoding for second iei_b, iei_n!",aText);
+					OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_19, "%sUDL:  Corrupted or implement decoding for second iei_b, iei_n!",aText);
 					}
 	
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_20, "%sUDL:  HEX    UDHL   IEI_A  IEIDL_A   ", aText);
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_20, "%sUDL:  HEX    UDHL   IEI_A  IEIDL_A   ", aText);
 
 				TBuf8<200> data;
 				RDesWriteStream dataStream(data);
@@ -552,24 +552,24 @@
 				dataStream.WriteL(tmpBuf);
 
 				dataStream.Close();
-                OstTraceDefData( OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_21, "%s      0x%02X   0x%02X   0x%02X   0x%02X  %s", data.Ptr(), data.Size() );
+                OstTraceDefData( OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_21, "%s      0x%02X   0x%02X   0x%02X   0x%02X  %s", data.Ptr(), data.Size() );
 				}
 			else
 				{
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_22, "%sUDL:  Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", aText);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_23, "%sUDL:  HEX   UDHL   IEI_A", aText);
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_24, "%s      0x%02X    0x%02X", aText, udl, udhl);
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_22, "%sUDL:  Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", aText);
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_23, "%sUDL:  HEX   UDHL   IEI_A", aText);
+				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_24, "%s      0x%02X    0x%02X", aText, udl, udhl);
 				}
 			}
 		else
 			{
 			TInt  udl  = aPDU[octetOffset++];
 			
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_25, "%sUDL:  HEX    UDHL", aText);
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_26, "%s      0x%02X   -", aText, udl);
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_25, "%sUDL:  HEX    UDHL", aText);
+			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_26, "%s      0x%02X   -", aText, udl);
 			}
 		}
-	} // LogSmsIfPDU
+	} // LogSmsIfPDUL
 
 
 #ifdef OST_TRACE_COMPILER_IN_USE
@@ -841,7 +841,7 @@
 	tmpBuf.Copy(aText);
 	tmpBuf.Append(_L8("  PDU: "));
 
-	LogSmsIfPDU(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
+	LogSmsIfPDUL(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
 	} // LogSmsIfSmsEntry
 
 
@@ -956,7 +956,7 @@
 		tmpBuf.Copy(aText);
 		tmpBuf.Append(_L8("  iSubmitReport PDU: "));
 
-		LogSmsIfPDU(tmpBuf, aAttrib.iSubmitReport, EFalse);
+		LogSmsIfPDUL(tmpBuf, aAttrib.iSubmitReport, EFalse);
 		}
 	} // LogSmsIfSendAttributes
 
Binary file smsprotocols/smsstack/doc_pub/SmsStack_GSM_SMS_Use_Case_Analysis.doc has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/gsmu/group/gsmu_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\gsmu\test\te_gsmu\te_gsmu.script"-"c:\testdata\scripts\te_gsmu.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\gsmu\test\te_gsmustor\te_gsmustor.script"-"c:\testdata\scripts\te_gsmustor.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\gsmu\test\te_gsmu_ems\te_gsmu_ems.script"-"c:\testdata\scripts\te_gsmu_ems.script"
--- a/smsprotocols/smsstack/gsmu/inc/Gsmuelem.h	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/inc/Gsmuelem.h	Wed Aug 18 10:57:47 2010 +0300
@@ -1098,18 +1098,26 @@
 	IMPORT_C TPtrC ConvertToNativeL(const TDesC8& aUDElements);
 	IMPORT_C TPtrC ConvertToNativeL(const TDesC8& aUDElements, TSmsEncoding aEncoding);
 
-	TBool IsSupportedL(TChar aChar);
 	TBool IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
 			           TInt& aIndexOfFirstUnconvertibleCharacter);
 
-	TBool IsSupportedL(TChar aChar, TSmsEncoding aEncoding, TBool& aIsDowngrade,
-			           TBool& aRequiresAlternativeEncoding);
 	TBool IsSupportedL(const TDesC& aDes, TSmsEncoding aEncoding,
 			           TInt& aNumberOfUnconvertibleCharacters,
 			           TInt& aNumberOfDowngradedCharacters,
 			           TInt& aNumberRequiringAlternativeEncoding,
 			           TInt& aIndexOfFirstUnconvertibleCharacter);
-	
+
+    void ConvertWith7BitEncodingL(const TDesC& aDes, TDes& aRestoredDes,
+                       TInt& aNumberOfUnconvertibleCharacters,
+                       TInt& aNumberOfDowngradedCharacters,
+                       TInt& aIndexOfFirstUnconvertibleCharacter, TBool aIsCountDowngrade);
+
+    void ConvertWithAlternativeEncodingL(const TDesC& aDes, const TDesC& aRestoredStdDes, TSmsEncoding aEncoding,
+                       TInt& aNumberOfUnconvertibleCharacters,
+                       TInt& aNumberOfDowngradedCharacters,
+                       TInt& aNumberRequiringAlternativeEncoding,
+                       TInt& aIndexOfFirstUnconvertibleCharacter);
+    
 // Alternative Encoding methods
 	TSmsEncoding FindBestAlternativeEncodingL(const TDesC& aNativeCharacters,
 											  TSmsEncoding aSuggestedEncoding);
--- a/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1399,33 +1399,6 @@
 
 
 /**
- *  Tests if the character is supported by the current character set.
- *  This function can be used with 7bit and 8bit alphabets.
- * 
- *  @param aChar  Character to investigate.
- * 
- *  @return  ETrue if the character is supported.
- * 
- *  @note Since the function is based on the old behaviour (pre-PREQ2090)
- *        it does not accept a downgraded character or alternative encoding
- *        as being supported.
- */
-TBool CSmsAlphabetConverter::IsSupportedL(TChar aChar)
-	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_1, "[1] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
-
-	TBool isDowngrade, isRequiresAlternativeEncoding;
-
-    TBool  supported = IsSupportedL(aChar, ESmsEncodingNone,
-            isDowngrade, isRequiresAlternativeEncoding);
-	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_2, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
-
-	return supported;
-	} // CSmsAlphabetConverter::IsSupportedL
-
-
-/**
  *  Tests if the descriptor text is supported by the current character set.
  *  This function can be used with 7bit and 8bit alphabets.
  * 
@@ -1440,133 +1413,32 @@
 TBool CSmsAlphabetConverter::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
                                           TInt& aIndexOfFirstUnconvertibleCharacter)
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1, "[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
+	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_1, "[1] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
 
 	TInt desLength = aDes.Length();
-	//
-	// Initialise the exit params...
-	//
-	aNumberOfUnconvertibleCharacters    = 0;
-	aIndexOfFirstUnconvertibleCharacter = desLength;
-
-    //
-    // Create buffers for the input converted to 7Bit and a buffer for it once
-    // converted back again...
-    //
-    HBufC8* encodedBuf       = HBufC8::NewLC(desLength*2); // worse case
-    HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
-    TPtr8  encoded(encodedBuf->Des());
-    TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
-
-    //
-    // Convert the input string to standard 7bit (with downgrades if needed)...
-    // 
-    PrepareForConversionFromNativeL(ESmsEncodingNone);
-
-    TInt  notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
-
-    if (notConverted > 0)
-        {
-        aNumberOfUnconvertibleCharacters += notConverted;
-        }
-    else if (notConverted < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
-    
-    //
-    // Convert it back again to the native format...
-    //
-    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
-    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterStd, encoded, state);
-
-    if (notRestored > 0)
-        {
-        aNumberOfUnconvertibleCharacters += notRestored;
-        }
-    else if (notRestored < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
 
     //
-    // Work out if the string is acceptable as it is (e.g. no unconvertible
-    // and no downgrades). We only need do this if the previous conversions were
-    // complete with no issues.
+    // Create buffer for restored text string...
+    //
+    HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
+    TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
+    
     //
-    for (TInt pos = desLength-1;  pos >= 0;  --pos)
-        {
-        if (backToUnicodeAfterStd[pos] != aDes[pos])
-            {
-            aNumberOfUnconvertibleCharacters++;
-            aIndexOfFirstUnconvertibleCharacter = pos;
-            }
-        }
-    
+    // Convert the string...
+    //   
+	TInt numberOfDowngradedCharacters;
+	TBool isCountDowngrade = EFalse; // Don't count downgrades
+	ConvertWith7BitEncodingL(aDes, backToUnicodeAfterStd, 
+            aNumberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
+            aIndexOfFirstUnconvertibleCharacter, isCountDowngrade);
+	
     CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
-    CleanupStack::PopAndDestroy(encodedBuf);
 	
-	//
-	// Useful logging...
-	//
 	TBool  supported = (aNumberOfUnconvertibleCharacters == 0);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
-
-	return supported;
-	} // CSmsAlphabetConverter::IsSupportedL
-
-
-/**
- *  Tests if the character is supported by the current character set.
- *  This function can be used with 7bit and 8bit alphabets.
- * 
- *  @param aChar                         Character to investigate.
- *  @param aEncoding                     Alternative 7bit encoding (if used).
- *  @param aIsDowngrade                  Exit param set to ETrue if the
- *                                       character has to be downgraded.
- *  @param aRequiresAlternativeEncoding  Exit param set to ETrue if the
- *                                       alternative encoding has to be
- *                                       used to encode it.
- * 
- *  @return  ETrue if the character is supported.
- */
-TBool CSmsAlphabetConverter::IsSupportedL(TChar aChar, TSmsEncoding aEncoding,
-		                                  TBool& aIsDowngrade,
-                                          TBool& aRequiresAlternativeEncoding)
-	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1, "[3] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
-
-	//
-	// Convert the character...
-	//
-	TInt  numberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
-            numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;
-	TBuf<4>   toEncode;
-
-	toEncode.SetLength(1);
-	toEncode[0]=(TText)aChar;
-
-	TBool supported = IsSupportedL(toEncode, aEncoding, 
-	        numberOfUnconvertibleCharacters,
-	        numberOfDowngradedCharacters,
-	        numberRequiringAlternativeEncoding,
-	        indexOfFirstUnconvertibleCharacter);
-
-	//
-	// Calculate the exit params...
-	//
-	aIsDowngrade                 = (numberOfDowngradedCharacters > 0);
-	aRequiresAlternativeEncoding = (numberRequiringAlternativeEncoding > 0);
-	    
-	//
-	// Useful logging...
-	//
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2, "CSmsAlphabetConverter::IsSupportedL(): aIsDowngrade=%d.", aIsDowngrade);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3, "CSmsAlphabetConverter::IsSupportedL(): aRequiresAlternativeEncoding=%d.", aRequiresAlternativeEncoding);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_3, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
 
 	return supported;
 	} // CSmsAlphabetConverter::IsSupportedL
@@ -1596,77 +1468,28 @@
                                           TInt& aNumberRequiringAlternativeEncoding,
                                           TInt& aIndexOfFirstUnconvertibleCharacter)
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1, "[4] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
+	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1, "[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
 
 	TInt desLength = aDes.Length();
 	//
-	// Initialise the exit params...
+	// Initialise the exit param...
 	//
-	aNumberOfUnconvertibleCharacters    = 0;
-	aNumberOfDowngradedCharacters       = 0;
 	aNumberRequiringAlternativeEncoding = 0;
-	aIndexOfFirstUnconvertibleCharacter = desLength;
 	
 	//
-	// Create buffers for the input converted to 7Bit and a buffer for it once
-	// converted back again...
+	// Create buffer for restored text string...
 	//
-    HBufC8* encodedBuf       = HBufC8::NewLC(desLength*2); // worse case
     HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
-    TPtr8  encoded(encodedBuf->Des());
     TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
-
-    //
-    // Convert the input string to standard 7bit (with downgrades if needed)...
-    // 
-    PrepareForConversionFromNativeL(ESmsEncodingNone);
-
-    TInt  notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
-
-    if (notConverted > 0)
-        {
-        aNumberOfUnconvertibleCharacters += notConverted;
-        }
-    else if (notConverted < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
+    TBool  isCountDowngrade = ETrue; // Count downgraded chars
     
     //
-    // Convert it back again to the native format...
-    //
-    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
-    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterStd, encoded, state);
-
-    if (notRestored > 0)
-        {
-        aNumberOfUnconvertibleCharacters += notRestored;
-        }
-    else if (notRestored < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
-
-    //
-    // Work out if the string is acceptable as it is (e.g. no unconvertible
-    // and no downgrades).
-    //
-    for (TInt pos = desLength-1;  pos >= 0;  --pos)
-        {
-        if (backToUnicodeAfterStd[pos] != aDes[pos])
-            {
-            if (backToUnicodeAfterStd[pos] != KReplacementCharacter)
-                {
-                aNumberOfDowngradedCharacters++;
-                }
-            else
-                {
-                aNumberOfUnconvertibleCharacters++;
-                aIndexOfFirstUnconvertibleCharacter = pos;
-                }
-            }
-        }
-
+    // Convert the character...
+    //   
+    ConvertWith7BitEncodingL(aDes, backToUnicodeAfterStd, 
+            aNumberOfUnconvertibleCharacters, aNumberOfDowngradedCharacters, 
+            aIndexOfFirstUnconvertibleCharacter, isCountDowngrade);
+    
     TInt  totalCharFaultsSoFar = aNumberOfUnconvertibleCharacters + 
                                     aNumberOfDowngradedCharacters;
     
@@ -1700,73 +1523,12 @@
         TInt  tmpDowngradedCharacters        = 0;
         TInt  tmpUnconvertibleCharacters     = 0;
         TInt  tmpIndexOfFirstUnconvertibleCharacter = desLength;
-		
-        //
-        // Convert the input string to the alternative encoding...
-        //
-        PrepareForConversionFromNativeL(aEncoding);
-
-        notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
-        if (notConverted > 0)
-            {
-            tmpUnconvertibleCharacters = notConverted;
-            }
-        else if (notConverted < 0)
-            {
-            tmpUnconvertibleCharacters = desLength;
-            }
-
-        //
-        // Convert it back again to the native format...
-        //
-        HBufC*  backToUnicodeAfterAltBuf = HBufC::NewLC(desLength);
-        TPtr  backToUnicodeAfterAlt(backToUnicodeAfterAltBuf->Des());
-        TInt  state       = CCnvCharacterSetConverter::KStateDefault;
-        TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterAlt, encoded, state);
-
-        if (notRestored > 0)
-            {
-            tmpUnconvertibleCharacters += notRestored;
-            }
-        else if (notRestored < 0)
-            {
-            tmpUnconvertibleCharacters = desLength;
-            }
-
-        //
-        // Now work out which characters are downgrades, require alternative encoding
-        // or are unsupported.
-        //
-        for (TInt pos = desLength-1;  pos >= 0;  --pos)
-            {
-            if (backToUnicodeAfterStd[pos] != aDes[pos])
-                {
-                // Not supported by standard encoder...
-                if (backToUnicodeAfterAlt[pos] == aDes[pos])
-                    {
-                    // Supported by alternative encoder...
-                    aNumberRequiringAlternativeEncoding++;
-                    }
-                else if (backToUnicodeAfterStd[pos] != KReplacementCharacter)
-                    {
-                    // Downgraded by standard encoder...
-                    tmpDowngradedCharacters++;
-                    }
-                else if (backToUnicodeAfterAlt[pos] != KReplacementCharacter)
-                    {
-                    // Downgraded by alternative encoder...
-                    tmpDowngradedCharacters++;
-                    aNumberRequiringAlternativeEncoding++;
-                    }
-                else
-                    {
-                    // Unconvertible...
-                    tmpUnconvertibleCharacters++;
-                    tmpIndexOfFirstUnconvertibleCharacter = pos;
-                    }
-                }
-            }
-
+        
+        ConvertWithAlternativeEncodingL(aDes, backToUnicodeAfterStd, aEncoding,
+                tmpUnconvertibleCharacters, tmpDowngradedCharacters,
+                aNumberRequiringAlternativeEncoding,
+                tmpIndexOfFirstUnconvertibleCharacter);       
+        
         // Is this better?  
         if ( totalCharFaultsSoFar >= (tmpUnconvertibleCharacters + tmpDowngradedCharacters) )
             {
@@ -1780,29 +1542,238 @@
             // Best conversion is the standard conversion
             aNumberRequiringAlternativeEncoding = 0;
             }
-        
-        CleanupStack::PopAndDestroy(backToUnicodeAfterAltBuf);
         }
     
-    CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
-    CleanupStack::PopAndDestroy(encodedBuf);
-
+    CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);   
+ 
 	//
 	// Useful logging...
 	//
 	TBool  supported = (aNumberOfUnconvertibleCharacters == 0);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4, "CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4, "CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
 
 	return supported;
 	} // CSmsAlphabetConverter::IsSupportedL
 
 
 /**
+ *  Tests if the descriptor text is supported by the current character set.
+ * 
+ *  @param aDes                                 Text string to check.
+ *  @param aRestoredDes                         Exit restored text string after conversion.
+ *  @param aNumberOfUnconvertibleCharacters     Exit param for the number of
+ *                                              characters unconvertible.
+ *  @param aNumberOfDowngradedCharacters        Exit param for the number of
+ *                                              downgraded characters.
+ *  @param aIndexOfFirstUnconvertibleCharacter  Exit param for the first
+ *                                              unconverted character.
+ *  @param aIsCountDowngrade                    Flag for counting downgrades.
+ */
+void CSmsAlphabetConverter::ConvertWith7BitEncodingL(const TDesC& aDes, TDes& aRestoredDes,
+                                          TInt& aNumberOfUnconvertibleCharacters,
+                                          TInt& aNumberOfDowngradedCharacters,
+                                          TInt& aIndexOfFirstUnconvertibleCharacter,
+                                          TBool aIsCountDowngrade)
+    {
+ 	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(aDes=\"%S\")", aDes);
+
+    TInt desLength = aDes.Length();
+    //
+    // Initialise the exit params...
+    //
+    aNumberOfUnconvertibleCharacters    = 0;
+    aNumberOfDowngradedCharacters       = 0;
+    aIndexOfFirstUnconvertibleCharacter = desLength;
+    
+    //
+    // Create buffer for the input converted to 7Bit.
+    //
+    HBufC8* encodedBuf       = HBufC8::NewLC(desLength*2); // worse case
+    TPtr8  encoded(encodedBuf->Des());
+
+    //
+    // Convert the input string to standard 7bit (with downgrades if needed)...
+    // 
+    PrepareForConversionFromNativeL(ESmsEncodingNone);
+
+    TInt  notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
+
+    if (notConverted > 0)
+        {
+        aNumberOfUnconvertibleCharacters += notConverted;
+        }
+    else if (notConverted < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
+    
+    //
+    // Convert it back again to the native format...
+    //
+    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
+    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(aRestoredDes, encoded, state);
+
+    if (notRestored > 0)
+        {
+        aNumberOfUnconvertibleCharacters += notRestored;
+        }
+    else if (notRestored < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
+
+    //
+    // Work out if the string is acceptable as it is (e.g. no unconvertible
+    // and no downgrades).
+    //
+    for (TInt pos = desLength-1;  pos >= 0;  --pos)
+        {
+        if (aRestoredDes[pos] != aDes[pos])
+            {
+            if (aRestoredDes[pos] != KReplacementCharacter
+                    && aIsCountDowngrade)
+                {
+                ++aNumberOfDowngradedCharacters;
+                }
+            else
+                {
+                ++aNumberOfUnconvertibleCharacters;
+                aIndexOfFirstUnconvertibleCharacter = pos;
+                }
+            }
+        }
+    
+    CleanupStack::PopAndDestroy(encodedBuf);
+    
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+    } // CSmsAlphabetConverter::ConvertWith7BitEncodingL    
+
+/**
+ *  Tests if the descriptor text is supported by given encoding.
+ *  This function can be used with 7bit and 8bit alphabets.
+ * 
+ *  @param aDes                                 Text string to check.
+ *  @param aRestoredStdDes                      Text string restored from 7bit encoding.
+ *  @param aEncoding                            Alternative 7bit encoding.
+ *  @param aNumberOfUnconvertibleCharacters     Exit param for the number of
+ *                                              characters unconvertible.
+ *  @param aNumberOfDowngradedCharacters        Exit param for the number of
+ *                                              downgraded characters.
+ *  @param aNumberRequiringAlternativeEncoding  Exit param for the number of
+ *                                              characters requiring use of
+ *                                              the alternative encoder.
+ *  @param aIndexOfFirstUnconvertibleCharacter  Exit param for the first
+ */
+void CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(const TDesC& aDes, const TDesC& aRestoredStdDes, 
+                                          TSmsEncoding aEncoding,
+                                          TInt& aNumberOfUnconvertibleCharacters,
+                                          TInt& aNumberOfDowngradedCharacters,
+                                          TInt& aNumberRequiringAlternativeEncoding,
+                                          TInt& aIndexOfFirstUnconvertibleCharacter)
+    {
+  	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(aDes=\"%S\")", aDes);
+  
+    TInt desLength = aDes.Length();
+    //
+    // Initialise the exit params...
+    //
+    aNumberOfUnconvertibleCharacters    = 0;
+    aNumberOfDowngradedCharacters       = 0;
+    aNumberRequiringAlternativeEncoding = 0;
+    aIndexOfFirstUnconvertibleCharacter = desLength;
+        
+    //
+    // Create buffer for the input converted to 7Bit.
+    //
+    HBufC8* encodedBuf = HBufC8::NewLC(desLength*2); // worse case
+    TPtr8  encoded(encodedBuf->Des());
+ 
+    //
+    // Convert the input string to the alternative encoding...
+    //
+    PrepareForConversionFromNativeL(aEncoding);
+
+    TInt notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
+    if (notConverted > 0)
+        {
+        aNumberOfUnconvertibleCharacters = notConverted;
+        }
+    else if (notConverted < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
+
+    //
+    // Create buffer for restored text...
+    //
+    HBufC*  backToUnicodeBuf = HBufC::NewLC(desLength);
+    TPtr  backToUnicode(backToUnicodeBuf->Des());
+
+    //
+    // Convert it back again to the native format...
+    //
+    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
+    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicode, encoded, state);
+
+    if (notRestored > 0)
+        {
+        aNumberOfUnconvertibleCharacters += notRestored;
+        }
+    else if (notRestored < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
+
+    //
+    // Now work out which characters are downgrades, require alternative encoding
+    // or are unsupported.
+    //
+    for (TInt pos = desLength-1;  pos >= 0;  --pos)
+        {
+        if (aRestoredStdDes[pos] != aDes[pos])
+            {
+            // Not supported by standard encoder...
+            if (backToUnicode[pos] == aDes[pos])
+                {
+                // Supported by alternative encoder...
+                ++aNumberRequiringAlternativeEncoding;
+                }
+            else if (aRestoredStdDes[pos] != KReplacementCharacter)
+                {
+                // Downgraded by standard encoder...
+                ++aNumberOfDowngradedCharacters;
+                }
+            else if (backToUnicode[pos] != KReplacementCharacter)
+                {
+                // Downgraded by alternative encoder...
+                ++aNumberOfDowngradedCharacters;
+                ++aNumberRequiringAlternativeEncoding;
+                }
+            else
+                {
+                // Unconvertible...
+                ++aNumberOfUnconvertibleCharacters;
+                aIndexOfFirstUnconvertibleCharacter = pos;
+                }
+            }
+        }
+
+    CleanupStack::PopAndDestroy(2, encodedBuf); // backToUnicode, encodedBuf
+    
+ 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+    } // CSmsAlphabetConverter::ConvertWithAlternativeEncodingL    
+
+/**
  *  Given a piece of text and an alternative encoding, this function works out
  *  which encoding is best to use and returns the ID of that converter.
  * 
@@ -1825,6 +1796,7 @@
 	if (aSuggestedEncoding != ESmsEncodingNone  &&
 		iSmsAlphabet == TSmsDataCodingScheme::ESmsAlphabet7Bit)
 		{
+        TInt desLength = aNativeCharacters.Length();
 		TInt  numberOfUnconvertibleCharacters, numberOfDowngradedCharacters;
 		TInt  numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;
 		
@@ -1832,50 +1804,59 @@
 		// First try the default encoding (but in this case treat downgrades
 		// as unconverted, since later encoders might do better)...
 		//
-		IsSupportedL(aNativeCharacters, ESmsEncodingNone,
-					 numberOfUnconvertibleCharacters,
-                     numberOfDowngradedCharacters,
-                     numberRequiringAlternativeEncoding,
-                     indexOfFirstUnconvertibleCharacter);
+		HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
+	    TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
+	    TBool  isCountDowngrade = ETrue; // Count downgraded chars
+		
+	    ConvertWith7BitEncodingL(aNativeCharacters, backToUnicodeAfterStd, 
+	            numberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
+	            indexOfFirstUnconvertibleCharacter, isCountDowngrade);
+		
 
 		TInt leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
 
-		//
-		// Create a list of alternative encodings to try...
-		//
-		TSmsEncoding  encodingList[8];
-		TInt          encodingCount = 0;
+		if (leastUnconvertibleCharacters > 0)
+		    {
+            //
+            // Create a list of alternative encodings to try...
+            //
+            TSmsEncoding  encodingList[8];
+            TInt          encodingCount = 0;
+            
+            if (aSuggestedEncoding == ESmsEncodingTurkishLockingAndSingleShift)
+                {
+                encodingList[encodingCount++] = ESmsEncodingTurkishSingleShift;
+                encodingList[encodingCount++] = ESmsEncodingTurkishLockingShift;
+                }
+            else if (aSuggestedEncoding == ESmsEncodingPortugueseLockingAndSingleShift)
+                {
+                encodingList[encodingCount++] = ESmsEncodingPortugueseSingleShift;
+                encodingList[encodingCount++] = ESmsEncodingPortugueseLockingShift;
+                }
+            
+            encodingList[encodingCount++] = aSuggestedEncoding;
+
+            //
+            // Now try the all the alternatives...
+            //
+            for (TInt  encoder = 0;  encoder < encodingCount && leastUnconvertibleCharacters > 0;  ++encoder)
+                {
+                ConvertWithAlternativeEncodingL(aNativeCharacters, backToUnicodeAfterStd, 
+                        encodingList[encoder], 
+                        numberOfUnconvertibleCharacters, 
+                        numberOfDowngradedCharacters,
+                        numberRequiringAlternativeEncoding,
+                        indexOfFirstUnconvertibleCharacter);       
+
+                if (numberOfUnconvertibleCharacters + numberOfDowngradedCharacters < leastUnconvertibleCharacters)
+                    {
+                    encodingToUse = encodingList[encoder];
+                    leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
+                    }
+                }
+		    }
 		
-		if (aSuggestedEncoding == ESmsEncodingTurkishLockingAndSingleShift)
-			{
-			encodingList[encodingCount++] = ESmsEncodingTurkishSingleShift;
-			encodingList[encodingCount++] = ESmsEncodingTurkishLockingShift;
-			}
-		else if (aSuggestedEncoding == ESmsEncodingPortugueseLockingAndSingleShift)
-			{
-			encodingList[encodingCount++] = ESmsEncodingPortugueseSingleShift;
-			encodingList[encodingCount++] = ESmsEncodingPortugueseLockingShift;
-			}
-
-		encodingList[encodingCount++] = aSuggestedEncoding;
-		encodingList[encodingCount++] = ESmsEncodingNone;
-
-		//
-		// Now try the all the alternatives...
-		//
-		for (TInt  encoder = 0;  encoder < encodingCount;  encoder++)
-			{
-			IsSupportedL(aNativeCharacters, encodingList[encoder],
-						 numberOfUnconvertibleCharacters,
-	                     numberOfDowngradedCharacters,
-	                     numberRequiringAlternativeEncoding,
-	                     indexOfFirstUnconvertibleCharacter);
-			if (numberOfUnconvertibleCharacters + numberOfDowngradedCharacters < leastUnconvertibleCharacters)
-				{
-				encodingToUse = encodingList[encoder];
-				leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
-				}
-			}
+            CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
 		}
 
 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2, "CSmsAlphabetConverter::FindBestAlternativeEncodingL(): encodingToUse=%d", encodingToUse);
@@ -3967,9 +3948,19 @@
 	{
 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL_1, "CSmsUserData::IsSupportedL()");
 
+	TInt  numberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
+	           numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;	
+	TBuf<4>   toEncode;
+    toEncode.SetLength(1);
+    toEncode[0]=(TText)aChar;
+
 	CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
-	TBool result=converter->IsSupportedL(aChar);
-	CleanupStack::PopAndDestroy();
+	TBool result=converter->IsSupportedL(toEncode, ESmsEncodingNone, 
+                                         numberOfUnconvertibleCharacters,
+                                         numberOfDowngradedCharacters,
+                                         numberRequiringAlternativeEncoding,
+                                         indexOfFirstUnconvertibleCharacter);	
+	CleanupStack::PopAndDestroy(converter);
 
 	return result;
 	} // CSmsUserData::IsSupportedL
--- a/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions	Wed Aug 18 10:57:47 2010 +0300
@@ -369,6 +369,15 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1=0x1a5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2=0x1a6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3=0x1a7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4=0x1a8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1=0x1a9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2=0x1aa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3=0x1ab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4=0x1ac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5=0x1ad
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
@@ -376,18 +385,12 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5=0x18d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6=0x18e
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_3=0x18b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_4=0x18c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
--- a/smsprotocols/smsstack/smsprot/Group/bld.inf	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Group/bld.inf	Wed Aug 18 10:57:47 2010 +0300
@@ -37,4 +37,4 @@
 
 ../Group/SMSPROT.mmp
 
-#include "../test/group/bld.inf"
+#include "../Test/group/bld.inf"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Group/smsport_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,31 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\TE_SMSEMSPRT.script"-"c:\testdata\scripts\TE_SMSEMSPRT.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\te_smsemsprt_commdb.cfg"-"c:\testdata\scripts\te_smsemsprt_commdb.cfg"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress.script"-"c:\testdata\scripts\te_smsprtstress.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress_commdb.cfg"-"c:\testdata\scripts\te_smsprtstress_commdb.cfg"
+
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSSTOR\te_smsstor.script"-"c:\testdata\scripts\te_smsstor.script"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_gsmu.script"-"c:\testdata\scripts\TE_smsprt_gsmu.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_prot.script"-"c:\testdata\scripts\TE_smsprt_prot.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_smsstack.script"-"c:\testdata\scripts\TE_smsprt_smsstack.script"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\Te_SMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_SMSStackOutOfDiskSpace.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_SetupSMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script"
--- a/smsprotocols/smsstack/smsprot/Src/smspread.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspread.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -238,7 +238,7 @@
 			if (iStatus.Int() == KErrNone)
 				{
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-                LogSmsIfPDU(_L8("ETEL RX PDU: "), iMsgData, EFalse); 
+                LogSmsIfPDUL(_L8("ETEL RX PDU: "), iMsgData, EFalse); 
                 TBuf<40> timestamp;
                 SmsTimeStampL(timestamp);
                 OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPDUREAD_DORUNL_2, "%S",timestamp);
--- a/smsprotocols/smsstack/smsprot/Src/smspsend.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspsend.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -678,7 +678,7 @@
 		// Debug logging of the PDU we are sending...
 		//
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-        LogSmsIfPDU(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
+        LogSmsIfPDUL(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
         LogSmsIfSendAttributes(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
         TBuf<40> timestamp;
         SmsTimeStampL(timestamp);
--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/TE_smsprt.script	Tue Jul 06 15:36:38 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2265 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-RUN_SCRIPT z:\TestData\Scripts\TE_smsprt_setup.script
-
-LOAD_SUITE TE_smsprt -SharedData
-
-//!@file
-
-START_TESTCASE SMS-SMSStack-NA-3001
-//!@SYMTestCaseID SMS-SMSStack-NA-3001
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Simple Tx And Rx
-//!@SYMTestPriority critical
-//!@SYMTestActions Test simple transmit and receive
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSimpleTxAndRx z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber0
-END_TESTCASE SMS-SMSStack-NA-3001
-
-START_TESTCASE SMS-SMSS-SMSPROT-0158
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0158
-//!@SYMDEF INC138096
-//!@SYMTestCaseDesc Tests that a SMS can be received when the "LogDuration" is set to "No Log"
-//!@SYMTestPriority Critical
-//!@SYMTestActions Sets the Log Server to "No Log", then sends and receives a SMS, both operations should be completed successfully.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 600 TE_smsprt TestSimpleTxAndRxWithLoggingDisabled z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber158
-END_TESTCASE SMS-SMSS-SMSPROT-0158
-
-START_TESTCASE SMS-SMSStack-NA-3002
-//!@SYMTestCaseID SMS-SMSStack-NA-3002
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Status Report
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test status report
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestStatusReport z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber1
-END_TESTCASE SMS-SMSStack-NA-3002
-
-
-START_TESTCASE SMS-SMSStack-NA-3003
-//!@SYMTestCaseID SMS-SMSStack-NA-3003
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Tx With Error
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Transmit with Error
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestTxWithError z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber2
-END_TESTCASE SMS-SMSStack-NA-3003
-
-
-START_TESTCASE SMS-SMSStack-NA-3004
-//!@SYMTestCaseID SMS-SMSStack-NA-3004
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Tx Failed
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Transmit with failure
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestTxFailed z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber3
-END_TESTCASE SMS-SMSStack-NA-3004
-
-
-START_TESTCASE SMS-SMSStack-NA-3005
-//!@SYMTestCaseID SMS-SMSStack-NA-3005
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Matching To Observer
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Matching To Observer
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestMatchingToObserver z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber4
-END_TESTCASE SMS-SMSStack-NA-3005
-
-
-START_TESTCASE SMS-SMSStack-NA-3006
-//!@SYMTestCaseID SMS-SMSStack-NA-3006
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Command Messages
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Command Messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCommandMessages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber5
-END_TESTCASE SMS-SMSStack-NA-3006
-
-
-START_TESTCASE SMS-SMSStack-NA-3007
-//!@SYMTestCaseID SMS-SMSStack-NA-3007
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Simple Rx
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Simple Receive
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSimpleRx z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber6
-END_TESTCASE SMS-SMSStack-NA-3007
-
-
-START_TESTCASE SMS-SMSStack-NA-3008
-//!@SYMTestCaseID SMS-SMSStack-NA-3008
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test 7bit Mess Test
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test 7bit Mess Test
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt Test7bitMessTest z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber7
-END_TESTCASE SMS-SMSStack-NA-3008
-
-
-START_TESTCASE SMS-SMSStack-NA-3009
-//!@SYMTestCaseID SMS-SMSStack-NA-3009
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Class Messages
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Class Messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestClassMessages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber8
-END_TESTCASE SMS-SMSStack-NA-3009
-
-
-START_TESTCASE SMS-SMSStack-NA-3010
-//!@SYMTestCaseID SMS-SMSStack-NA-3010
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Rx Concatenated
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test receive concatenated
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestRxConcatenated z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber9
-END_TESTCASE SMS-SMSStack-NA-3010
-
-
-START_TESTCASE SMS-SMSStack-NA-3011
-//!@SYMTestCaseID SMS-SMSStack-NA-3011
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Rx Duplicate
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test receive duplicate
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestRxDuplicate z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber10
-END_TESTCASE SMS-SMSStack-NA-3011
-
-
-START_TESTCASE SMS-SMSStack-NA-3012
-//!@SYMTestCaseID SMS-SMSStack-NA-3012
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Rx Ring Tone A
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test receive ring tone A
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestRxRingToneA z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber11
-END_TESTCASE SMS-SMSStack-NA-3012
-
-
-START_TESTCASE SMS-SMSStack-NA-3013
-//!@SYMTestCaseID SMS-SMSStack-NA-3013
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Tx Rx Concatenated
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Transmit/receive concatenated messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestTxRxConcatenated z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber12
-END_TESTCASE SMS-SMSStack-NA-3013
-
-
-START_TESTCASE SMS-SMSStack-NA-3014
-//!@SYMTestCaseID SMS-SMSStack-NA-3014
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Param Storage
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test storage of parameters
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestParamStorage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber13
-END_TESTCASE SMS-SMSStack-NA-3014
-
-
-START_TESTCASE SMS-SMSStack-NA-3015
-//!@SYMTestCaseID SMS-SMSStack-NA-3015
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Sms Store
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Sms Store
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSmsStore z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber14
-END_TESTCASE SMS-SMSStack-NA-3015
-
-
-START_TESTCASE SMS-SMSStack-NA-3016
-//!@SYMTestCaseID SMS-SMSStack-NA-3016
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Sms Store List
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Sms Store List
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSmsStoreList z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber15
-END_TESTCASE SMS-SMSStack-NA-3016
-
-
-START_TESTCASE SMS-SMSStack-NA-3017
-//!@SYMTestCaseID SMS-SMSStack-NA-3017
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Delete Sms
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Delete Sms
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestDeleteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber15
-END_TESTCASE SMS-SMSStack-NA-3017
-
-
-START_TESTCASE SMS-SMSStack-NA-3018
-//!@SYMTestCaseID SMS-SMSStack-NA-3018
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Socket Binding
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Socket Binding
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSocketBinding z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber16
-END_TESTCASE SMS-SMSStack-NA-3018
-
-START_TESTCASE SMS-SMSStack-NA-3098
-//!@SYMTestCaseID SMS-SMSStack-NA-3098
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test SMS address class
-//!@SYMTestPriority High
-//!@SYMTestActions  Test SMS address class
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSmsAddr
-END_TESTCASE SMS-SMSStack-NA-3098
-
-START_TESTCASE SMS-SMSStack-NA-3019
-//!@SYMTestCaseID SMS-SMSStack-NA-3019
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Sms Event Logger
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Sms Event Logger
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSmsEventLogger z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber17
-END_TESTCASE SMS-SMSStack-NA-3019
-
-
-START_TESTCASE SMS-SMSStack-NA-3020
-//!@SYMTestCaseID SMS-SMSStack-NA-3020
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Bearer Change
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Bearer Change
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestBearerChange z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber18
-END_TESTCASE SMS-SMSStack-NA-3020
-
-
-START_TESTCASE SMS-SMSStack-NA-3094
-//!@SYMTestCaseID SMS-SMSStack-NA-3094
-//!@SYMREQ DEF080837
-//!@SYMTestCaseDesc Test Restore Bearer
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Restore Bearer
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestRestoreBearer 
-END_TESTCASE SMS-SMSStack-NA-3094
-
-
-START_TESTCASE SMS-SMSStack-NA-3021
-//!@SYMTestCaseID SMS-SMSStack-NA-3021
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Recv Mode Change
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Recieve Mode Change
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestRecvModeChange z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber19
-END_TESTCASE SMS-SMSStack-NA-3021
-
-
-START_TESTCASE SMS-SMSStack-NA-3022
-//!@SYMTestCaseID SMS-SMSStack-NA-3022
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Tsy Caps
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Tsy Capabilities
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestTsyCaps z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber20
-END_TESTCASE SMS-SMSStack-NA-3022
-
-
-START_TESTCASE SMS-SMSStack-NA-3023
-//!@SYMTestCaseID SMS-SMSStack-NA-3023
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test OOM Send Sms
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test send sms with out of memory conditions
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1000 TE_smsprt TestOOMSendSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber21
-END_TESTCASE SMS-SMSStack-NA-3023
-
-
-START_TESTCASE SMS-SMSStack-NA-3024
-//!@SYMTestCaseID SMS-SMSStack-NA-3024
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test OOM Write Sms
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test write sms with out of memory conditions
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1000 TE_smsprt TestOOMWriteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber22
-END_TESTCASE SMS-SMSStack-NA-3024
-
-
-START_TESTCASE SMS-SMSStack-NA-3025
-//!@SYMTestCaseID SMS-SMSStack-NA-3025
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test OOM Read Sms
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Read Sms with out of memory conditions
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1000 TE_smsprt TestOOMReadSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber23
-END_TESTCASE SMS-SMSStack-NA-3025
-
-
-START_TESTCASE SMS-SMSStack-NA-3026
-//!@SYMTestCaseID SMS-SMSStack-NA-3026
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test OOM Read Sms List
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test read sms list with out of memory conditions
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1000 TE_smsprt TestOOMReadSmsList z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber24
-END_TESTCASE SMS-SMSStack-NA-3026
-
-
-START_TESTCASE SMS-SMSStack-NA-3027
-//!@SYMTestCaseID SMS-SMSStack-NA-3027
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test OOM Delete Sms
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test delete sms with out of memory conditions
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1000 TE_smsprt TestOOMDeleteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber25
-END_TESTCASE SMS-SMSStack-NA-3027
-
-
-START_TESTCASE SMS-SMSStack-NA-3028
-//!@SYMTestCaseID SMS-SMSStack-NA-3028
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc TestOOMSmsParams
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test sms params with out of memory conditions
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1000 TE_smsprt TestOOMSmsParams z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber26
-END_TESTCASE SMS-SMSStack-NA-3028
-
-
-START_TESTCASE SMS-SMSStack-NA-3029
-//!@SYMTestCaseID SMS-SMSStack-NA-3029
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc TestMeStoreDupAndMiss
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Me store with duplicate and missing pdus'
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestMeStoreDupAndMiss z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber27
-END_TESTCASE SMS-SMSStack-NA-3029
-
-
-START_TESTCASE SMS-SMSStack-NA-3030
-//!@SYMTestCaseID SMS-SMSStack-NA-3030
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Sim Store Dup And Miss
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Sim Store with duplicate and Missing pdus'
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSimStoreDupAndMiss z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber28
-END_TESTCASE SMS-SMSStack-NA-3030
-
-
-START_TESTCASE SMS-SMSStack-NA-3031
-//!@SYMTestCaseID SMS-SMSStack-NA-3031
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc TestRxCphs
-//!@SYMTestPriority critical
-//!@SYMTestActions   Test the reception of a CPHS Message Waiting Indication
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestRxCphs z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber30
-END_TESTCASE SMS-SMSStack-NA-3031
-
-
-START_TESTCASE SMS-SMSStack-NA-3032
-//!@SYMTestCaseID SMS-SMSStack-NA-3032
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Invalid PDUs
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test receiving invalid pdus
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestInvalidPDUs z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber31
-END_TESTCASE SMS-SMSStack-NA-3032
-
-
-START_TESTCASE SMS-SMSStack-NA-3033
-//!@SYMTestCaseID SMS-SMSStack-NA-3033
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Stress
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Transmit and Receive large number of different messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 700 TE_smsprt TestStress z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber32
-
-END_TESTCASE SMS-SMSStack-NA-3033
-
-START_TESTCASE SMS-SMSStack-NA-3034
-//!@SYMTestCaseID SMS-SMSStack-NA-3034
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Combined Store
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Combined Store
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCombinedStore z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber33
-END_TESTCASE SMS-SMSStack-NA-3034
-
-
-START_TESTCASE SMS-SMSStack-NA-3035
-//!@SYMTestCaseID SMS-SMSStack-NA-3035
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Params Inter
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test retrieving and storing the sms parameters
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestParamsInter z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber34
-END_TESTCASE SMS-SMSStack-NA-3035
-
-
-START_TESTCASE SMS-SMSStack-NA-3036
-//!@SYMTestCaseID SMS-SMSStack-NA-3036
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc TestTxRxAlphanumeric
-//!@SYMTestPriority critical
-//!@SYMTestActions  est a Transmit And receive of messages with alphanumeric dest/orig addresses
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestTxRxAlphanumeric z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber35
-END_TESTCASE SMS-SMSStack-NA-3036
-
-
-START_TESTCASE SMS-SMSStack-NA-3037
-//!@SYMTestCaseID SMS-SMSStack-NA-3037
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Rx Suspend
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Receive Suspension
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestRxSuspend 
-END_TESTCASE SMS-SMSStack-NA-3037
-
-
-START_TESTCASE SMS-SMSStack-NA-3038
-//!@SYMTestCaseID SMS-SMSStack-NA-3038
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Enumerate Corrupted
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Enumeration of Corrupted messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestEnumerateCorrupted z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber37
-END_TESTCASE SMS-SMSStack-NA-3038
-
-
-START_TESTCASE SMS-SMSStack-NA-3039
-//!@SYMTestCaseID SMS-SMSStack-NA-3039
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc TestCancelling
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Cancellacion of an sms operation
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCancelling z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber38
-END_TESTCASE SMS-SMSStack-NA-3039
-
-
-START_TESTCASE SMS-SMSStack-NA-3040
-//!@SYMTestCaseID SMS-SMSStack-NA-3040
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Send And Recv Msgs With Different TON
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test send And recieve messages with different TON
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSendAndRecvMsgsWithDifferentTON 
-END_TESTCASE SMS-SMSStack-NA-3040
-
-
-START_TESTCASE SMS-SMSStack-NA-3041
-//!@SYMTestCaseID SMS-SMSStack-NA-3041
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Send And Receive Indicator Msgs
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test send and receive indicator messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSendAndReceiveIndicatorMsgs
-END_TESTCASE SMS-SMSStack-NA-3041
-
-
-START_TESTCASE SMS-SMSStack-NA-3042
-//!@SYMTestCaseID SMS-SMSStack-NA-3042
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Send and Receive Max Length Msg
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Send Recv Maximum Length Message (255 Pdus)
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 5000 TE_smsprt TestSendRecvMaxLengthMsg
-END_TESTCASE SMS-SMSStack-NA-3042
-
-
-START_TESTCASE SMS-SMSStack-NA-3043
-//!@SYMTestCaseID SMS-SMSStack-NA-3043
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Send And Recv Msgs With Different PID
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Send And Receive Msgs With Different PID
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSendAndRecvMsgsWithDifferentPID
-END_TESTCASE SMS-SMSStack-NA-3043
-
-
-START_TESTCASE SMS-SMSStack-NA-3044
-//!@SYMTestCaseID SMS-SMSStack-NA-3044
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc  Sms Params Error Cases
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Sms Parameters Error Cases
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt SmsParamsErrorCases
-END_TESTCASE SMS-SMSStack-NA-3044
-
-
-START_TESTCASE SMS-SMSStack-NA-3097
-//!@SYMTestCaseID SMS-SMSStack-NA-3097
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Resend Failed Concatinated Message
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Resend Failed Concatinated Message
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestResendFailedConcatinatedMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber44
-END_TESTCASE SMS-SMSStack-NA-3097
-
-
-START_TESTCASE SMS-SMSStack-NA-3045
-//!@SYMTestCaseID SMS-SMSStack-NA-3045
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Multipart Wap Message
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Multipart Wap Message
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestMultipartWapMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber45
-END_TESTCASE SMS-SMSStack-NA-3045
-
-
-START_TESTCASE SMS-SMSStack-NA-3046
-//!@SYMTestCaseID SMS-SMSStack-NA-3046
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test MOSES Message
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test MOSES Message
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestMOSESMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber46
-END_TESTCASE SMS-SMSStack-NA-3046
-
-
-START_TESTCASE SMS-SMSStack-NA-3047
-//!@SYMTestCaseID SMS-SMSStack-NA-3047
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Clock Back
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Clock Back
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestClockBack z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber47
-END_TESTCASE SMS-SMSStack-NA-3047
-
-
-START_TESTCASE SMS-SMSStack-NA-3048
-//!@SYMTestCaseID SMS-SMSStack-NA-3048
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Enumerate NoMessages
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test enumeration of no messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestEnumerateNoMessages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber48
-END_TESTCASE SMS-SMSStack-NA-3048
-
-
-START_TESTCASE SMS-SMSStack-NA-3049
-//!@SYMTestCaseID SMS-SMSStack-NA-3049
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Concatenated Message Logging
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Concatenated Message Logging
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestConcatenatedMessageLogging z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber50
-END_TESTCASE SMS-SMSStack-NA-3049
-
-
-START_TESTCASE SMS-SMSStack-NA-3050
-//!@SYMTestCaseID SMS-SMSStack-NA-3050
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Enumeration Of Status Report
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Enumeration Of Status Report
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestEnumerationOfStatusReport z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber51
-END_TESTCASE SMS-SMSStack-NA-3050
-
-
-START_TESTCASE SMS-SMSStack-NA-3051
-//!@SYMTestCaseID SMS-SMSStack-NA-3051
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test IE
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test IE
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber52
-END_TESTCASE SMS-SMSStack-NA-3051
-
-
-START_TESTCASE SMS-SMSStack-NA-3052
-//!@SYMTestCaseID SMS-SMSStack-NA-3052
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Email IE
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Email IE
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestEmailIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber53
-END_TESTCASE SMS-SMSStack-NA-3052
-
-
-START_TESTCASE SMS-SMSStack-NA-3053
-//!@SYMTestCaseID SMS-SMSStack-NA-3053
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Max Read Time For Sms Store List
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Maximim Read Time For Sms Store List
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestMaxReadTimeForSmsStoreList z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber54
-END_TESTCASE SMS-SMSStack-NA-3053
-
-
-START_TESTCASE SMS-SMSStack-NA-3054
-//!@SYMTestCaseID SMS-SMSStack-NA-3054
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc  Test Same Log Id Multiple PDU
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test same log id multiple pdu
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSameLogIdMultiplePDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber57
-END_TESTCASE SMS-SMSStack-NA-3054
-
-
-START_TESTCASE SMS-SMSStack-NA-3055
-//!@SYMTestCaseID SMS-SMSStack-NA-3055
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Same Log Id Single PDU
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Same Log Id Single PDU
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSameLogIdSinglePDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber58
-END_TESTCASE SMS-SMSStack-NA-3055
-
-
-START_TESTCASE SMS-SMSStack-NA-3056
-//!@SYMTestCaseID SMS-SMSStack-NA-3056
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Write Status Report To SIM
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Writing of a status report to the sim
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestWriteStatusReportToSIM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber49
-END_TESTCASE SMS-SMSStack-NA-3056
-
-
-START_TESTCASE SMS-SMSStack-NA-3057
-//!@SYMTestCaseID SMS-SMSStack-NA-3057
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc  Test Tx Sms With Delayed Completion
-//!@SYMTestPriority critical
-//!@SYMTestActions   Test transmit of a sms with delayed completion
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile z:\sms\smswap.sms-sendTryTimeout.esk c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-
-RUN_TEST_STEP 500 TE_smsprt TestTxSmsWithDelayedCompletion z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber60
-
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
-END_TESTCASE SMS-SMSStack-NA-3057
-
-
-START_TESTCASE SMS-SMSStack-NA-3058
-//!@SYMTestCaseID SMS-SMSStack-NA-3058
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Sms Store Read Cancel
-//!@SYMTestPriority critical
-//!@SYMTestActions Test sms store read with cancel
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSmsStoreReadCancel
-END_TESTCASE SMS-SMSStack-NA-3058
-
-
-START_TESTCASE SMS-SMSStack-NA-3059
-//!@SYMTestCaseID SMS-SMSStack-NA-3059
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Bind When Powered Down With Publish Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test bind when powered down with publish and subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestBindWhenPoweredDownWithPublishSubscribe
-END_TESTCASE SMS-SMSStack-NA-3059
-
-
-START_TESTCASE SMS-SMSStack-NA-3060
-//!@SYMTestCaseID SMS-SMSStack-NA-3060
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc TestObserverNotifiedWhenPoweredDownWithPublishSubscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test observer notified when powered down with publish and subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestObserverNotifiedWhenPoweredDownWithPublishSubscribe z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber59
-
-END_TESTCASE SMS-SMSStack-NA-3060
-
-START_TESTCASE SMS-SMSStack-NA-3061
-//!@SYMTestCaseID SMS-SMSStack-NA-3061
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Sms CNumber Change WithPublish Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test sms CNumber change with publish and subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSmsCNumberChangeWithPublishSubscribe z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber55
-END_TESTCASE SMS-SMSStack-NA-3061
-
-
-START_TESTCASE SMS-SMSStack-NA-3062
-//!@SYMTestCaseID SMS-SMSStack-NA-3062
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Status Report Time
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Status Report Time
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestStatusReportTime z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber62
-END_TESTCASE SMS-SMSStack-NA-3062
-
-
-START_TESTCASE SMS-SMSStack-NA-3063
-//!@SYMTestCaseID SMS-SMSStack-NA-3063
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Tx 8Bit Wap With Status
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test Transmit 8Bit wap message with status
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestTx8BitWapWithStatus z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber63
-END_TESTCASE SMS-SMSStack-NA-3063
-
-
-START_TESTCASE SMS-SMSStack-NA-3064
-//!@SYMTestCaseID SMS-SMSStack-NA-3064
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Sim Store Corrupt Message
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test sim store with corrupt message
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestSimStoreCorruptMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber64
-END_TESTCASE SMS-SMSStack-NA-3064
-
-
-
-START_TESTCASE SMS-SMSStack-NA-3065
-//!@SYMTestCaseID SMS-SMSStack-NA-3065
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Corrupt Pdu With Negative Response
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test a corrupt pdu with anegative response
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile z:\sms\testsmswap.sms.esk c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_TEST_STEP 500 TE_smsprt TestCorruptPduWithNegativeResponse z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber65
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
-END_TESTCASE SMS-SMSStack-NA-3065
-
-
-START_TESTCASE SMS-SMSStack-NA-3066
-//!@SYMTestCaseID SMS-SMSStack-NA-3066
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Boot Timer can be configured to a non default value
-//!@SYMTestPriority critical
-//!@SYMTestActions  Check that boot timer can be configured from smswap.sms.esk file.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile z:\sms\smswap.sms-bootTimerTimeout.esk c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_TEST_STEP 500 TE_smsprt TestBootTimer z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber45
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
-END_TESTCASE SMS-SMSStack-NA-3066
-
-
-START_TESTCASE SMS-SMSStack-NA-3067
-//!@SYMTestCaseID SMS-SMSStack-NA-3067
-//!@SYMREQ REQ4612
-//!@SYMTestCaseDesc Test CSmsMessageTimeStamp
-//!@SYMTestPriority critical
-//!@SYMTestActions Create message with know system utc time.  Set and get also checked
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageTimeStamp
-END_TESTCASE SMS-SMSStack-NA-3067
-
-START_TESTCASE SMS-SMSStack-NA-3068
-//!@SYMTestCaseID SMS-SMSStack-NA-3068
-//!@SYMREQ REQ4612
-//!@SYMTestCaseDesc Test service center time stamp in PDU with CSmsMessage interface.
-//!@SYMTestPriority critical
-//!@SYMTestActions Simulate receiving deliver PDU's.  Create message and interogate PDU and check time stamp and validity period.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageWithDeliverPDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber66
-END_TESTCASE SMS-SMSStack-NA-3068
-
-START_TESTCASE SMS-SMSStack-NA-3069
-//!@SYMTestCaseID SMS-SMSStack-NA-3069
-//!@SYMREQ REQ4612
-//!@SYMTestCaseDesc Test Status Report
-//!@SYMTestPriority critical
-//!@SYMTestActions  Test status report
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageWithStatusReportPDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber67
-END_TESTCASE SMS-SMSStack-NA-3069
-
-START_TESTCASE SMS-SMSStack-NA-3070
-//!@SYMTestCaseID SMS-SMSStack-NA-3070
-//!@SYMREQ REQ4612
-//!@SYMTestCaseDesc Test Submit PDU
-//!@SYMTestPriority critical
-//!@SYMTestActions  Create a submit message.  Send it using SimTSY.  SimTSY will validate the PDU to what is expected.  Status=0
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageWithSubmitPDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber68
-END_TESTCASE SMS-SMSStack-NA-3070
-
-START_TESTCASE SMS-SMSStack-NA-3071
-//!@SYMTestCaseID SMS-SMSStack-NA-3071
-//!@SYMREQ DEF055800
-//!@SYMTestCaseDesc Test Handling of PDUs with PID 0x40
-//!@SYMTestPriority critical
-//!@SYMTestActions  Check that PDUs with PID 0x40 are acknowledged but not forwarded to the client
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestHandlePID40h z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber69
-END_TESTCASE SMS-SMSStack-NA-3071
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3072
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3072
-//!@SYMREQ REQ4917.1
-//!@SYMTestCaseDesc Test hyperlink operations interface, and SMS stack ability to handle single PDU messages with hyperlinks
-//!@SYMTestPriority high
-//!@SYMTestActions Test hyperlink API's.  Transmit and receive of single PDU message with and without hyperlinks
-//!@SYMTestExpectedResults
-//!@SYMTestCaseDependencies Sim.tsy, smsstacktestutilities.dll
-//!@SYMTestType IT
-RUN_TEST_STEP 180 TE_smsprt TestSinglePDUHyperLinks z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber70
-END_TESTCASE SMS-SMSS-SMSPROT-I-3072
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3073
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3073
-//!@SYMREQ REQ4917.2
-//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without hyperlinks
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive of multiple PDU message with and without hyperlinks
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 60 TE_smsprt TestMultiplePDUHyperLinks z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber71
-END_TESTCASE SMS-SMSS-SMSPROT-I-3073
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3074
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3074
-//!@SYMREQ REQ4919.1
-//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without reply address
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive of single PDU message with and without reply address
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 180 TE_smsprt TestSinglePDUReplyAddress z:\testdata\configs\te_smsprt_data.ini ReplyAddress
-END_TESTCASE SMS-SMSS-SMSPROT-I-3074
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3075
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3075
-//!@SYMREQ REQ4919.2
-//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without reply address
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive of single PDU message with and without reply address
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 500 TE_smsprt TestMultiplePDUReplyAddress
-END_TESTCASE SMS-SMSS-SMSPROT-I-3075
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3076
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3076
-//!@SYMREQ REQ4922.1
-//!@SYMTestCaseDesc Test operations on SMS message for special messages
-//!@SYMTestPriority high
-//!@SYMTestActions Call API's for adding, removing, counting, and copying special messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 30 TE_smsprt TestSpecialMessageWaitingOperations
-END_TESTCASE SMS-SMSS-SMSPROT-I-3076
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3077
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3077
-//!@SYMREQ REQ4922.2
-//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without special messages
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive single PDU message with and without special messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 120 TE_smsprt TestSinglePDUSpecialMessageWaiting z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber73
-END_TESTCASE SMS-SMSS-SMSPROT-I-3077
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3078
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3078
-//!@SYMREQ REQ4922.3
-//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without special messages
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive multiple PDU message with and without special messages
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 500 TE_smsprt TestMultiplePDUSpecialMessageWaiting
-END_TESTCASE SMS-SMSS-SMSPROT-I-3078
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3079
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3079
-//!@SYMREQ REQ4923.1
-//!@SYMTestCaseDesc Test operations on SMS message for enhanced voice mail information
-//!@SYMTestPriority high
-//!@SYMTestActions Call API's for adding, removing, counting, and copying enhanced voice mail information
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 30 TE_smsprt TestEnhancedVoiceMailOperations z:\testdata\configs\te_smsprt_data.ini EnhancedVoiceMail
-END_TESTCASE SMS-SMSS-SMSPROT-I-3079
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3080
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3080
-//!@SYMREQ REQ4923.2
-//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without enhanced voice mail information
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive single PDU message with and without enhanced voice mail information
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 180 TE_smsprt TestSinglePDUEnhancedVoiceMailInformation z:\testdata\configs\te_smsprt_data.ini EnhancedVoiceMail
-END_TESTCASE SMS-SMSS-SMSPROT-I-3080
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3081
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3081
-//!@SYMREQ REQ4923.3
-//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without enhanced voice mail information
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive multiple PDU message with and without enhanced voice mail information
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 500 TE_smsprt TestMultiplePDUEnhancedVoiceMailInformation
-END_TESTCASE SMS-SMSS-SMSPROT-I-3081
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3082
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3082
-//!@SYMREQ REQ4923.4
-//!@SYMTestCaseDesc Test operations on SMS message for enhanced voice mail delete confirmations
-//!@SYMTestPriority high
-//!@SYMTestActions Call API's for adding, removing, counting, and copying enhanced voice mail delete confirmations
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 30 TE_smsprt TestEnhancedVoiceMailDeleteOperations
-END_TESTCASE SMS-SMSS-SMSPROT-I-3082
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3083
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3083
-//!@SYMREQ REQ4923.5
-//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without enhanced voice mail delete confirmations
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive single PDU message with and without enhanced voice mail delete confirmations
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 120 TE_smsprt TestSinglePDUEnhancedVoiceMailDeleteConfirmation z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber75
-END_TESTCASE SMS-SMSS-SMSPROT-I-3083
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3084
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3084
-//!@SYMREQ REQ4923.6
-//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without enhanced voice mail delete confirmations
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive multiple PDU message with and without enhanced voice mail delete confirmations
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType IT
-RUN_TEST_STEP 180 TE_smsprt TestMultiplePDUEnhancedVoiceMailDeleteConfirmation
-END_TESTCASE SMS-SMSS-SMSPROT-I-3084
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3085
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3085
-//!@SYMREQ REQ4920.1
-//!@SYMTestCaseDesc SMS stack will handle a SMS as 7 bit if no coding scheme has been specified.
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive multiple PDU message with and without enhanced voice mail delete confirmations
-//!@SYMTestExpectedResults SMS stack will handle received SMS as a 7 Bit coded message, KErrNone
-//!@SYMTestType IT
-RUN_TEST_STEP 180 TE_smsprt Test7BitDefaultAlphabet z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber76
-END_TESTCASE SMS-SMSS-SMSPROT-I-3085
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3086
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3086
-//!@SYMREQ REQ4918
-//!@SYMTestCaseDesc SMS stack will allow zero length information elements.
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive single and multiple PDU message with and zero length IE.  IE is USIM toolkit IE.
-//!@SYMTestExpectedResults Stack will accept zero length IE, add it to the list.  KErrNone
-//!@SYMTestType IT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 180 TE_smsprt TestZeroLengthIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber77
-END_TESTCASE SMS-SMSS-SMSPROT-I-3086
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3087
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3087
-//!@SYMREQ REQ4924
-//!@SYMTestCaseDesc SMS stack will process SMS messages that indicate automatic deletion
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive single PDU message with automatic deletion. Stack allow sending these messages.  Messages received are automatically deleted, and given to the client. Class 2 messages are not deleted from the SIM - default behaviour in ESK file.
-//!@SYMTestExpectedResults Messages are deleted from the phone store and SIM store.  Exception for class 2 messages, messages remains in the SIM store.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 180 TE_smsprt TestAutomaticDeletionInDCS z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber78
-END_TESTCASE SMS-SMSS-SMSPROT-I-3087
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3088
-// -----------------------------------------------------------------------------------------------------------
-//Test the configurability for automatic deletion with use of esk file
-//Copy required ESK file for testing configuration for deleting class 2 messages for automatic deletion
-// -----------------------------------------------------------------------------------------------------------
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3088
-//!@SYMREQ REQ4924
-//!@SYMTestCaseDesc SMS stack will process SMS messages that indicate automatic deletion, and set for deletion in ESK file
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive message with automatic deletion and set as so in the ESK file.
-//!@SYMTestExpectedResults Stack will delete all messages, including Class 2 messages.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-//Make a backup, copy over test ESK
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile z:\sms\smswap.sms-AutoDeletionClass2.esk c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_TEST_STEP 500 TE_smsprt TestAutomaticDeletionInDCSAndInEsk z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber79
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
-END_TESTCASE SMS-SMSS-SMSPROT-I-3088
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3089
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3089
-//!@SYMREQ REQ4921
-//!@SYMTestCaseDesc SMS stack will automatically delete type 0 SMS messages.
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive single PDU type 0 message. Repeat this twice, once for each setting in the ESK file.
-//!@SYMTestExpectedResults Stack will send messages marked as type 0.  Messages are deleted from the phone store and SIM store.  Exception for class 2 messages, messages remains in the SIM store.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 300 TE_smsprt TestAutomaticDeletionTypeZeroSMS z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber80
-
-END_TESTCASE SMS-SMSS-SMSPROT-I-3089
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3090
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3090
-//!@SYMREQ REQ4921
-//!@SYMTestCaseDesc SMS stack will automatically delete type 0 SMS messages.
-//!@SYMTestPriority high
-//!@SYMTestActions Transmit and receive single PDU type 0 message. Repeat this twice, once for each setting in the ESK file.
-//!@SYMTestExpectedResults Stack will send messages marked as type 0.  Messages are deleted from the phone store and SIM store.  Exception for class 2 messages, messages remains in the SIM store.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-//Copy required ESK file for testing configuration for deleting class 2 messages for automatic deletion
-//Make a backup, copy over test ESK
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile z:\sms\smswap.sms-AutomaticDeletionOfType0.esk c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
-//Run the test step
-RUN_TEST_STEP 180 TE_smsprt TestAutomaticDeletionTypeZeroAndSetInESK z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber81
-//restore orig esk file
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
-RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
-END_TESTCASE SMS-SMSS-SMSPROT-I-3090
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3091
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3091
-//!@SYMREQ REQ4923.7
-//!@SYMTestCaseDesc The SMS Stack can send the maximum size enhanced voice mail message that will fit in a PDU (139 bytes).
-//!@SYMTestPriority high
-//!@SYMTestActions Create a 139 byte enhanced voice mail message, add it to an empty SMS message and send it.
-//!@SYMTestExpectedResults The message is sent successfully.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 120 TE_smsprt EnhancedVoiceMessageBoundaryTest z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber83
-END_TESTCASE SMS-SMSS-SMSPROT-I-3091
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3092
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3092
-//!@SYMREQ REQ4923.8
-//!@SYMTestCaseDesc The SMS Stack can send the maximum size enhanced voice mail message that will fit in a segmented message (134 bytes).
-//!@SYMTestPriority high
-//!@SYMTestActions Send the maximum size enhanced voice mail message that will fit in a segmented message (134 bytes).
-//!@SYMTestExpectedResults The message is sent successfully.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 120 TE_smsprt EnhancedVoiceMessageBoundaryTest1 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber84
-END_TESTCASE SMS-SMSS-SMSPROT-I-3092
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3093
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3093
-//!@SYMREQ REQ4924.9
-//!@SYMTestCaseDesc The SMS stack can recover from heap exhaustion when sending a SMS Messages containing R6 Information Elements.
-//!@SYMTestPriority high
-//!@SYMTestActions A message containing R6 SMS IEs is sent repeatedly. The ESOCK server is configured to fail the n th request for heap memory, (n incrementing each time the message is sent). The test therefore checks that the stack can recover gracefully from heap exhaustion at every location that memory can be allocated.
-//!@SYMTestExpectedResults Assume that sending a R6 SMS requires 'M' heap allocations. The stack should return an Out of Memory error when heap allocation request fails because 'n' has a value in the range 1..m. When 'n' has value m+1, the message should be sent successfully and the test should exit.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 500 TE_smsprt TestOOMSendR6Sms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber82
-END_TESTCASE SMS-SMSS-SMSPROT-I-3093
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3094
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3094
-//!@SYMREQ REQ4920.1
-//!@SYMTestCaseDesc Submit reports default to 7 bit decoding if no DCS value is specified.
-//!@SYMTestPriority high
-//!@SYMTestActions Decode a submit report that contains text, but whose DCS byte is unspecified.
-//!@SYMTestExpectedResults The text is successfully decoded using 7 bit decoding.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 120 TE_smsprt CSubmitReportDefaultsTo7BitDecoding
-END_TESTCASE SMS-SMSS-SMSPROT-I-3094
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3095
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3095
-//!@SYMREQ REQ4920.2
-//!@SYMTestCaseDesc Deliver reports default to 7 bit decoding if no DCS value is specified.
-//!@SYMTestPriority high
-//!@SYMTestActions Decode a deliver report that contains text, but whose DCS byte is unspecified.
-//!@SYMTestExpectedResults The text is successfully decoded using 7 bit decoding.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 120 TE_smsprt CDeliverReportDefaultsTo7BitDecoding
-END_TESTCASE SMS-SMSS-SMSPROT-I-3095
-
-START_TESTCASE SMS-SMSS-SMSPROT-I-3096
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3096
-//!@SYMREQ REQ4920.3
-//!@SYMTestCaseDesc Status reports default to 7 bit decoding if no DCS value is specified.
-//!@SYMTestPriority high
-//!@SYMTestActions Decode a Status report that contains text, but whose DCS byte is unspecified.
-//!@SYMTestExpectedResults The text is successfully decoded using 7 bit decoding.
-//!@SYMTestType CIT
-//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 120 TE_smsprt CStatusReportDefaultsTo7BitDecoding
-END_TESTCASE SMS-SMSS-SMSPROT-I-3096
-
-START_TESTCASE SMS-GSMU-0046
-//!@SYMTestCaseID SMS-GSMU-0046	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Send single 7 bit PDU with TP-SRR status report scheme.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (2)
-//3. Set the scheme to TSmsStatusReportScheme::ETPSRRScheme
-//4. Set Default to zero and set the last segment
-//5. Send the message
-//6. Check request completes with KErrNone 
-//7. Delete the message.
-//8. Unmark the heap
-//!@SYMTestExpectedResults The message is sent successfully and SIMTSY has verified the format and correctness of the PDU - that it contains TP-SRR bit set, PDU = PDU (3).
-RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send7BitTPSRRSchemeSinglePDU
-
-END_TESTCASE SMS-GSMU-0046
-
-START_TESTCASE SMS-GSMU-0047
-//!@SYMTestCaseID SMS-GSMU-0047	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Send single 8 bit PDU with TP-SRR status report scheme.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (3)
-//3. Set the scheme to TSmsStatusReportScheme::ETPSRRScheme
-//4. Set Default to zero and set the last segment
-//5. Send the message
-//6. Check request completes with KErrNone 
-//7. Delete the message.
-//8. Unmark the heap
-//!@SYMTestExpectedResults The message is sent successfully and SIMTSY has verified the format and correctness of the PDU - that it contains TP-SRR bit set, PDU = PDU (803).
-RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send8BitTPSRRSchemeSinglePDU
-
-END_TESTCASE SMS-GSMU-0047
-
-START_TESTCASE SMS-GSMU-0059
-//!@SYMTestCaseID SMS-GSMU-0059	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Send 7 bit multiple PDU message with TP-SRR status report scheme set in all segments.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (4)
-//3. Set default to zero and set scheme TSmsStatusReportScheme::ETPSRRScheme in every segment
-//4. Send the message
-//5. Check request completes KErrNone 
-//6. Delete the message
-//7. Unmark the heap
-//!@SYMTestExpectedResults The message is verified by SimTSY that it contains TP-SRR bit set in every segment which = PDU (29-31).
-RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send7BitTPSRRSchemeMultiplePDU
-
-END_TESTCASE SMS-GSMU-0059
-
-START_TESTCASE SMS-GSMU-0060
-//!@SYMTestCaseID SMS-GSMU-0060	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Send 8 bit multiple PDU message with TP-SRR status report scheme set in all segments.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (4)
-//3. Set default to zero and set scheme TSmsStatusReportScheme::ETPSRRScheme in every segment
-//4. Send the message
-//5. Check request completes KErrNone 
-//6. Delete the message
-//7. Unmark the heap
-//!@SYMTestExpectedResults The message is verified by SimTSY that it contains TP-SRR bit set in every segment which = PDU (829-831).
-RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send8BitTPSRRSchemeMultiplePDU
-
-END_TESTCASE SMS-GSMU-0060
-
-START_TESTCASE SMS-GSMU-0067
-//!@SYMTestCaseID SMS-GSMU-0067
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Send 7 bit multiple PDU message with TP-SRR scheme set in only the last PDU.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (4)
-//3. Set scheme to TSmsStatusReportScheme::ETPSRRScheme and set default to zero.
-//4. Set TP-SRR for last segment only.
-//5. Send the message and check request completes KErrNone 
-//6. Delete the message
-//7. Unmark the heap
-//!@SYMTestExpectedResults The message sent is verified by SimTSY, PDUs = PDU(41-43) that it contains TP-SRR scheme set only in last segment.
-RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInLastPDU z:\testdata\configs\te_statusReportScheme.ini Send7BitTPSRRSchemeLastPDU
-END_TESTCASE SMS-GSMU-0067
-
-
-START_TESTCASE SMS-GSMU-0068
-//!@SYMTestCaseID SMS-GSMU-0068	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Send 8 bit multiple PDU message with TP-SRR scheme set in only the last PDU.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (4)
-//3. Set scheme to TSmsStatusReportScheme::ETPSRRScheme and set default to zero. 
-//4. Use function which sets the last segment.
-//5. Set TP-SRR for last segment only.
-//6. Send the message and check request completes KErrNone 
-//7. Delete the message
-//8. Unmark the heap
-//!@SYMTestExpectedResults The message sent is verified by SimTSY, PDUs = PDU(841-843) that it contains TP-SRR scheme set only in last segment.
-RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInLastPDU z:\testdata\configs\te_statusReportScheme.ini Send8BitTPSRRSchemeLastPDU
-
-// -------------------------------------------------------------------------------------------------------
-END_TESTCASE SMS-GSMU-0068
-
-
-START_TESTCASE SMS-GSMU-0092
-//!@SYMTestCaseID SMS-GSMU-0092	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive a “completed” status report for a TP-SRR scheme in a single 8bit PDU message.    
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report - PDU(103)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending the message. The received status report generates a notification.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveStatusReportCompletedSinglePDU
-END_TESTCASE SMS-GSMU-0092
-
-
-START_TESTCASE SMS-GSMU-0093
-//!@SYMTestCaseID SMS-GSMU-0093	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “permanent failure” status report for a TP-SRR scheme in a single 8 bit PDU message.  
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive permanent failure status report - PDU(104)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending the message. The received status report generates a notification.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini ReceiveStatusReportPermanentFailureSinglePDU
-END_TESTCASE SMS-GSMU-0093
-
-
-START_TESTCASE SMS-GSMU-0094
-//!@SYMTestCaseID SMS-GSMU-0094	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “temporary failure” status report and then a “completed” for a TP-SRR scheme in a single 8 bit PDU message.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive temporary failure status report - PDU(105)
-//6. Receive completed status report - PDU(106)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending or after receiving the temporary failure.  However, a notification is generated after receiving the completed status report.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini TemporyFailureCompletedSinglePDU
-END_TESTCASE SMS-GSMU-0094
-
-
-START_TESTCASE SMS-GSMU-0095
-//!@SYMTestCaseID SMS-GSMU-0095	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “temporary failure” status report and then a “permanent failure” for a TP-SRR scheme in a single 8 bit PDU message.  
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive temporary failure status report - PDU(107)
-//6. Receive completed status report - PDU(108)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending or after receiving the temporary failure.  However, a notification is generated after receiving the permanent failure status report.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini TemporyFailurePermanentFailureSinglePDU
-END_TESTCASE SMS-GSMU-0095
-
-
-START_TESTCASE SMS-GSMU-0097
-//!@SYMTestCaseID SMS-GSMU-0097	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “completed” status reports for a multiple 8 bit PDU message with TP-SRR set in every PDU in this order: third,second,first.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and with TP-SRR scheme set in every PDU.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report for third PDU - PDU(112)
-//6. Receive completed status report for second PDU - PDU(111)
-//7. Receive completed status report for first PDU - PDU(110)
-//8. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending. The status reports received are logged and a notification is generated on receiving PDU(110).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini MultipeStatusReportsCompletedOrderThirdSecondFirst
-END_TESTCASE SMS-GSMU-0097
-
-
-START_TESTCASE SMS-GSMU-0098
-//!@SYMTestCaseID SMS-GSMU-0098	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “completed” status reports for a multiple 8 bit PDU message with TP-SRR set in every PDU in this order: first, second, third.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and with TP-SRR scheme set in every PDU.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report for first PDU - PDU(113)
-//6. Receive completed status report for second PDU - PDU(114)
-//7. Receive completed status report for third PDU - PDU(115)
-//8. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending. The status reports received are logged and a notification is generated on receiving PDU(115).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini MultipeStatusReportsCompletedOrderFirstSecondThird
-END_TESTCASE SMS-GSMU-0098
-
-
-START_TESTCASE SMS-GSMU-0099
-//!@SYMTestCaseID SMS-GSMU-0099	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “completed” and “temporary failure” status reports for a multiple 8 bit PDU message with TP-SRR set in every PDU.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and with TP-SRR scheme set in every PDU.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report for first PDU - PDU(116)
-//6. Receive temporary status report for third PDU - PDU(117)
-//7. Receive completed status report for second PDU - PDU(118)
-//8. Receive completed status report for third PDU - PDU(119)
-//9. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending. The status reports received are logged and a notification is only generated on receiving PDU(119).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini MultipeStatusReportsTemporyFailureOnThird
-END_TESTCASE SMS-GSMU-0099
-
-
-START_TESTCASE SMS-GSMU-0100
-//!@SYMTestCaseID SMS-GSMU-0100	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “completed” status reports for a multiple 8 bit PDU message with TP-SRR set in last PDU only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and TP-SRR set in last segment.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report for last PDU - PDU(120)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending. The status report received is logged and a notification is generated on receiving it.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportCompletedLastOnly
-END_TESTCASE SMS-GSMU-0100
-
-
-START_TESTCASE SMS-GSMU-0101
-//!@SYMTestCaseID SMS-GSMU-0101	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “temporary failure” and “completed” status reports for the last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and TP-SRR set in last segment.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive temporary status report for last PDU - PDU(121)
-//6. Receive completed status report for last PDU - PDU(122)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification is only received on receiving PDU(122).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportTemporaryFailureThenCompletedLastOnly
-END_TESTCASE SMS-GSMU-0101
-
-
-START_TESTCASE SMS-GSMU-0102
-//!@SYMTestCaseID SMS-GSMU-0102	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “permanent failure” status report for the last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and TP-SRR set in last segment.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report for last PDU - PDU(123)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification isn’t received after sending. The status report received is logged and a notification is generated on receiving it.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportPermanentFailureLastPDUOnly
-END_TESTCASE SMS-GSMU-0102
-
-
-START_TESTCASE SMS-GSMU-0103
-//!@SYMTestCaseID SMS-GSMU-0103	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “temporary failure” and “permanent failure” status reports for the last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and TP-SRR set in last segment.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive temporary status report for last PDU - PDU(124)
-//6. Receive permanent failure status report for last PDU - PDU(125)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification is only received on receiving PDU(125).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportTemporaryFailureThenPermanentFailureLastOnly
-END_TESTCASE SMS-GSMU-0103
-
-
-START_TESTCASE SMS-GSMU-0104
-//!@SYMTestCaseID SMS-GSMU-0104	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive “completed” status reports for the first and last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and TP-SRR set in last segment.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report for first PDU - PDU(126)
-//6. Receive completed status report for last PDU - PDU(127)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification is only received on receiving PDU(127).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini CompletedStatusReportForFirstAndThirdPDUSetForLastOnly
-END_TESTCASE SMS-GSMU-0104
-
-
-START_TESTCASE SMS-GSMU-0107
-//!@SYMTestCaseID SMS-GSMU-0107	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive a "completed" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "completed" status report - PDU(131)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification isn't received after sending the message. The received status report generates a notification.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceiveStatusReportForSinglePDUSMSCLastPDU
-END_TESTCASE SMS-GSMU-0107
-
-
-START_TESTCASE SMS-GSMU-0108
-//!@SYMTestCaseID SMS-GSMU-0108	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive a "permanent failure" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "permanent failure" status report - PDU(132)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification isn't received after sending the message. The received status report generates a notification.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceivePermanentFailureStatusReportSinglePDUSMSCLastPDU
-END_TESTCASE SMS-GSMU-0108
-
-
-START_TESTCASE SMS-GSMU-0109
-//!@SYMTestCaseID SMS-GSMU-0109	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive a "temporary failure" and a "permanent failure" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "temporary failure" status report - PDU(133)
-//6. Receive "permanent failure" status report - PDU(134)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification isn't received after sending or after receiving the status report PDU(133).  A notification is generated on receiving PDU(134)
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceiveTemporyFailurePermanentFailureStatusReportSinglePDUSMSCScheme
-END_TESTCASE SMS-GSMU-0109
-
-
-START_TESTCASE SMS-GSMU-0110
-//!@SYMTestCaseID SMS-GSMU-0110	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//1@SYMTestCaseDesc Receive a "temporary failure" and a "completed" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "temporary failure" status report - PDU(135)
-//6. Receive "completed" status report - PDU(136)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification is only generated on receiving PDU(136)
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceiveTemporyFailureCompletedStatusReportSinglePDUSMSCScheme
-END_TESTCASE SMS-GSMU-0110
-
-
-START_TESTCASE SMS-GSMU-0112
-//!@SYMTestCaseID SMS-GSMU-0112	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive "completed" status reports for a multiple 8 bit PDU message with SMSC set in every PDU (0x01) in this order: third,second,first.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and with SMSC scheme set (0x01) and in every PDU.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive completed status report for third PDU - PDU(140)
-//6. Receive completed status report for second PDU - PDU(141)
-//7. Receive completed status report for first PDU - PDU(142)
-//8. Unmark the heap
-//!@SYMTestExpectedResults A notification isn't received after sending. The status reports received are logged and a notification is generated on receiving PDU(142).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCAllPDUs z:\testdata\configs\te_statusReportScheme.ini MultipeCompletedStatusReportsSMSCScheme
-END_TESTCASE SMS-GSMU-0112
-
-
-START_TESTCASE SMS-GSMU-0114
-//!@SYMTestCaseID SMS-GSMU-0114	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive "completed" and "temporary failure" status reports for a multiple 8 bit PDU message with SMSC set in every PDU (0x01) in this order: second, third, first.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and with SMSC scheme set (0x01) and in every PDU.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "completed" status report for second PDU - PDU(146)
-//6. Receive "temporary failure" status report for third PDU - PDU(147)
-//7. Receive "completed" status report for first PDU - PDU(148)
-//8. Receive "completed" status report for third PDU - PDU(149)
-//9. Unmark the heap
-//!@SYMTestExpectedResults A notification isn't received after sending. The status reports received are logged and a notification is generated on receiving PDU(149).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCAllPDUs z:\testdata\configs\te_statusReportScheme.ini MultipeCompletedTemporaryFailureStatusReportsSMSCScheme
-END_TESTCASE SMS-GSMU-0114
-
-
-START_TESTCASE SMS-GSMU-0115
-//!@SYMTestCaseID SMS-GSMU-0115	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive "completed" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "completed" status report for last PDU - PDU(150)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification isn't received after sending. The status report received is logged and a notification is generated on receiving it.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUSingleStatusReportLastPDUSMSCScheme
-END_TESTCASE SMS-GSMU-0115
-
-
-START_TESTCASE SMS-GSMU-0116
-//!@SYMTestCaseID SMS-GSMU-0116	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive "temporary failure" and "completed" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "temporary failure" status report for last PDU - PDU(151)
-//6. Receive "completed" status report for last PDU - PDU(152)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification only received after receiving status report PDU(152).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUTemporaryCompleteStatusReportLastPDUSMSCScheme
-END_TESTCASE SMS-GSMU-0116
-
-
-START_TESTCASE SMS-GSMU-0117
-//!@SYMTestCaseID SMS-GSMU-0117	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive "permanent failure" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "permanent failure" status report for last PDU - PDU(153)
-//6. Unmark the heap
-//!@SYMTestExpectedResults A notification is only received after receiving status report PDU(153).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUPermanentFailureStatusReportLastPDUSMSCScheme
-END_TESTCASE SMS-GSMU-0117
-
-
-START_TESTCASE SMS-GSMU-0118
-//!@SYMTestCaseID SMS-GSMU-0118	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive "temporary failure" and "permanent failure" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "temporary failure" status report for last PDU - PDU(154)
-//6. Receive "permanent failure" status report for last PDU - PDU(155)
-//7. Unmark the heap
-//!@SYMTestExpectedResults A notification only received after receiving status report PDU(155).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUTemporaryPermanentFailureStatusReportLastPDUSMSCScheme
-END_TESTCASE SMS-GSMU-0118
-
-
-START_TESTCASE SMS-GSMU-0119
-//!@SYMTestCaseID SMS-GSMU-0119	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive "completed" status reports for first and third PDU of a multiple 8 bit PDU message with SMSC set (0x01) in first and last only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and SMSC set in first and last segment.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "completed" status report for first PDU - PDU(156)
-//6. Receive "completed" status report for last PDU - PDU(157)
-//7. Receive "completed" status report for second PDU - PDU(158)
-//8. Unmark the heap
-//!@SYMTestExpectedResults A notification is generated on receiving PDU(157).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSomePDUs z:\testdata\configs\te_statusReportScheme.ini CompletedStatusReportForFirstAndThirdPDUSMSC
-END_TESTCASE SMS-GSMU-0119
-
-
-START_TESTCASE SMS-GSMU-0120
-//!@SYMTestCaseID SMS-GSMU-0120	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive "permanent failure" status reports for first and second PDU of a multiple 8 bit PDU message with SMSC set (0x01) in first and second only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create SMS message with test data (4) and SMSC set in first and last segment.
-//3. Send the message and check request completes KErrNone 
-//4. Delete the message
-//5. Receive "permanent failure" status report for first PDU - PDU(159)
-//6. Receive "permanent failure" status report for second PDU - PDU(160)
-//7. Receive "permanent failure" status report for last PDU - PDU(161)
-//8. Unmark the heap
-//!@SYMTestExpectedResults A notification is generated on receiving PDU(160).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSomePDUs z:\testdata\configs\te_statusReportScheme.ini PermanentFailureStatusReportForFirstAndSecondPDUSMSC
-END_TESTCASE SMS-GSMU-0120
-
-
-START_TESTCASE SMS-GSMU-0049
-//!@SYMTestCaseID SMS-GSMU-0049	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive single 8 bit PDU with TP-SRR status report scheme.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Trigger the sending of messages with sending message
-//3. Receive a message of PDU (804).
-//4. Delete the message
-//5. Unmark the heap
-//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EDefaultScheme scheme and has text of test data(2).
-RUN_TEST_STEP  100 TE_smsprt TestReceivingDeliversWithTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRSingle8Bit
-END_TESTCASE SMS-GSMU-0049
-
-
-START_TESTCASE SMS-GSMU-0058
-//!@SYMTestCaseID SMS-GSMU-0058	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive 8 bit multiple PDU message with no status report scheme.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Trigger receive by sending a message PDU(1)
-//3. Receive PDUs (826-828) the message and check request completes KErrNone
-//4. Check message contains text of test data (4) and has TSmsStatusReportScheme::EDefaultScheme scheme.
-//5. Delete the message
-//6. Unmark the heap
-//!@SYMTestExpectedResults The message is verified as containing test data (4) and is found to have TSmsStatusReportScheme::EDefaultScheme status report scheme set.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingDeliversWithTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRMultiple8Bit
-END_TESTCASE SMS-GSMU-0058
-
-
-START_TESTCASE SMS-GSMU-0061
-//!@SYMTestCaseID SMS-GSMU-0061	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive 7 bit multiple PDU message with TP-SRR status report scheme set in all segments.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Trigger receive by sending a message
-//3. Receive PDUs (32-34) and check request completes successfully
-//4. Check message it has text data = test data (4) and has TSmsStatusReportScheme::ETPSRRScheme scheme set for every PDU.
-//5. Delete the message
-//6. Unmark the heap
-//!@SYMTestExpectedResults The message received has text of test data (4) and has TSmsStatusReportScheme::ETPSRRScheme scheme set for every PDU.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingDeliversWithTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRMultiple7Bit
-END_TESTCASE SMS-GSMU-0061
-
-
-START_TESTCASE SMS-GSMU-0070
-//!@SYMTestCaseID SMS-GSMU-0070	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive 8 bit multiple PDU message with TP-SRR scheme set in the third (last) PDU only.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Trigger receiving by sending a message
-//3. Receive a message PDUs(844-846) and check message is received ok.
-//4. Check message has TSmsStatusReportScheme::ETPSRRScheme scheme set only in last PDU.
-//5. Delete the message
-//6. Unmark the heap
-//!@SYMTestExpectedResults The message received has text of test data (4) and has TSmsStatusReportScheme::ETPSRRScheme scheme set in third segment only.
-RUN_TEST_STEP  100 TE_smsprt TestDeliversWithTPSRRScheme z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRMultiple8BitLastPDU
-END_TESTCASE SMS-GSMU-0070
-
-
-START_TESTCASE SMS-GSMU-0051
-//!@SYMTestCaseID SMS-GSMU-0051	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Send single 8 bit PDU with SMSC status report scheme specifying no status report requested, i.e. 0x00.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (3)
-//3. Set the scheme to TSmsStatusReportScheme::EControlParametersScheme and value = 0x00
-//4. Send the message check request completes KErrNone 
-//5. Delete the message.
-//6. Unmark the heap
-//!@SYMTestExpectedResults The message is sent successfully - SIMTSY has verified the format and correctness of the PDU = PDU(805) - it contains an SMSC control element with a value of 0x00.
-RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeSinglePDUNoBitSet z:\testdata\configs\te_statusReportScheme.ini Send8BitSMSCSchemeSinglePDUNoBitSet
-END_TESTCASE SMS-GSMU-0051
-
-
-START_TESTCASE SMS-GSMU-0052
-//!@SYMTestCaseID SMS-GSMU-0052
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive single 7 bit PDU with SMSC status report scheme specifying no status report requested, i.e. 0x00.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Receive a message of PDU.
-//3. Test that the scheme is set to SMSC and the status report = 0x00.
-//4. Delete the message
-//5. Unmark the heap
-//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value=0x00.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSinglePDU z:\testdata\configs\te_statusReportScheme.ini Receive7BitSMSCSchemSinglePDU
-END_TESTCASE SMS-GSMU-0052
-
-
-START_TESTCASE SMS-GSMU-0055
-//!@SYMTestCaseID SMS-GSMU-0055	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Send single 8 bit PDU with SMSC status report scheme with status report requested for every possible combination, i.e. ESmsStatusReportTransactionCompleted=0x01,  ESmsStatusReportPermanentError, ESmsStatusReportTemporaryError, ESmsStatusReportTemporaryErrorSCTrying, ESmsStatusReportForFutureUse1, ESmsStatusReportForFutureUse2, ESmsStatusReportCancelRestSRR, ESmsStatusReportIncludeOriginalUDH, ESmsSelectiveStatusReportMask.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (2)
-//3. Set scheme to TSmsStatusReportScheme::EControlParametersScheme
-//3. For each configuration of TSmsSMSCControlParameters
-//  3.1 Set value
-//  3.2 Send the message
-//  3.3 Delete the message.
-//4. Unmark the heap
-//!@SYMTestExpectedResults The messages configuration is set for all values up to ESmsStatusReportTemporaryErrorSCTrying.  The messages are sent successfully and SIMTSY has verified the format and correctness of the PDU - PDU(806-813) that it contains an SMSC control element with the corresponding SMSC control parameter value.
-RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeSinglePDUSomeBitsSet z:\testdata\configs\te_statusReportScheme.ini Send8BitSMSCSchemeSinglePDUSomeBitsSet
-END_TESTCASE SMS-GSMU-0055
-
-
-START_TESTCASE SMS-GSMU-0056
-//!@SYMTestCaseID SMS-GSMU-0056
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive single 8 bit PDU messages with SMSC status report scheme set with status report requested for the lowest 4 bits that is 0x0F
-//!@SYMTestActions
-//1. Mark the heap
-//2. Receive a message of PDU.
-//3. Test that the scheme is set to SMSC and the status report = 0x0F.
-//4. Delete the message
-//5. Unmark the heap
-//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value=0x0F.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSinglePDU z:\testdata\configs\te_statusReportScheme.ini Receive8BitSMSCSchemSinglePDU
-END_TESTCASE SMS-GSMU-0056
-
-
-START_TESTCASE SMS-GSMU-0064
-//!@SYMTestCaseID SMS-GSMU-0064	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Send 8 bit multiple PDU message with SMSC status report scheme and set to not requesting status reports, i.e. 0x00.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (4)
-//3. Set scheme to TSmsStatusReportScheme::EControlParametersScheme scheme and with value 0x00
-//4. Send the message and check request completes KErrNone 
-//5. Delete the message
-//6. Unmark the heap
-//!@SYMTestExpectedResults The message sent is verified by SimTSY, PDUs (835-837) that it contains SMSC IE in every PDU and with value of 0x00.
-RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeMultiplePDUsSomeBitsSet z:\testdata\configs\te_statusReportScheme.ini Send8BitSMSCSchemeMultiplePDU
-END_TESTCASE SMS-GSMU-0064
-
-
-START_TESTCASE SMS-GSMU-0065
-//!@SYMTestCaseID SMS-GSMU-0065
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive 7 bit multiple PDU message with SMSC status report scheme and all PDUs set to not requesting status reports, i.e. 0x00.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Receive a message of PDU.
-//3. Test that the scheme is set to SMSC and the status report = 0x00 for all the PDUs.
-//4. Delete the message
-//5. Unmark the heap
-//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value=0x00.
-RUN_TEST_STEP 100 TE_smsprt TestReceivingSMSCMultiplePDU z:\testdata\configs\te_statusReportScheme.ini Receive7BitSMSCSchemeMultiplePDU
-END_TESTCASE SMS-GSMU-0065
-
-
-START_TESTCASE SMS-GSMU-0071
-//!@SYMTestCaseID SMS-GSMU-0071	
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Send 7 bit multiple PDU message with TSmsStatusReportScheme::EControlParametersScheme status report scheme for first and last PDU and set to ESmsStatusReportPermanentError and ESmsStatusReportTemporaryError respectively.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Create the message with test data (4)
-//3. Set SMSC scheme for first and last PDU or segment and set values to ESmsStatusReportPermanentError and ESmsStatusReportTemporaryError respectively.
-//4. Send the message and check request completes KErrNone 
-//5. Delete the message
-//6. Unmark the heap
-//!@SYMTestExpectedResults The message sent is verified by SimTSY by receving PDUs (47-49) which contain SMSC scheme for first and last PDU with values ESmsStatusReportPermanentError and ESmsStatusReportTemporaryError respectively.
-RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeMultiplePDUsSomeBitsSet z:\testdata\configs\te_statusReportScheme.ini Send7BitSMSCSchemeMultiplePDU
-END_TESTCASE SMS-GSMU-0071
-
-
-START_TESTCASE SMS-GSMU-0074
-//!@SYMTestCaseID SMS-GSMU-0074
-//!@SYMFssID CR0205	
-//!@SYMTestPriority High
-//!@SYMTestCaseDesc Receive 8 bit multiple PDU message with SMSC status report scheme set in first and second PDU only and with values ESmsStatusReportForFutureUse2 and ESmsStatusReportCancelRestSRR respectively.
-//!@SYMTestActions
-//1. Mark the heap
-//2. Receive a message of PDU.
-//3. Test that the scheme is set to SMSC and the status report = 0x20 for the first PDU and 0x80 for the second PDU.
-//4. Delete the message
-//5. Unmark the heap
-//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value = 0x20 for the first PDU and 0x80 for the second PDU.
-RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCMultiplePDU z:\testdata\configs\te_statusReportScheme.ini Receive8BitSMSCSchemMultiplePDU
-END_TESTCASE SMS-GSMU-0074
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0123
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0123
-//!@SYMDEF INC091449
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive class0 and class2 messages when DiskSpace in mid range
-//!@SYMTestActions Set the disk space to below the high limit, receive class 0, attempt to receive class 2, raise disk space and receive class 2.
-//!@SYMTestExpectedResults Class0 message received, class2 rejected until disk space is increased.
-RUN_TEST_STEP 600 TE_smsprt TestDiskSpaceMidRangeClass0Class2 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber131
-END_TESTCASE SMS-SMSS-SMSPROT-0123
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0124
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0124
-//!@SYMDEF INC091449
-//!@SYMTestPriority Critical
-//!@SYMTestCaseDesc Receive class0 and class2 messages when DiskSpace below the mid range. 
-//!@SYMTestActions Set the disk space to below the low limit, attempt to receive class 0 and class 2, raise disk space and receive class 0 and class 2.
-//!@SYMTestExpectedResults Class0 and class2 messages rejected when disk space below the low limit, received when disk space increases.
-RUN_TEST_STEP 600 TE_smsprt TestDiskSpaceLowRangeClass0Class2 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber132
-END_TESTCASE SMS-SMSS-SMSPROT-0124
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0125
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0125
-//!@SYMDEF INC100061
-//!@SYMTestCaseDesc Tests receiving corrupt PDUs to ensure the stack does not crash.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Receives SMSs that are invalid and then 1 that is valid.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCorruptPDUs z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber133
-END_TESTCASE SMS-SMSS-SMSPROT-0125
-
-START_TESTCASE SMS-SMSS-SMSPROT-0126
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0126
-//!@SYMDEF INC103598
-//!@SYMTestCaseDesc Tests receiving a series of PDUs when the assembly store gets congested.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Ensures that the resume code can restart reception when the store has been full.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestCongestedReceive z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber141
-END_TESTCASE SMS-SMSS-SMSPROT-0126
-
-START_TESTCASE SMS-SMSS-SMSPROT-0127
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0127
-//!@SYMDEF INC117178
-//!@SYMTestCaseDesc Test Binary Tx And Rx
-//!@SYMTestPriority critical
-//!@SYMTestActions Test binary transmit and receive
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestBinaryTxAndRx z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber142
-END_TESTCASE SMS-SMSS-SMSPROT-0127
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0128
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0128
-//!@SYMDEF INC119830
-//!@SYMTestCaseDesc Test boundary condition, GSMU encoder completely fills a PDU, then attempts to add a format IE. 
-//!@SYMTestPriority critical
-//!@SYMTestActions GSMU encodes a PDU until it is full, then attempts to add an format IE, the format IE and its associated text should be encoded in a new PDU.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestEncodingPDUonBoundary z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber143
-END_TESTCASE SMS-SMSS-SMSPROT-0128
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0129
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0129
-//!@SYMDEF INC123727
-//!@SYMTestCaseDesc Tests that a PDU can be received if it has an invalid or reserved IE number.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Receives the PDU which has a reserved IE number.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestReceiveInvalidOrReservedIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber144
-END_TESTCASE SMS-SMSS-SMSPROT-0129
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0150
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0150
-//!@SYMREQ PREQ2265
-//!@SYMTestCaseDesc Tests that standard GSM characters can be sent and received using 7bit without loss of characters.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates various messages based on standard GSM characters, sends/receives them and compares the contents.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1200 TE_smsprt TestEncoding7bitStandardGSM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber150
-END_TESTCASE SMS-SMSS-SMSPROT-0150
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0151
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0151
-//!@SYMREQ PREQ2265
-//!@SYMTestCaseDesc Tests that standard 8bit characters can be sent and received without loss of characters.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates various messages based on Code Page 1252 characters, sends/receives them and compares the contents.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1200 TE_smsprt TestEncoding8bitCodePage1252 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber151
-END_TESTCASE SMS-SMSS-SMSPROT-0151
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0152
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0152
-//!@SYMREQ PREQ2265
-//!@SYMTestCaseDesc Tests that standard unicode characters can be sent and received without loss of characters.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates various messages based various characters, sends/receives them and compares the contents.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1800 TE_smsprt TestEncodingUnicode z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber152
-END_TESTCASE SMS-SMSS-SMSPROT-0152
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0153
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0153
-//!@SYMREQ PREQ2265
-//!@SYMTestCaseDesc Tests that unconvertible GSM characters can be sent using 7bit by being set to the replacement character.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates various messages based on unconvertible GSM characters, sends/receives them and compares the contents.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1200 TE_smsprt TestEncoding7bitUnconvertibleGSM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber153
-END_TESTCASE SMS-SMSS-SMSPROT-0153
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0154
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0154
-//!@SYMREQ PREQ2265
-//!@SYMTestCaseDesc Tests that non-standard GSM characters can be sent and received using 7bit with downgraded conversions.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates various messages based on standard GSM characters, sends/receives them and compares the contents.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 1200 TE_smsprt TestEncoding7bitNonStandardGSM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber154
-END_TESTCASE SMS-SMSS-SMSPROT-0154
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0155
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0155
-//!@SYMREQ PREQ2265
-//!@SYMTestCaseDesc Tests that Turkish characters can be sent and received using 7bit without loss of characters.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates various messages based on Turkish characters, sends/receives them and compares the contents.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 4500 TE_smsprt TestEncoding7bitTurkishNationalLanguage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber155
-END_TESTCASE SMS-SMSS-SMSPROT-0155
-
-START_TESTCASE SMS-SMSS-SMSPROT-0156
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0156
-//!@SYMDEF DEF129817
-//!@SYMTestCaseDesc Tests that unconverted characters are counted correctly when Turkish is enabled.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates various messages with some Turkish and unconvertible characters, sends/receives them and compares the contents.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 600 TE_smsprt TestEncoding7bitTurkishAndUnconvertible z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber156
-END_TESTCASE SMS-SMSS-SMSPROT-0156
-
-
-START_TESTCASE SMS-SMSS-SMSPROT-0157
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0157
-//!@SYMDEF DEF128736
-//!@SYMTestCaseDesc Tests that messages can be received if different DCS values are used.
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates 3 messages with each DCS and then receives 3 mixed DCS messages.
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 600 TE_smsprt TestReceivingMessageWithDifferentEncodings z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber157
-END_TESTCASE SMS-SMSS-SMSPROT-0157
-
-START_TESTCASE SMS-SMSS-SMSPROT-0159
-//!@SYMTestCaseID SMS-SMSS-SMSPROT-0159
-//!@SYMDEF DEF137787
-//!@SYMTestCaseDesc Tests that closing a socket before reading message does not orphan them in the SAR store
-//!@SYMTestPriority Critical
-//!@SYMTestActions Generates a message which is requested by client before and after closure of socket.
-//!@SYMTestExpectedResults The message should be able to be requested and read after closure of socket.
-//!@SYMTestType CT
-RUN_TEST_STEP 600 TE_smsprt TestReceivingMessageAfterSocketClosure z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber159
-END_TESTCASE SMS-SMSS-SMSPROT-0159
-
-START_TESTCASE SMS-SMSS-SMSPROT-0160
-//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0160
-//! @SYMTestType                CT
-//! @SYMTestPriority            Critical
-//! @SYMTestCaseDesc            Test to ensure that the Turkish, Spanish and Portuguese 7 bit character conversion libraries are being used with SMS send and receive
-//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
-//!                           Version tb92 and later
-//! @SYMTestExpectedResults     Pass
-//! @SYMTestDesignTechnique     Error Guessing
-//! @SYMCR                      CR2040
-RUN_TEST_STEP 100 TE_smsprt TestEncoding7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber160
-END_TESTCASE SMS-SMSS-SMSPROT-0160
-
-START_TESTCASE SMS-SMSS-SMSPROT-0161
-//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0161
-//! @SYMTestType                CT
-//! @SYMTestPriority            High
-//! @SYMTestCaseDesc            Multiple PDU SMS test - tests that when a shift character might spans two PDU's it is added to the next PDU rather than split the two bytes between PDUs - also tests that the cheapest coding is used when ESmsEncodingPortugueseLockingAndSingleShift is requested.
-//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
-//!                           Version tb92 and later
-//! @SYMTestExpectedResults     Pass
-//! @SYMTestDesignTechnique     Boundary Value Analysis
-//! @SYMCR                      CR2040
-RUN_TEST_STEP 100 TE_smsprt TestEncodingMultiPDUwith7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber161
-END_TESTCASE SMS-SMSS-SMSPROT-0161
-
-START_TESTCASE SMS-SMSS-SMSPROT-0162
-//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0162
-//! @SYMTestType                CT
-//! @SYMTestPriority            Critical
-//! @SYMTestCaseDesc            Test to ensure that Turkish, Spanish and Portuguese characters are downgraded when ESmsEncodingNone is used
-//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
-//!                           Version tb92 and later
-//! @SYMTestExpectedResults     Pass
-//! @SYMTestDesignTechnique     Error Guessing
-//! @SYMCR                      CR2040
-RUN_TEST_STEP 100 TE_smsprt TestEncodingDowngradedWith7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber162
-END_TESTCASE SMS-SMSS-SMSPROT-0162
-
-START_TESTCASE SMS-SMSS-SMSPROT-0163
-//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0163
-//! @SYMTestType                CT
-//! @SYMTestPriority            High
-//! @SYMTestCaseDesc            Test to ensure that the cheapest encoding is used when locking and shift characters are present in the message and ESmsEncodingPortugueseLockingAndSingleShift encoding is requested
-//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
-//!                           Version tb92 and later
-//! @SYMTestExpectedResults     Pass
-//! @SYMTestDesignTechnique     Error Guessing
-//! @SYMCR                      CR2040
-RUN_TEST_STEP 100 TE_smsprt TestOptimumEncodingWithLockingAndShift7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber163
-END_TESTCASE SMS-SMSS-SMSPROT-0163
-
-START_TESTCASE SMS-SMSS-SMSPROT-0164
-//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0164
-//! @SYMTestType                CT
-//! @SYMTestPriority            High
-//! @SYMTestCaseDesc            Test to ensure that the cheapest encoding is used when ESmsEncodingTurkishLockingAndSingleShift is requested but locking and shift characters are not present in the message.
-//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
-//!                           Version tb92 and later
-//! @SYMTestExpectedResults     Pass
-//! @SYMTestDesignTechnique     Error Guessing
-//! @SYMCR                      CR2040
-RUN_TEST_STEP 100 TE_smsprt TestOptimumEncodingWithLockingAndDowngrade7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber164
-END_TESTCASE SMS-SMSS-SMSPROT-0164
-
-START_TESTCASE SMS-SMSS-SMSPROT-0165
-//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0165
-//! @SYMTestType                CT
-//! @SYMTestPriority            High
-//! @SYMTestCaseDesc            Test to ensure that the cheapest encoding is used when ESmsEncodingTurkishLockingAndSingleShift is requested but non- Turkish characters that would be downgraded are present
-//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
-//!                           Version tb92 and later
-//! @SYMTestExpectedResults     Pass
-//! @SYMTestDesignTechnique     Error Guessing
-//! @SYMCR                      CR2040
-RUN_TEST_STEP 100 TE_smsprt TestOptimumEncodingWithLockingAndUnconvertible7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber165
-END_TESTCASE SMS-SMSS-SMSPROT-0165
-
-RUN_SCRIPT  z:\testdata\scripts\smsstackcleanprivatedata.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_gsmu.script	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,767 @@
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_smsprt_setup.script
+
+LOAD_SUITE TE_smsprt -SharedData
+
+//!@file
+
+START_TESTCASE SMS-GSMU-0046
+//!@SYMTestCaseID SMS-GSMU-0046	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Send single 7 bit PDU with TP-SRR status report scheme.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (2)
+//3. Set the scheme to TSmsStatusReportScheme::ETPSRRScheme
+//4. Set Default to zero and set the last segment
+//5. Send the message
+//6. Check request completes with KErrNone 
+//7. Delete the message.
+//8. Unmark the heap
+//!@SYMTestExpectedResults The message is sent successfully and SIMTSY has verified the format and correctness of the PDU - that it contains TP-SRR bit set, PDU = PDU (3).
+RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send7BitTPSRRSchemeSinglePDU
+
+END_TESTCASE SMS-GSMU-0046
+
+START_TESTCASE SMS-GSMU-0047
+//!@SYMTestCaseID SMS-GSMU-0047	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Send single 8 bit PDU with TP-SRR status report scheme.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (3)
+//3. Set the scheme to TSmsStatusReportScheme::ETPSRRScheme
+//4. Set Default to zero and set the last segment
+//5. Send the message
+//6. Check request completes with KErrNone 
+//7. Delete the message.
+//8. Unmark the heap
+//!@SYMTestExpectedResults The message is sent successfully and SIMTSY has verified the format and correctness of the PDU - that it contains TP-SRR bit set, PDU = PDU (803).
+RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send8BitTPSRRSchemeSinglePDU
+
+END_TESTCASE SMS-GSMU-0047
+
+START_TESTCASE SMS-GSMU-0059
+//!@SYMTestCaseID SMS-GSMU-0059	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Send 7 bit multiple PDU message with TP-SRR status report scheme set in all segments.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (4)
+//3. Set default to zero and set scheme TSmsStatusReportScheme::ETPSRRScheme in every segment
+//4. Send the message
+//5. Check request completes KErrNone 
+//6. Delete the message
+//7. Unmark the heap
+//!@SYMTestExpectedResults The message is verified by SimTSY that it contains TP-SRR bit set in every segment which = PDU (29-31).
+RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send7BitTPSRRSchemeMultiplePDU
+
+END_TESTCASE SMS-GSMU-0059
+
+START_TESTCASE SMS-GSMU-0060
+//!@SYMTestCaseID SMS-GSMU-0060	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Send 8 bit multiple PDU message with TP-SRR status report scheme set in all segments.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (4)
+//3. Set default to zero and set scheme TSmsStatusReportScheme::ETPSRRScheme in every segment
+//4. Send the message
+//5. Check request completes KErrNone 
+//6. Delete the message
+//7. Unmark the heap
+//!@SYMTestExpectedResults The message is verified by SimTSY that it contains TP-SRR bit set in every segment which = PDU (829-831).
+RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInAllPDUs z:\testdata\configs\te_statusReportScheme.ini Send8BitTPSRRSchemeMultiplePDU
+
+END_TESTCASE SMS-GSMU-0060
+
+START_TESTCASE SMS-GSMU-0067
+//!@SYMTestCaseID SMS-GSMU-0067
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Send 7 bit multiple PDU message with TP-SRR scheme set in only the last PDU.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (4)
+//3. Set scheme to TSmsStatusReportScheme::ETPSRRScheme and set default to zero.
+//4. Set TP-SRR for last segment only.
+//5. Send the message and check request completes KErrNone 
+//6. Delete the message
+//7. Unmark the heap
+//!@SYMTestExpectedResults The message sent is verified by SimTSY, PDUs = PDU(41-43) that it contains TP-SRR scheme set only in last segment.
+RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInLastPDU z:\testdata\configs\te_statusReportScheme.ini Send7BitTPSRRSchemeLastPDU
+END_TESTCASE SMS-GSMU-0067
+
+
+START_TESTCASE SMS-GSMU-0068
+//!@SYMTestCaseID SMS-GSMU-0068	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Send 8 bit multiple PDU message with TP-SRR scheme set in only the last PDU.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (4)
+//3. Set scheme to TSmsStatusReportScheme::ETPSRRScheme and set default to zero. 
+//4. Use function which sets the last segment.
+//5. Set TP-SRR for last segment only.
+//6. Send the message and check request completes KErrNone 
+//7. Delete the message
+//8. Unmark the heap
+//!@SYMTestExpectedResults The message sent is verified by SimTSY, PDUs = PDU(841-843) that it contains TP-SRR scheme set only in last segment.
+RUN_TEST_STEP  100 TE_smsprt TestSendingTPSRRSchemeInLastPDU z:\testdata\configs\te_statusReportScheme.ini Send8BitTPSRRSchemeLastPDU
+
+// -------------------------------------------------------------------------------------------------------
+END_TESTCASE SMS-GSMU-0068
+
+
+START_TESTCASE SMS-GSMU-0092
+//!@SYMTestCaseID SMS-GSMU-0092	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive a “completed” status report for a TP-SRR scheme in a single 8bit PDU message.    
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report - PDU(103)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending the message. The received status report generates a notification.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveStatusReportCompletedSinglePDU
+END_TESTCASE SMS-GSMU-0092
+
+
+START_TESTCASE SMS-GSMU-0093
+//!@SYMTestCaseID SMS-GSMU-0093	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “permanent failure” status report for a TP-SRR scheme in a single 8 bit PDU message.  
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive permanent failure status report - PDU(104)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending the message. The received status report generates a notification.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini ReceiveStatusReportPermanentFailureSinglePDU
+END_TESTCASE SMS-GSMU-0093
+
+
+START_TESTCASE SMS-GSMU-0094
+//!@SYMTestCaseID SMS-GSMU-0094	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “temporary failure” status report and then a “completed” for a TP-SRR scheme in a single 8 bit PDU message.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive temporary failure status report - PDU(105)
+//6. Receive completed status report - PDU(106)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending or after receiving the temporary failure.  However, a notification is generated after receiving the completed status report.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini TemporyFailureCompletedSinglePDU
+END_TESTCASE SMS-GSMU-0094
+
+
+START_TESTCASE SMS-GSMU-0095
+//!@SYMTestCaseID SMS-GSMU-0095	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “temporary failure” status report and then a “permanent failure” for a TP-SRR scheme in a single 8 bit PDU message.  
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with TP-SRR scheme set (1).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive temporary failure status report - PDU(107)
+//6. Receive completed status report - PDU(108)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending or after receiving the temporary failure.  However, a notification is generated after receiving the permanent failure status report.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini TemporyFailurePermanentFailureSinglePDU
+END_TESTCASE SMS-GSMU-0095
+
+
+START_TESTCASE SMS-GSMU-0097
+//!@SYMTestCaseID SMS-GSMU-0097	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “completed” status reports for a multiple 8 bit PDU message with TP-SRR set in every PDU in this order: third,second,first.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and with TP-SRR scheme set in every PDU.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report for third PDU - PDU(112)
+//6. Receive completed status report for second PDU - PDU(111)
+//7. Receive completed status report for first PDU - PDU(110)
+//8. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending. The status reports received are logged and a notification is generated on receiving PDU(110).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini MultipeStatusReportsCompletedOrderThirdSecondFirst
+END_TESTCASE SMS-GSMU-0097
+
+
+START_TESTCASE SMS-GSMU-0098
+//!@SYMTestCaseID SMS-GSMU-0098	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “completed” status reports for a multiple 8 bit PDU message with TP-SRR set in every PDU in this order: first, second, third.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and with TP-SRR scheme set in every PDU.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report for first PDU - PDU(113)
+//6. Receive completed status report for second PDU - PDU(114)
+//7. Receive completed status report for third PDU - PDU(115)
+//8. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending. The status reports received are logged and a notification is generated on receiving PDU(115).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini MultipeStatusReportsCompletedOrderFirstSecondThird
+END_TESTCASE SMS-GSMU-0098
+
+
+START_TESTCASE SMS-GSMU-0099
+//!@SYMTestCaseID SMS-GSMU-0099	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “completed” and “temporary failure” status reports for a multiple 8 bit PDU message with TP-SRR set in every PDU.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and with TP-SRR scheme set in every PDU.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report for first PDU - PDU(116)
+//6. Receive temporary status report for third PDU - PDU(117)
+//7. Receive completed status report for second PDU - PDU(118)
+//8. Receive completed status report for third PDU - PDU(119)
+//9. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending. The status reports received are logged and a notification is only generated on receiving PDU(119).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingTPSRRAllPDU z:\testdata\configs\te_statusReportScheme.ini MultipeStatusReportsTemporyFailureOnThird
+END_TESTCASE SMS-GSMU-0099
+
+
+START_TESTCASE SMS-GSMU-0100
+//!@SYMTestCaseID SMS-GSMU-0100	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “completed” status reports for a multiple 8 bit PDU message with TP-SRR set in last PDU only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and TP-SRR set in last segment.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report for last PDU - PDU(120)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending. The status report received is logged and a notification is generated on receiving it.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportCompletedLastOnly
+END_TESTCASE SMS-GSMU-0100
+
+
+START_TESTCASE SMS-GSMU-0101
+//!@SYMTestCaseID SMS-GSMU-0101	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “temporary failure” and “completed” status reports for the last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and TP-SRR set in last segment.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive temporary status report for last PDU - PDU(121)
+//6. Receive completed status report for last PDU - PDU(122)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification is only received on receiving PDU(122).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportTemporaryFailureThenCompletedLastOnly
+END_TESTCASE SMS-GSMU-0101
+
+
+START_TESTCASE SMS-GSMU-0102
+//!@SYMTestCaseID SMS-GSMU-0102	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “permanent failure” status report for the last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and TP-SRR set in last segment.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report for last PDU - PDU(123)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification isn’t received after sending. The status report received is logged and a notification is generated on receiving it.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportPermanentFailureLastPDUOnly
+END_TESTCASE SMS-GSMU-0102
+
+
+START_TESTCASE SMS-GSMU-0103
+//!@SYMTestCaseID SMS-GSMU-0103	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “temporary failure” and “permanent failure” status reports for the last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and TP-SRR set in last segment.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive temporary status report for last PDU - PDU(124)
+//6. Receive permanent failure status report for last PDU - PDU(125)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification is only received on receiving PDU(125).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini SingleStatusReportTemporaryFailureThenPermanentFailureLastOnly
+END_TESTCASE SMS-GSMU-0103
+
+
+START_TESTCASE SMS-GSMU-0104
+//!@SYMTestCaseID SMS-GSMU-0104	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive “completed” status reports for the first and last PDU of a multiple 8 bit PDU message with TP-SRR set in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and TP-SRR set in last segment.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report for first PDU - PDU(126)
+//6. Receive completed status report for last PDU - PDU(127)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification is only received on receiving PDU(127).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastTPSRR z:\testdata\configs\te_statusReportScheme.ini CompletedStatusReportForFirstAndThirdPDUSetForLastOnly
+END_TESTCASE SMS-GSMU-0104
+
+
+START_TESTCASE SMS-GSMU-0107
+//!@SYMTestCaseID SMS-GSMU-0107	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive a "completed" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "completed" status report - PDU(131)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification isn't received after sending the message. The received status report generates a notification.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceiveStatusReportForSinglePDUSMSCLastPDU
+END_TESTCASE SMS-GSMU-0107
+
+
+START_TESTCASE SMS-GSMU-0108
+//!@SYMTestCaseID SMS-GSMU-0108	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive a "permanent failure" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "permanent failure" status report - PDU(132)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification isn't received after sending the message. The received status report generates a notification.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceivePermanentFailureStatusReportSinglePDUSMSCLastPDU
+END_TESTCASE SMS-GSMU-0108
+
+
+START_TESTCASE SMS-GSMU-0109
+//!@SYMTestCaseID SMS-GSMU-0109	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive a "temporary failure" and a "permanent failure" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "temporary failure" status report - PDU(133)
+//6. Receive "permanent failure" status report - PDU(134)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification isn't received after sending or after receiving the status report PDU(133).  A notification is generated on receiving PDU(134)
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceiveTemporyFailurePermanentFailureStatusReportSinglePDUSMSCScheme
+END_TESTCASE SMS-GSMU-0109
+
+
+START_TESTCASE SMS-GSMU-0110
+//!@SYMTestCaseID SMS-GSMU-0110	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//1@SYMTestCaseDesc Receive a "temporary failure" and a "completed" status report for a SMSC scheme in a single 8bit PDU message set with value 0x01.    
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (3) and with SMSC scheme with value 0x01.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "temporary failure" status report - PDU(135)
+//6. Receive "completed" status report - PDU(136)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification is only generated on receiving PDU(136)
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini ReceiveTemporyFailureCompletedStatusReportSinglePDUSMSCScheme
+END_TESTCASE SMS-GSMU-0110
+
+
+START_TESTCASE SMS-GSMU-0112
+//!@SYMTestCaseID SMS-GSMU-0112	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive "completed" status reports for a multiple 8 bit PDU message with SMSC set in every PDU (0x01) in this order: third,second,first.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and with SMSC scheme set (0x01) and in every PDU.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive completed status report for third PDU - PDU(140)
+//6. Receive completed status report for second PDU - PDU(141)
+//7. Receive completed status report for first PDU - PDU(142)
+//8. Unmark the heap
+//!@SYMTestExpectedResults A notification isn't received after sending. The status reports received are logged and a notification is generated on receiving PDU(142).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCAllPDUs z:\testdata\configs\te_statusReportScheme.ini MultipeCompletedStatusReportsSMSCScheme
+END_TESTCASE SMS-GSMU-0112
+
+
+START_TESTCASE SMS-GSMU-0114
+//!@SYMTestCaseID SMS-GSMU-0114	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive "completed" and "temporary failure" status reports for a multiple 8 bit PDU message with SMSC set in every PDU (0x01) in this order: second, third, first.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and with SMSC scheme set (0x01) and in every PDU.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "completed" status report for second PDU - PDU(146)
+//6. Receive "temporary failure" status report for third PDU - PDU(147)
+//7. Receive "completed" status report for first PDU - PDU(148)
+//8. Receive "completed" status report for third PDU - PDU(149)
+//9. Unmark the heap
+//!@SYMTestExpectedResults A notification isn't received after sending. The status reports received are logged and a notification is generated on receiving PDU(149).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCAllPDUs z:\testdata\configs\te_statusReportScheme.ini MultipeCompletedTemporaryFailureStatusReportsSMSCScheme
+END_TESTCASE SMS-GSMU-0114
+
+
+START_TESTCASE SMS-GSMU-0115
+//!@SYMTestCaseID SMS-GSMU-0115	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive "completed" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "completed" status report for last PDU - PDU(150)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification isn't received after sending. The status report received is logged and a notification is generated on receiving it.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUSingleStatusReportLastPDUSMSCScheme
+END_TESTCASE SMS-GSMU-0115
+
+
+START_TESTCASE SMS-GSMU-0116
+//!@SYMTestCaseID SMS-GSMU-0116	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive "temporary failure" and "completed" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "temporary failure" status report for last PDU - PDU(151)
+//6. Receive "completed" status report for last PDU - PDU(152)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification only received after receiving status report PDU(152).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUTemporaryCompleteStatusReportLastPDUSMSCScheme
+END_TESTCASE SMS-GSMU-0116
+
+
+START_TESTCASE SMS-GSMU-0117
+//!@SYMTestCaseID SMS-GSMU-0117	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive "permanent failure" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "permanent failure" status report for last PDU - PDU(153)
+//6. Unmark the heap
+//!@SYMTestExpectedResults A notification is only received after receiving status report PDU(153).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUPermanentFailureStatusReportLastPDUSMSCScheme
+END_TESTCASE SMS-GSMU-0117
+
+
+START_TESTCASE SMS-GSMU-0118
+//!@SYMTestCaseID SMS-GSMU-0118	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive "temporary failure" and "permanent failure" status reports for a multiple 8 bit PDU message with SMSC scheme set (0x01) in last segment only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and SMSC scheme set in last segment (0x01).
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "temporary failure" status report for last PDU - PDU(154)
+//6. Receive "permanent failure" status report for last PDU - PDU(155)
+//7. Unmark the heap
+//!@SYMTestExpectedResults A notification only received after receiving status report PDU(155).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingLastSMSC z:\testdata\configs\te_statusReportScheme.ini MultipePDUTemporaryPermanentFailureStatusReportLastPDUSMSCScheme
+END_TESTCASE SMS-GSMU-0118
+
+
+START_TESTCASE SMS-GSMU-0119
+//!@SYMTestCaseID SMS-GSMU-0119	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive "completed" status reports for first and third PDU of a multiple 8 bit PDU message with SMSC set (0x01) in first and last only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and SMSC set in first and last segment.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "completed" status report for first PDU - PDU(156)
+//6. Receive "completed" status report for last PDU - PDU(157)
+//7. Receive "completed" status report for second PDU - PDU(158)
+//8. Unmark the heap
+//!@SYMTestExpectedResults A notification is generated on receiving PDU(157).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSomePDUs z:\testdata\configs\te_statusReportScheme.ini CompletedStatusReportForFirstAndThirdPDUSMSC
+END_TESTCASE SMS-GSMU-0119
+
+
+START_TESTCASE SMS-GSMU-0120
+//!@SYMTestCaseID SMS-GSMU-0120	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive "permanent failure" status reports for first and second PDU of a multiple 8 bit PDU message with SMSC set (0x01) in first and second only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create SMS message with test data (4) and SMSC set in first and last segment.
+//3. Send the message and check request completes KErrNone 
+//4. Delete the message
+//5. Receive "permanent failure" status report for first PDU - PDU(159)
+//6. Receive "permanent failure" status report for second PDU - PDU(160)
+//7. Receive "permanent failure" status report for last PDU - PDU(161)
+//8. Unmark the heap
+//!@SYMTestExpectedResults A notification is generated on receiving PDU(160).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSomePDUs z:\testdata\configs\te_statusReportScheme.ini PermanentFailureStatusReportForFirstAndSecondPDUSMSC
+END_TESTCASE SMS-GSMU-0120
+
+
+START_TESTCASE SMS-GSMU-0049
+//!@SYMTestCaseID SMS-GSMU-0049	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive single 8 bit PDU with TP-SRR status report scheme.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Trigger the sending of messages with sending message
+//3. Receive a message of PDU (804).
+//4. Delete the message
+//5. Unmark the heap
+//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EDefaultScheme scheme and has text of test data(2).
+RUN_TEST_STEP  100 TE_smsprt TestReceivingDeliversWithTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRSingle8Bit
+END_TESTCASE SMS-GSMU-0049
+
+
+START_TESTCASE SMS-GSMU-0058
+//!@SYMTestCaseID SMS-GSMU-0058	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive 8 bit multiple PDU message with no status report scheme.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Trigger receive by sending a message PDU(1)
+//3. Receive PDUs (826-828) the message and check request completes KErrNone
+//4. Check message contains text of test data (4) and has TSmsStatusReportScheme::EDefaultScheme scheme.
+//5. Delete the message
+//6. Unmark the heap
+//!@SYMTestExpectedResults The message is verified as containing test data (4) and is found to have TSmsStatusReportScheme::EDefaultScheme status report scheme set.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingDeliversWithTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRMultiple8Bit
+END_TESTCASE SMS-GSMU-0058
+
+
+START_TESTCASE SMS-GSMU-0061
+//!@SYMTestCaseID SMS-GSMU-0061	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive 7 bit multiple PDU message with TP-SRR status report scheme set in all segments.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Trigger receive by sending a message
+//3. Receive PDUs (32-34) and check request completes successfully
+//4. Check message it has text data = test data (4) and has TSmsStatusReportScheme::ETPSRRScheme scheme set for every PDU.
+//5. Delete the message
+//6. Unmark the heap
+//!@SYMTestExpectedResults The message received has text of test data (4) and has TSmsStatusReportScheme::ETPSRRScheme scheme set for every PDU.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingDeliversWithTPSRR z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRMultiple7Bit
+END_TESTCASE SMS-GSMU-0061
+
+
+START_TESTCASE SMS-GSMU-0070
+//!@SYMTestCaseID SMS-GSMU-0070	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive 8 bit multiple PDU message with TP-SRR scheme set in the third (last) PDU only.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Trigger receiving by sending a message
+//3. Receive a message PDUs(844-846) and check message is received ok.
+//4. Check message has TSmsStatusReportScheme::ETPSRRScheme scheme set only in last PDU.
+//5. Delete the message
+//6. Unmark the heap
+//!@SYMTestExpectedResults The message received has text of test data (4) and has TSmsStatusReportScheme::ETPSRRScheme scheme set in third segment only.
+RUN_TEST_STEP  100 TE_smsprt TestDeliversWithTPSRRScheme z:\testdata\configs\te_statusReportScheme.ini ReceiveDeliversWithTPSRRMultiple8BitLastPDU
+END_TESTCASE SMS-GSMU-0070
+
+
+START_TESTCASE SMS-GSMU-0051
+//!@SYMTestCaseID SMS-GSMU-0051	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Send single 8 bit PDU with SMSC status report scheme specifying no status report requested, i.e. 0x00.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (3)
+//3. Set the scheme to TSmsStatusReportScheme::EControlParametersScheme and value = 0x00
+//4. Send the message check request completes KErrNone 
+//5. Delete the message.
+//6. Unmark the heap
+//!@SYMTestExpectedResults The message is sent successfully - SIMTSY has verified the format and correctness of the PDU = PDU(805) - it contains an SMSC control element with a value of 0x00.
+RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeSinglePDUNoBitSet z:\testdata\configs\te_statusReportScheme.ini Send8BitSMSCSchemeSinglePDUNoBitSet
+END_TESTCASE SMS-GSMU-0051
+
+
+START_TESTCASE SMS-GSMU-0052
+//!@SYMTestCaseID SMS-GSMU-0052
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive single 7 bit PDU with SMSC status report scheme specifying no status report requested, i.e. 0x00.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Receive a message of PDU.
+//3. Test that the scheme is set to SMSC and the status report = 0x00.
+//4. Delete the message
+//5. Unmark the heap
+//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value=0x00.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSinglePDU z:\testdata\configs\te_statusReportScheme.ini Receive7BitSMSCSchemSinglePDU
+END_TESTCASE SMS-GSMU-0052
+
+
+START_TESTCASE SMS-GSMU-0055
+//!@SYMTestCaseID SMS-GSMU-0055	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Send single 8 bit PDU with SMSC status report scheme with status report requested for every possible combination, i.e. ESmsStatusReportTransactionCompleted=0x01,  ESmsStatusReportPermanentError, ESmsStatusReportTemporaryError, ESmsStatusReportTemporaryErrorSCTrying, ESmsStatusReportForFutureUse1, ESmsStatusReportForFutureUse2, ESmsStatusReportCancelRestSRR, ESmsStatusReportIncludeOriginalUDH, ESmsSelectiveStatusReportMask.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (2)
+//3. Set scheme to TSmsStatusReportScheme::EControlParametersScheme
+//3. For each configuration of TSmsSMSCControlParameters
+//  3.1 Set value
+//  3.2 Send the message
+//  3.3 Delete the message.
+//4. Unmark the heap
+//!@SYMTestExpectedResults The messages configuration is set for all values up to ESmsStatusReportTemporaryErrorSCTrying.  The messages are sent successfully and SIMTSY has verified the format and correctness of the PDU - PDU(806-813) that it contains an SMSC control element with the corresponding SMSC control parameter value.
+RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeSinglePDUSomeBitsSet z:\testdata\configs\te_statusReportScheme.ini Send8BitSMSCSchemeSinglePDUSomeBitsSet
+END_TESTCASE SMS-GSMU-0055
+
+
+START_TESTCASE SMS-GSMU-0056
+//!@SYMTestCaseID SMS-GSMU-0056
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive single 8 bit PDU messages with SMSC status report scheme set with status report requested for the lowest 4 bits that is 0x0F
+//!@SYMTestActions
+//1. Mark the heap
+//2. Receive a message of PDU.
+//3. Test that the scheme is set to SMSC and the status report = 0x0F.
+//4. Delete the message
+//5. Unmark the heap
+//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value=0x0F.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCSinglePDU z:\testdata\configs\te_statusReportScheme.ini Receive8BitSMSCSchemSinglePDU
+END_TESTCASE SMS-GSMU-0056
+
+
+START_TESTCASE SMS-GSMU-0064
+//!@SYMTestCaseID SMS-GSMU-0064	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Send 8 bit multiple PDU message with SMSC status report scheme and set to not requesting status reports, i.e. 0x00.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (4)
+//3. Set scheme to TSmsStatusReportScheme::EControlParametersScheme scheme and with value 0x00
+//4. Send the message and check request completes KErrNone 
+//5. Delete the message
+//6. Unmark the heap
+//!@SYMTestExpectedResults The message sent is verified by SimTSY, PDUs (835-837) that it contains SMSC IE in every PDU and with value of 0x00.
+RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeMultiplePDUsSomeBitsSet z:\testdata\configs\te_statusReportScheme.ini Send8BitSMSCSchemeMultiplePDU
+END_TESTCASE SMS-GSMU-0064
+
+
+START_TESTCASE SMS-GSMU-0065
+//!@SYMTestCaseID SMS-GSMU-0065
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive 7 bit multiple PDU message with SMSC status report scheme and all PDUs set to not requesting status reports, i.e. 0x00.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Receive a message of PDU.
+//3. Test that the scheme is set to SMSC and the status report = 0x00 for all the PDUs.
+//4. Delete the message
+//5. Unmark the heap
+//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value=0x00.
+RUN_TEST_STEP 100 TE_smsprt TestReceivingSMSCMultiplePDU z:\testdata\configs\te_statusReportScheme.ini Receive7BitSMSCSchemeMultiplePDU
+END_TESTCASE SMS-GSMU-0065
+
+
+START_TESTCASE SMS-GSMU-0071
+//!@SYMTestCaseID SMS-GSMU-0071	
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Send 7 bit multiple PDU message with TSmsStatusReportScheme::EControlParametersScheme status report scheme for first and last PDU and set to ESmsStatusReportPermanentError and ESmsStatusReportTemporaryError respectively.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Create the message with test data (4)
+//3. Set SMSC scheme for first and last PDU or segment and set values to ESmsStatusReportPermanentError and ESmsStatusReportTemporaryError respectively.
+//4. Send the message and check request completes KErrNone 
+//5. Delete the message
+//6. Unmark the heap
+//!@SYMTestExpectedResults The message sent is verified by SimTSY by receving PDUs (47-49) which contain SMSC scheme for first and last PDU with values ESmsStatusReportPermanentError and ESmsStatusReportTemporaryError respectively.
+RUN_TEST_STEP  100 TE_smsprt TestSendingSMSCSchemeMultiplePDUsSomeBitsSet z:\testdata\configs\te_statusReportScheme.ini Send7BitSMSCSchemeMultiplePDU
+END_TESTCASE SMS-GSMU-0071
+
+
+START_TESTCASE SMS-GSMU-0074
+//!@SYMTestCaseID SMS-GSMU-0074
+//!@SYMFssID CR0205	
+//!@SYMTestPriority High
+//!@SYMTestCaseDesc Receive 8 bit multiple PDU message with SMSC status report scheme set in first and second PDU only and with values ESmsStatusReportForFutureUse2 and ESmsStatusReportCancelRestSRR respectively.
+//!@SYMTestActions
+//1. Mark the heap
+//2. Receive a message of PDU.
+//3. Test that the scheme is set to SMSC and the status report = 0x20 for the first PDU and 0x80 for the second PDU.
+//4. Delete the message
+//5. Unmark the heap
+//!@SYMTestExpectedResults Message received has TSmsStatusReportScheme::EControlParametersScheme scheme set with value = 0x20 for the first PDU and 0x80 for the second PDU.
+RUN_TEST_STEP  100 TE_smsprt TestReceivingSMSCMultiplePDU z:\testdata\configs\te_statusReportScheme.ini Receive8BitSMSCSchemMultiplePDU
+END_TESTCASE SMS-GSMU-0074
+RUN_SCRIPT  z:\testdata\scripts\smsstackcleanprivatedata.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_prot.script	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,611 @@
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_smsprt_setup.script
+
+LOAD_SUITE TE_smsprt -SharedData
+
+//!@file
+
+START_TESTCASE SMS-SMSS-SMSPROT-0158
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0158
+//!@SYMDEF INC138096
+//!@SYMTestCaseDesc Tests that a SMS can be received when the "LogDuration" is set to "No Log"
+//!@SYMTestPriority Critical
+//!@SYMTestActions Sets the Log Server to "No Log", then sends and receives a SMS, both operations should be completed successfully.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_smsprt TestSimpleTxAndRxWithLoggingDisabled z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber158
+END_TESTCASE SMS-SMSS-SMSPROT-0158
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3072
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3072
+//!@SYMREQ REQ4917.1
+//!@SYMTestCaseDesc Test hyperlink operations interface, and SMS stack ability to handle single PDU messages with hyperlinks
+//!@SYMTestPriority high
+//!@SYMTestActions Test hyperlink API's.  Transmit and receive of single PDU message with and without hyperlinks
+//!@SYMTestExpectedResults
+//!@SYMTestCaseDependencies Sim.tsy, smsstacktestutilities.dll
+//!@SYMTestType IT
+RUN_TEST_STEP 180 TE_smsprt TestSinglePDUHyperLinks z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber70
+END_TESTCASE SMS-SMSS-SMSPROT-I-3072
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3073
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3073
+//!@SYMREQ REQ4917.2
+//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without hyperlinks
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive of multiple PDU message with and without hyperlinks
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 60 TE_smsprt TestMultiplePDUHyperLinks z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber71
+END_TESTCASE SMS-SMSS-SMSPROT-I-3073
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3074
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3074
+//!@SYMREQ REQ4919.1
+//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without reply address
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive of single PDU message with and without reply address
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 180 TE_smsprt TestSinglePDUReplyAddress z:\testdata\configs\te_smsprt_data.ini ReplyAddress
+END_TESTCASE SMS-SMSS-SMSPROT-I-3074
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3075
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3075
+//!@SYMREQ REQ4919.2
+//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without reply address
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive of single PDU message with and without reply address
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 500 TE_smsprt TestMultiplePDUReplyAddress
+END_TESTCASE SMS-SMSS-SMSPROT-I-3075
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3076
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3076
+//!@SYMREQ REQ4922.1
+//!@SYMTestCaseDesc Test operations on SMS message for special messages
+//!@SYMTestPriority high
+//!@SYMTestActions Call API's for adding, removing, counting, and copying special messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 30 TE_smsprt TestSpecialMessageWaitingOperations
+END_TESTCASE SMS-SMSS-SMSPROT-I-3076
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3077
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3077
+//!@SYMREQ REQ4922.2
+//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without special messages
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive single PDU message with and without special messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 120 TE_smsprt TestSinglePDUSpecialMessageWaiting z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber73
+END_TESTCASE SMS-SMSS-SMSPROT-I-3077
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3078
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3078
+//!@SYMREQ REQ4922.3
+//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without special messages
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive multiple PDU message with and without special messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 500 TE_smsprt TestMultiplePDUSpecialMessageWaiting
+END_TESTCASE SMS-SMSS-SMSPROT-I-3078
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3079
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3079
+//!@SYMREQ REQ4923.1
+//!@SYMTestCaseDesc Test operations on SMS message for enhanced voice mail information
+//!@SYMTestPriority high
+//!@SYMTestActions Call API's for adding, removing, counting, and copying enhanced voice mail information
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 30 TE_smsprt TestEnhancedVoiceMailOperations z:\testdata\configs\te_smsprt_data.ini EnhancedVoiceMail
+END_TESTCASE SMS-SMSS-SMSPROT-I-3079
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3080
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3080
+//!@SYMREQ REQ4923.2
+//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without enhanced voice mail information
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive single PDU message with and without enhanced voice mail information
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 180 TE_smsprt TestSinglePDUEnhancedVoiceMailInformation z:\testdata\configs\te_smsprt_data.ini EnhancedVoiceMail
+END_TESTCASE SMS-SMSS-SMSPROT-I-3080
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3081
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3081
+//!@SYMREQ REQ4923.3
+//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without enhanced voice mail information
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive multiple PDU message with and without enhanced voice mail information
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 500 TE_smsprt TestMultiplePDUEnhancedVoiceMailInformation
+END_TESTCASE SMS-SMSS-SMSPROT-I-3081
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3082
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3082
+//!@SYMREQ REQ4923.4
+//!@SYMTestCaseDesc Test operations on SMS message for enhanced voice mail delete confirmations
+//!@SYMTestPriority high
+//!@SYMTestActions Call API's for adding, removing, counting, and copying enhanced voice mail delete confirmations
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 30 TE_smsprt TestEnhancedVoiceMailDeleteOperations
+END_TESTCASE SMS-SMSS-SMSPROT-I-3082
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3083
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3083
+//!@SYMREQ REQ4923.5
+//!@SYMTestCaseDesc Test SMS stack ability to handle single PDU SMS messages with and without enhanced voice mail delete confirmations
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive single PDU message with and without enhanced voice mail delete confirmations
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 120 TE_smsprt TestSinglePDUEnhancedVoiceMailDeleteConfirmation z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber75
+END_TESTCASE SMS-SMSS-SMSPROT-I-3083
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3084
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3084
+//!@SYMREQ REQ4923.6
+//!@SYMTestCaseDesc Test SMS stack ability to handle multiple PDU SMS messages with and without enhanced voice mail delete confirmations
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive multiple PDU message with and without enhanced voice mail delete confirmations
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType IT
+RUN_TEST_STEP 180 TE_smsprt TestMultiplePDUEnhancedVoiceMailDeleteConfirmation
+END_TESTCASE SMS-SMSS-SMSPROT-I-3084
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3085
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3085
+//!@SYMREQ REQ4920.1
+//!@SYMTestCaseDesc SMS stack will handle a SMS as 7 bit if no coding scheme has been specified.
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive multiple PDU message with and without enhanced voice mail delete confirmations
+//!@SYMTestExpectedResults SMS stack will handle received SMS as a 7 Bit coded message, KErrNone
+//!@SYMTestType IT
+RUN_TEST_STEP 180 TE_smsprt Test7BitDefaultAlphabet z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber76
+END_TESTCASE SMS-SMSS-SMSPROT-I-3085
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3086
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3086
+//!@SYMREQ REQ4918
+//!@SYMTestCaseDesc SMS stack will allow zero length information elements.
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive single and multiple PDU message with and zero length IE.  IE is USIM toolkit IE.
+//!@SYMTestExpectedResults Stack will accept zero length IE, add it to the list.  KErrNone
+//!@SYMTestType IT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 180 TE_smsprt TestZeroLengthIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber77
+END_TESTCASE SMS-SMSS-SMSPROT-I-3086
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3087
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3087
+//!@SYMREQ REQ4924
+//!@SYMTestCaseDesc SMS stack will process SMS messages that indicate automatic deletion
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive single PDU message with automatic deletion. Stack allow sending these messages.  Messages received are automatically deleted, and given to the client. Class 2 messages are not deleted from the SIM - default behaviour in ESK file.
+//!@SYMTestExpectedResults Messages are deleted from the phone store and SIM store.  Exception for class 2 messages, messages remains in the SIM store.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 180 TE_smsprt TestAutomaticDeletionInDCS z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber78
+END_TESTCASE SMS-SMSS-SMSPROT-I-3087
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3088
+// -----------------------------------------------------------------------------------------------------------
+//Test the configurability for automatic deletion with use of esk file
+//Copy required ESK file for testing configuration for deleting class 2 messages for automatic deletion
+// -----------------------------------------------------------------------------------------------------------
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3088
+//!@SYMREQ REQ4924
+//!@SYMTestCaseDesc SMS stack will process SMS messages that indicate automatic deletion, and set for deletion in ESK file
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive message with automatic deletion and set as so in the ESK file.
+//!@SYMTestExpectedResults Stack will delete all messages, including Class 2 messages.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+//Make a backup, copy over test ESK
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile z:\sms\smswap.sms-AutoDeletionClass2.esk c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_TEST_STEP 500 TE_smsprt TestAutomaticDeletionInDCSAndInEsk z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber79
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
+END_TESTCASE SMS-SMSS-SMSPROT-I-3088
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3089
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3089
+//!@SYMREQ REQ4921
+//!@SYMTestCaseDesc SMS stack will automatically delete type 0 SMS messages.
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive single PDU type 0 message. Repeat this twice, once for each setting in the ESK file.
+//!@SYMTestExpectedResults Stack will send messages marked as type 0.  Messages are deleted from the phone store and SIM store.  Exception for class 2 messages, messages remains in the SIM store.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 300 TE_smsprt TestAutomaticDeletionTypeZeroSMS z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber80
+
+END_TESTCASE SMS-SMSS-SMSPROT-I-3089
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3090
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3090
+//!@SYMREQ REQ4921
+//!@SYMTestCaseDesc SMS stack will automatically delete type 0 SMS messages.
+//!@SYMTestPriority high
+//!@SYMTestActions Transmit and receive single PDU type 0 message. Repeat this twice, once for each setting in the ESK file.
+//!@SYMTestExpectedResults Stack will send messages marked as type 0.  Messages are deleted from the phone store and SIM store.  Exception for class 2 messages, messages remains in the SIM store.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+//Copy required ESK file for testing configuration for deleting class 2 messages for automatic deletion
+//Make a backup, copy over test ESK
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile z:\sms\smswap.sms-AutomaticDeletionOfType0.esk c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+//Run the test step
+RUN_TEST_STEP 180 TE_smsprt TestAutomaticDeletionTypeZeroAndSetInESK z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber81
+//restore orig esk file
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
+END_TESTCASE SMS-SMSS-SMSPROT-I-3090
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3091
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3091
+//!@SYMREQ REQ4923.7
+//!@SYMTestCaseDesc The SMS Stack can send the maximum size enhanced voice mail message that will fit in a PDU (139 bytes).
+//!@SYMTestPriority high
+//!@SYMTestActions Create a 139 byte enhanced voice mail message, add it to an empty SMS message and send it.
+//!@SYMTestExpectedResults The message is sent successfully.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 120 TE_smsprt EnhancedVoiceMessageBoundaryTest z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber83
+END_TESTCASE SMS-SMSS-SMSPROT-I-3091
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3092
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3092
+//!@SYMREQ REQ4923.8
+//!@SYMTestCaseDesc The SMS Stack can send the maximum size enhanced voice mail message that will fit in a segmented message (134 bytes).
+//!@SYMTestPriority high
+//!@SYMTestActions Send the maximum size enhanced voice mail message that will fit in a segmented message (134 bytes).
+//!@SYMTestExpectedResults The message is sent successfully.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 120 TE_smsprt EnhancedVoiceMessageBoundaryTest1 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber84
+END_TESTCASE SMS-SMSS-SMSPROT-I-3092
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3093
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3093
+//!@SYMREQ REQ4924.9
+//!@SYMTestCaseDesc The SMS stack can recover from heap exhaustion when sending a SMS Messages containing R6 Information Elements.
+//!@SYMTestPriority high
+//!@SYMTestActions A message containing R6 SMS IEs is sent repeatedly. The ESOCK server is configured to fail the n th request for heap memory, (n incrementing each time the message is sent). The test therefore checks that the stack can recover gracefully from heap exhaustion at every location that memory can be allocated.
+//!@SYMTestExpectedResults Assume that sending a R6 SMS requires 'M' heap allocations. The stack should return an Out of Memory error when heap allocation request fails because 'n' has a value in the range 1..m. When 'n' has value m+1, the message should be sent successfully and the test should exit.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 500 TE_smsprt TestOOMSendR6Sms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber82
+END_TESTCASE SMS-SMSS-SMSPROT-I-3093
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3094
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3094
+//!@SYMREQ REQ4920.1
+//!@SYMTestCaseDesc Submit reports default to 7 bit decoding if no DCS value is specified.
+//!@SYMTestPriority high
+//!@SYMTestActions Decode a submit report that contains text, but whose DCS byte is unspecified.
+//!@SYMTestExpectedResults The text is successfully decoded using 7 bit decoding.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 120 TE_smsprt CSubmitReportDefaultsTo7BitDecoding
+END_TESTCASE SMS-SMSS-SMSPROT-I-3094
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3095
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3095
+//!@SYMREQ REQ4920.2
+//!@SYMTestCaseDesc Deliver reports default to 7 bit decoding if no DCS value is specified.
+//!@SYMTestPriority high
+//!@SYMTestActions Decode a deliver report that contains text, but whose DCS byte is unspecified.
+//!@SYMTestExpectedResults The text is successfully decoded using 7 bit decoding.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 120 TE_smsprt CDeliverReportDefaultsTo7BitDecoding
+END_TESTCASE SMS-SMSS-SMSPROT-I-3095
+
+START_TESTCASE SMS-SMSS-SMSPROT-I-3096
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-I-3096
+//!@SYMREQ REQ4920.3
+//!@SYMTestCaseDesc Status reports default to 7 bit decoding if no DCS value is specified.
+//!@SYMTestPriority high
+//!@SYMTestActions Decode a Status report that contains text, but whose DCS byte is unspecified.
+//!@SYMTestExpectedResults The text is successfully decoded using 7 bit decoding.
+//!@SYMTestType CIT
+//!@SYMTestCaseDependencies SIM.TSY
+RUN_TEST_STEP 120 TE_smsprt CStatusReportDefaultsTo7BitDecoding
+END_TESTCASE SMS-SMSS-SMSPROT-I-3096
+
+START_TESTCASE SMS-SMSS-SMSPROT-0123
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0123
+//!@SYMDEF INC091449
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive class0 and class2 messages when DiskSpace in mid range
+//!@SYMTestActions Set the disk space to below the high limit, receive class 0, attempt to receive class 2, raise disk space and receive class 2.
+//!@SYMTestExpectedResults Class0 message received, class2 rejected until disk space is increased.
+RUN_TEST_STEP 600 TE_smsprt TestDiskSpaceMidRangeClass0Class2 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber131
+END_TESTCASE SMS-SMSS-SMSPROT-0123
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0124
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0124
+//!@SYMDEF INC091449
+//!@SYMTestPriority Critical
+//!@SYMTestCaseDesc Receive class0 and class2 messages when DiskSpace below the mid range. 
+//!@SYMTestActions Set the disk space to below the low limit, attempt to receive class 0 and class 2, raise disk space and receive class 0 and class 2.
+//!@SYMTestExpectedResults Class0 and class2 messages rejected when disk space below the low limit, received when disk space increases.
+RUN_TEST_STEP 600 TE_smsprt TestDiskSpaceLowRangeClass0Class2 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber132
+END_TESTCASE SMS-SMSS-SMSPROT-0124
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0125
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0125
+//!@SYMDEF INC100061
+//!@SYMTestCaseDesc Tests receiving corrupt PDUs to ensure the stack does not crash.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Receives SMSs that are invalid and then 1 that is valid.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCorruptPDUs z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber133
+END_TESTCASE SMS-SMSS-SMSPROT-0125
+
+START_TESTCASE SMS-SMSS-SMSPROT-0126
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0126
+//!@SYMDEF INC103598
+//!@SYMTestCaseDesc Tests receiving a series of PDUs when the assembly store gets congested.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Ensures that the resume code can restart reception when the store has been full.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCongestedReceive z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber141
+END_TESTCASE SMS-SMSS-SMSPROT-0126
+
+START_TESTCASE SMS-SMSS-SMSPROT-0127
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0127
+//!@SYMDEF INC117178
+//!@SYMTestCaseDesc Test Binary Tx And Rx
+//!@SYMTestPriority critical
+//!@SYMTestActions Test binary transmit and receive
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestBinaryTxAndRx z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber142
+END_TESTCASE SMS-SMSS-SMSPROT-0127
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0128
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0128
+//!@SYMDEF INC119830
+//!@SYMTestCaseDesc Test boundary condition, GSMU encoder completely fills a PDU, then attempts to add a format IE. 
+//!@SYMTestPriority critical
+//!@SYMTestActions GSMU encodes a PDU until it is full, then attempts to add an format IE, the format IE and its associated text should be encoded in a new PDU.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestEncodingPDUonBoundary z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber143
+END_TESTCASE SMS-SMSS-SMSPROT-0128
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0129
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0129
+//!@SYMDEF INC123727
+//!@SYMTestCaseDesc Tests that a PDU can be received if it has an invalid or reserved IE number.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Receives the PDU which has a reserved IE number.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestReceiveInvalidOrReservedIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber144
+END_TESTCASE SMS-SMSS-SMSPROT-0129
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0150
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0150
+//!@SYMREQ PREQ2265
+//!@SYMTestCaseDesc Tests that standard GSM characters can be sent and received using 7bit without loss of characters.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates various messages based on standard GSM characters, sends/receives them and compares the contents.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1200 TE_smsprt TestEncoding7bitStandardGSM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber150
+END_TESTCASE SMS-SMSS-SMSPROT-0150
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0151
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0151
+//!@SYMREQ PREQ2265
+//!@SYMTestCaseDesc Tests that standard 8bit characters can be sent and received without loss of characters.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates various messages based on Code Page 1252 characters, sends/receives them and compares the contents.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1200 TE_smsprt TestEncoding8bitCodePage1252 z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber151
+END_TESTCASE SMS-SMSS-SMSPROT-0151
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0152
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0152
+//!@SYMREQ PREQ2265
+//!@SYMTestCaseDesc Tests that standard unicode characters can be sent and received without loss of characters.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates various messages based various characters, sends/receives them and compares the contents.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1800 TE_smsprt TestEncodingUnicode z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber152
+END_TESTCASE SMS-SMSS-SMSPROT-0152
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0153
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0153
+//!@SYMREQ PREQ2265
+//!@SYMTestCaseDesc Tests that unconvertible GSM characters can be sent using 7bit by being set to the replacement character.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates various messages based on unconvertible GSM characters, sends/receives them and compares the contents.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1200 TE_smsprt TestEncoding7bitUnconvertibleGSM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber153
+END_TESTCASE SMS-SMSS-SMSPROT-0153
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0154
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0154
+//!@SYMREQ PREQ2265
+//!@SYMTestCaseDesc Tests that non-standard GSM characters can be sent and received using 7bit with downgraded conversions.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates various messages based on standard GSM characters, sends/receives them and compares the contents.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1200 TE_smsprt TestEncoding7bitNonStandardGSM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber154
+END_TESTCASE SMS-SMSS-SMSPROT-0154
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0155
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0155
+//!@SYMREQ PREQ2265
+//!@SYMTestCaseDesc Tests that Turkish characters can be sent and received using 7bit without loss of characters.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates various messages based on Turkish characters, sends/receives them and compares the contents.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 4500 TE_smsprt TestEncoding7bitTurkishNationalLanguage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber155
+END_TESTCASE SMS-SMSS-SMSPROT-0155
+
+START_TESTCASE SMS-SMSS-SMSPROT-0156
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0156
+//!@SYMDEF DEF129817
+//!@SYMTestCaseDesc Tests that unconverted characters are counted correctly when Turkish is enabled.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates various messages with some Turkish and unconvertible characters, sends/receives them and compares the contents.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_smsprt TestEncoding7bitTurkishAndUnconvertible z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber156
+END_TESTCASE SMS-SMSS-SMSPROT-0156
+
+
+START_TESTCASE SMS-SMSS-SMSPROT-0157
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0157
+//!@SYMDEF DEF128736
+//!@SYMTestCaseDesc Tests that messages can be received if different DCS values are used.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates 3 messages with each DCS and then receives 3 mixed DCS messages.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_smsprt TestReceivingMessageWithDifferentEncodings z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber157
+END_TESTCASE SMS-SMSS-SMSPROT-0157
+
+START_TESTCASE SMS-SMSS-SMSPROT-0159
+//!@SYMTestCaseID SMS-SMSS-SMSPROT-0159
+//!@SYMDEF DEF137787
+//!@SYMTestCaseDesc Tests that closing a socket before reading message does not orphan them in the SAR store
+//!@SYMTestPriority Critical
+//!@SYMTestActions Generates a message which is requested by client before and after closure of socket.
+//!@SYMTestExpectedResults The message should be able to be requested and read after closure of socket.
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_smsprt TestReceivingMessageAfterSocketClosure z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber159
+END_TESTCASE SMS-SMSS-SMSPROT-0159
+
+START_TESTCASE SMS-SMSS-SMSPROT-0160
+//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0160
+//! @SYMTestType                CT
+//! @SYMTestPriority            Critical
+//! @SYMTestCaseDesc            Test to ensure that the Turkish, Spanish and Portuguese 7 bit character conversion libraries are being used with SMS send and receive
+//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
+//!                           Version tb92 and later
+//! @SYMTestExpectedResults     Pass
+//! @SYMTestDesignTechnique     Error Guessing
+//! @SYMCR                      CR2040
+RUN_TEST_STEP 100 TE_smsprt TestEncoding7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber160
+END_TESTCASE SMS-SMSS-SMSPROT-0160
+
+START_TESTCASE SMS-SMSS-SMSPROT-0161
+//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0161
+//! @SYMTestType                CT
+//! @SYMTestPriority            High
+//! @SYMTestCaseDesc            Multiple PDU SMS test - tests that when a shift character might spans two PDU's it is added to the next PDU rather than split the two bytes between PDUs - also tests that the cheapest coding is used when ESmsEncodingPortugueseLockingAndSingleShift is requested.
+//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
+//!                           Version tb92 and later
+//! @SYMTestExpectedResults     Pass
+//! @SYMTestDesignTechnique     Boundary Value Analysis
+//! @SYMCR                      CR2040
+RUN_TEST_STEP 100 TE_smsprt TestEncodingMultiPDUwith7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber161
+END_TESTCASE SMS-SMSS-SMSPROT-0161
+
+START_TESTCASE SMS-SMSS-SMSPROT-0162
+//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0162
+//! @SYMTestType                CT
+//! @SYMTestPriority            Critical
+//! @SYMTestCaseDesc            Test to ensure that Turkish, Spanish and Portuguese characters are downgraded when ESmsEncodingNone is used
+//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
+//!                           Version tb92 and later
+//! @SYMTestExpectedResults     Pass
+//! @SYMTestDesignTechnique     Error Guessing
+//! @SYMCR                      CR2040
+RUN_TEST_STEP 100 TE_smsprt TestEncodingDowngradedWith7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber162
+END_TESTCASE SMS-SMSS-SMSPROT-0162
+
+START_TESTCASE SMS-SMSS-SMSPROT-0163
+//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0163
+//! @SYMTestType                CT
+//! @SYMTestPriority            High
+//! @SYMTestCaseDesc            Test to ensure that the cheapest encoding is used when locking and shift characters are present in the message and ESmsEncodingPortugueseLockingAndSingleShift encoding is requested
+//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
+//!                           Version tb92 and later
+//! @SYMTestExpectedResults     Pass
+//! @SYMTestDesignTechnique     Error Guessing
+//! @SYMCR                      CR2040
+RUN_TEST_STEP 100 TE_smsprt TestOptimumEncodingWithLockingAndShift7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber163
+END_TESTCASE SMS-SMSS-SMSPROT-0163
+
+START_TESTCASE SMS-SMSS-SMSPROT-0164
+//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0164
+//! @SYMTestType                CT
+//! @SYMTestPriority            High
+//! @SYMTestCaseDesc            Test to ensure that the cheapest encoding is used when ESmsEncodingTurkishLockingAndSingleShift is requested but locking and shift characters are not present in the message.
+//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
+//!                           Version tb92 and later
+//! @SYMTestExpectedResults     Pass
+//! @SYMTestDesignTechnique     Error Guessing
+//! @SYMCR                      CR2040
+RUN_TEST_STEP 100 TE_smsprt TestOptimumEncodingWithLockingAndDowngrade7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber164
+END_TESTCASE SMS-SMSS-SMSPROT-0164
+
+START_TESTCASE SMS-SMSS-SMSPROT-0165
+//! @SYMTestCaseID              SMS-SMSS-SMSPROT-0165
+//! @SYMTestType                CT
+//! @SYMTestPriority            High
+//! @SYMTestCaseDesc            Test to ensure that the cheapest encoding is used when ESmsEncodingTurkishLockingAndSingleShift is requested but non- Turkish characters that would be downgraded are present
+//!                           Only perform comprehensive tests on first 10 bytes, the last character and at least one character per PDU.
+//!                           Version tb92 and later
+//! @SYMTestExpectedResults     Pass
+//! @SYMTestDesignTechnique     Error Guessing
+//! @SYMCR                      CR2040
+RUN_TEST_STEP 100 TE_smsprt TestOptimumEncodingWithLockingAndUnconvertible7bitNationalLanguages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber165
+END_TESTCASE SMS-SMSS-SMSPROT-0165
+
+RUN_SCRIPT  z:\testdata\scripts\smsstackcleanprivatedata.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_smsstack.script	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,929 @@
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_smsprt_setup.script
+
+LOAD_SUITE TE_smsprt -SharedData
+
+//!@file
+
+START_TESTCASE SMS-SMSStack-NA-3001
+//!@SYMTestCaseID SMS-SMSStack-NA-3001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Simple Tx And Rx
+//!@SYMTestPriority critical
+//!@SYMTestActions Test simple transmit and receive
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSimpleTxAndRx z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber0
+END_TESTCASE SMS-SMSStack-NA-3001
+
+START_TESTCASE SMS-SMSStack-NA-3002
+//!@SYMTestCaseID SMS-SMSStack-NA-3002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Status Report
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test status report
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestStatusReport z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber1
+END_TESTCASE SMS-SMSStack-NA-3002
+
+
+START_TESTCASE SMS-SMSStack-NA-3003
+//!@SYMTestCaseID SMS-SMSStack-NA-3003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Tx With Error
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Transmit with Error
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestTxWithError z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber2
+END_TESTCASE SMS-SMSStack-NA-3003
+
+
+START_TESTCASE SMS-SMSStack-NA-3004
+//!@SYMTestCaseID SMS-SMSStack-NA-3004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Tx Failed
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Transmit with failure
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestTxFailed z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber3
+END_TESTCASE SMS-SMSStack-NA-3004
+
+
+START_TESTCASE SMS-SMSStack-NA-3005
+//!@SYMTestCaseID SMS-SMSStack-NA-3005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Matching To Observer
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Matching To Observer
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestMatchingToObserver z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber4
+END_TESTCASE SMS-SMSStack-NA-3005
+
+
+START_TESTCASE SMS-SMSStack-NA-3006
+//!@SYMTestCaseID SMS-SMSStack-NA-3006
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Command Messages
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Command Messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCommandMessages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber5
+END_TESTCASE SMS-SMSStack-NA-3006
+
+
+START_TESTCASE SMS-SMSStack-NA-3007
+//!@SYMTestCaseID SMS-SMSStack-NA-3007
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Simple Rx
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Simple Receive
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSimpleRx z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber6
+END_TESTCASE SMS-SMSStack-NA-3007
+
+
+START_TESTCASE SMS-SMSStack-NA-3008
+//!@SYMTestCaseID SMS-SMSStack-NA-3008
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test 7bit Mess Test
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test 7bit Mess Test
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt Test7bitMessTest z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber7
+END_TESTCASE SMS-SMSStack-NA-3008
+
+
+START_TESTCASE SMS-SMSStack-NA-3009
+//!@SYMTestCaseID SMS-SMSStack-NA-3009
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Class Messages
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Class Messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestClassMessages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber8
+END_TESTCASE SMS-SMSStack-NA-3009
+
+
+START_TESTCASE SMS-SMSStack-NA-3010
+//!@SYMTestCaseID SMS-SMSStack-NA-3010
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Rx Concatenated
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test receive concatenated
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestRxConcatenated z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber9
+END_TESTCASE SMS-SMSStack-NA-3010
+
+
+START_TESTCASE SMS-SMSStack-NA-3011
+//!@SYMTestCaseID SMS-SMSStack-NA-3011
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Rx Duplicate
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test receive duplicate
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestRxDuplicate z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber10
+END_TESTCASE SMS-SMSStack-NA-3011
+
+
+START_TESTCASE SMS-SMSStack-NA-3012
+//!@SYMTestCaseID SMS-SMSStack-NA-3012
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Rx Ring Tone A
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test receive ring tone A
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestRxRingToneA z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber11
+END_TESTCASE SMS-SMSStack-NA-3012
+
+
+START_TESTCASE SMS-SMSStack-NA-3013
+//!@SYMTestCaseID SMS-SMSStack-NA-3013
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Tx Rx Concatenated
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Transmit/receive concatenated messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestTxRxConcatenated z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber12
+END_TESTCASE SMS-SMSStack-NA-3013
+
+
+START_TESTCASE SMS-SMSStack-NA-3014
+//!@SYMTestCaseID SMS-SMSStack-NA-3014
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Param Storage
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test storage of parameters
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestParamStorage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber13
+END_TESTCASE SMS-SMSStack-NA-3014
+
+
+START_TESTCASE SMS-SMSStack-NA-3015
+//!@SYMTestCaseID SMS-SMSStack-NA-3015
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Sms Store
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Sms Store
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSmsStore z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber14
+END_TESTCASE SMS-SMSStack-NA-3015
+
+
+START_TESTCASE SMS-SMSStack-NA-3016
+//!@SYMTestCaseID SMS-SMSStack-NA-3016
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Sms Store List
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Sms Store List
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSmsStoreList z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber15
+END_TESTCASE SMS-SMSStack-NA-3016
+
+
+START_TESTCASE SMS-SMSStack-NA-3017
+//!@SYMTestCaseID SMS-SMSStack-NA-3017
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Delete Sms
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Delete Sms
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestDeleteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber15
+END_TESTCASE SMS-SMSStack-NA-3017
+
+
+START_TESTCASE SMS-SMSStack-NA-3018
+//!@SYMTestCaseID SMS-SMSStack-NA-3018
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Socket Binding
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Socket Binding
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSocketBinding z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber16
+END_TESTCASE SMS-SMSStack-NA-3018
+
+START_TESTCASE SMS-SMSStack-NA-3098
+//!@SYMTestCaseID SMS-SMSStack-NA-3098
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test SMS address class
+//!@SYMTestPriority High
+//!@SYMTestActions  Test SMS address class
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSmsAddr
+END_TESTCASE SMS-SMSStack-NA-3098
+
+START_TESTCASE SMS-SMSStack-NA-3019
+//!@SYMTestCaseID SMS-SMSStack-NA-3019
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Sms Event Logger
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Sms Event Logger
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSmsEventLogger z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber17
+END_TESTCASE SMS-SMSStack-NA-3019
+
+
+START_TESTCASE SMS-SMSStack-NA-3020
+//!@SYMTestCaseID SMS-SMSStack-NA-3020
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Bearer Change
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Bearer Change
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestBearerChange z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber18
+END_TESTCASE SMS-SMSStack-NA-3020
+
+
+START_TESTCASE SMS-SMSStack-NA-3094
+//!@SYMTestCaseID SMS-SMSStack-NA-3094
+//!@SYMREQ DEF080837
+//!@SYMTestCaseDesc Test Restore Bearer
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Restore Bearer
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestRestoreBearer 
+END_TESTCASE SMS-SMSStack-NA-3094
+
+
+START_TESTCASE SMS-SMSStack-NA-3021
+//!@SYMTestCaseID SMS-SMSStack-NA-3021
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Recv Mode Change
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Recieve Mode Change
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestRecvModeChange z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber19
+END_TESTCASE SMS-SMSStack-NA-3021
+
+
+START_TESTCASE SMS-SMSStack-NA-3022
+//!@SYMTestCaseID SMS-SMSStack-NA-3022
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Tsy Caps
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Tsy Capabilities
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestTsyCaps z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber20
+END_TESTCASE SMS-SMSStack-NA-3022
+
+
+START_TESTCASE SMS-SMSStack-NA-3023
+//!@SYMTestCaseID SMS-SMSStack-NA-3023
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test OOM Send Sms
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test send sms with out of memory conditions
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1000 TE_smsprt TestOOMSendSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber21
+END_TESTCASE SMS-SMSStack-NA-3023
+
+
+START_TESTCASE SMS-SMSStack-NA-3024
+//!@SYMTestCaseID SMS-SMSStack-NA-3024
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test OOM Write Sms
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test write sms with out of memory conditions
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1000 TE_smsprt TestOOMWriteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber22
+END_TESTCASE SMS-SMSStack-NA-3024
+
+
+START_TESTCASE SMS-SMSStack-NA-3025
+//!@SYMTestCaseID SMS-SMSStack-NA-3025
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test OOM Read Sms
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Read Sms with out of memory conditions
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1000 TE_smsprt TestOOMReadSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber23
+END_TESTCASE SMS-SMSStack-NA-3025
+
+
+START_TESTCASE SMS-SMSStack-NA-3026
+//!@SYMTestCaseID SMS-SMSStack-NA-3026
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test OOM Read Sms List
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test read sms list with out of memory conditions
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1000 TE_smsprt TestOOMReadSmsList z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber24
+END_TESTCASE SMS-SMSStack-NA-3026
+
+
+START_TESTCASE SMS-SMSStack-NA-3027
+//!@SYMTestCaseID SMS-SMSStack-NA-3027
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test OOM Delete Sms
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test delete sms with out of memory conditions
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1000 TE_smsprt TestOOMDeleteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber25
+END_TESTCASE SMS-SMSStack-NA-3027
+
+
+START_TESTCASE SMS-SMSStack-NA-3028
+//!@SYMTestCaseID SMS-SMSStack-NA-3028
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc TestOOMSmsParams
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test sms params with out of memory conditions
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 1000 TE_smsprt TestOOMSmsParams z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber26
+END_TESTCASE SMS-SMSStack-NA-3028
+
+
+START_TESTCASE SMS-SMSStack-NA-3029
+//!@SYMTestCaseID SMS-SMSStack-NA-3029
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc TestMeStoreDupAndMiss
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Me store with duplicate and missing pdus'
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestMeStoreDupAndMiss z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber27
+END_TESTCASE SMS-SMSStack-NA-3029
+
+
+START_TESTCASE SMS-SMSStack-NA-3030
+//!@SYMTestCaseID SMS-SMSStack-NA-3030
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Sim Store Dup And Miss
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Sim Store with duplicate and Missing pdus'
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSimStoreDupAndMiss z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber28
+END_TESTCASE SMS-SMSStack-NA-3030
+
+
+START_TESTCASE SMS-SMSStack-NA-3031
+//!@SYMTestCaseID SMS-SMSStack-NA-3031
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc TestRxCphs
+//!@SYMTestPriority critical
+//!@SYMTestActions   Test the reception of a CPHS Message Waiting Indication
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestRxCphs z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber30
+END_TESTCASE SMS-SMSStack-NA-3031
+
+
+START_TESTCASE SMS-SMSStack-NA-3032
+//!@SYMTestCaseID SMS-SMSStack-NA-3032
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Invalid PDUs
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test receiving invalid pdus
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestInvalidPDUs z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber31
+END_TESTCASE SMS-SMSStack-NA-3032
+
+
+START_TESTCASE SMS-SMSStack-NA-3033
+//!@SYMTestCaseID SMS-SMSStack-NA-3033
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Stress
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Transmit and Receive large number of different messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 700 TE_smsprt TestStress z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber32
+
+END_TESTCASE SMS-SMSStack-NA-3033
+
+START_TESTCASE SMS-SMSStack-NA-3034
+//!@SYMTestCaseID SMS-SMSStack-NA-3034
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Combined Store
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Combined Store
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCombinedStore z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber33
+END_TESTCASE SMS-SMSStack-NA-3034
+
+
+START_TESTCASE SMS-SMSStack-NA-3035
+//!@SYMTestCaseID SMS-SMSStack-NA-3035
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Params Inter
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test retrieving and storing the sms parameters
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestParamsInter z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber34
+END_TESTCASE SMS-SMSStack-NA-3035
+
+
+START_TESTCASE SMS-SMSStack-NA-3036
+//!@SYMTestCaseID SMS-SMSStack-NA-3036
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc TestTxRxAlphanumeric
+//!@SYMTestPriority critical
+//!@SYMTestActions  est a Transmit And receive of messages with alphanumeric dest/orig addresses
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestTxRxAlphanumeric z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber35
+END_TESTCASE SMS-SMSStack-NA-3036
+
+
+START_TESTCASE SMS-SMSStack-NA-3037
+//!@SYMTestCaseID SMS-SMSStack-NA-3037
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Rx Suspend
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Receive Suspension
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestRxSuspend 
+END_TESTCASE SMS-SMSStack-NA-3037
+
+
+START_TESTCASE SMS-SMSStack-NA-3038
+//!@SYMTestCaseID SMS-SMSStack-NA-3038
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Enumerate Corrupted
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Enumeration of Corrupted messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestEnumerateCorrupted z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber37
+END_TESTCASE SMS-SMSStack-NA-3038
+
+
+START_TESTCASE SMS-SMSStack-NA-3039
+//!@SYMTestCaseID SMS-SMSStack-NA-3039
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc TestCancelling
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Cancellacion of an sms operation
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCancelling z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber38
+END_TESTCASE SMS-SMSStack-NA-3039
+
+
+START_TESTCASE SMS-SMSStack-NA-3040
+//!@SYMTestCaseID SMS-SMSStack-NA-3040
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Send And Recv Msgs With Different TON
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test send And recieve messages with different TON
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSendAndRecvMsgsWithDifferentTON 
+END_TESTCASE SMS-SMSStack-NA-3040
+
+
+START_TESTCASE SMS-SMSStack-NA-3041
+//!@SYMTestCaseID SMS-SMSStack-NA-3041
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Send And Receive Indicator Msgs
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test send and receive indicator messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSendAndReceiveIndicatorMsgs
+END_TESTCASE SMS-SMSStack-NA-3041
+
+
+START_TESTCASE SMS-SMSStack-NA-3042
+//!@SYMTestCaseID SMS-SMSStack-NA-3042
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Send and Receive Max Length Msg
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Send Recv Maximum Length Message (255 Pdus)
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 5000 TE_smsprt TestSendRecvMaxLengthMsg
+END_TESTCASE SMS-SMSStack-NA-3042
+
+
+START_TESTCASE SMS-SMSStack-NA-3043
+//!@SYMTestCaseID SMS-SMSStack-NA-3043
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Send And Recv Msgs With Different PID
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Send And Receive Msgs With Different PID
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSendAndRecvMsgsWithDifferentPID
+END_TESTCASE SMS-SMSStack-NA-3043
+
+
+START_TESTCASE SMS-SMSStack-NA-3044
+//!@SYMTestCaseID SMS-SMSStack-NA-3044
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc  Sms Params Error Cases
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Sms Parameters Error Cases
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt SmsParamsErrorCases
+END_TESTCASE SMS-SMSStack-NA-3044
+
+
+START_TESTCASE SMS-SMSStack-NA-3097
+//!@SYMTestCaseID SMS-SMSStack-NA-3097
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Resend Failed Concatinated Message
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Resend Failed Concatinated Message
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestResendFailedConcatinatedMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber44
+END_TESTCASE SMS-SMSStack-NA-3097
+
+
+START_TESTCASE SMS-SMSStack-NA-3045
+//!@SYMTestCaseID SMS-SMSStack-NA-3045
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Multipart Wap Message
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Multipart Wap Message
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestMultipartWapMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber45
+END_TESTCASE SMS-SMSStack-NA-3045
+
+
+START_TESTCASE SMS-SMSStack-NA-3046
+//!@SYMTestCaseID SMS-SMSStack-NA-3046
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test MOSES Message
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test MOSES Message
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestMOSESMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber46
+END_TESTCASE SMS-SMSStack-NA-3046
+
+
+START_TESTCASE SMS-SMSStack-NA-3047
+//!@SYMTestCaseID SMS-SMSStack-NA-3047
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Clock Back
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Clock Back
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestClockBack z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber47
+END_TESTCASE SMS-SMSStack-NA-3047
+
+
+START_TESTCASE SMS-SMSStack-NA-3048
+//!@SYMTestCaseID SMS-SMSStack-NA-3048
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Enumerate NoMessages
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test enumeration of no messages
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestEnumerateNoMessages z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber48
+END_TESTCASE SMS-SMSStack-NA-3048
+
+
+START_TESTCASE SMS-SMSStack-NA-3049
+//!@SYMTestCaseID SMS-SMSStack-NA-3049
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Concatenated Message Logging
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Concatenated Message Logging
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestConcatenatedMessageLogging z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber50
+END_TESTCASE SMS-SMSStack-NA-3049
+
+
+START_TESTCASE SMS-SMSStack-NA-3050
+//!@SYMTestCaseID SMS-SMSStack-NA-3050
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Enumeration Of Status Report
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Enumeration Of Status Report
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestEnumerationOfStatusReport z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber51
+END_TESTCASE SMS-SMSStack-NA-3050
+
+
+START_TESTCASE SMS-SMSStack-NA-3051
+//!@SYMTestCaseID SMS-SMSStack-NA-3051
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test IE
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test IE
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber52
+END_TESTCASE SMS-SMSStack-NA-3051
+
+
+START_TESTCASE SMS-SMSStack-NA-3052
+//!@SYMTestCaseID SMS-SMSStack-NA-3052
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Email IE
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Email IE
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestEmailIE z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber53
+END_TESTCASE SMS-SMSStack-NA-3052
+
+
+START_TESTCASE SMS-SMSStack-NA-3053
+//!@SYMTestCaseID SMS-SMSStack-NA-3053
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Max Read Time For Sms Store List
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Maximim Read Time For Sms Store List
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestMaxReadTimeForSmsStoreList z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber54
+END_TESTCASE SMS-SMSStack-NA-3053
+
+
+START_TESTCASE SMS-SMSStack-NA-3054
+//!@SYMTestCaseID SMS-SMSStack-NA-3054
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc  Test Same Log Id Multiple PDU
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test same log id multiple pdu
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSameLogIdMultiplePDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber57
+END_TESTCASE SMS-SMSStack-NA-3054
+
+
+START_TESTCASE SMS-SMSStack-NA-3055
+//!@SYMTestCaseID SMS-SMSStack-NA-3055
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Same Log Id Single PDU
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Same Log Id Single PDU
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSameLogIdSinglePDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber58
+END_TESTCASE SMS-SMSStack-NA-3055
+
+
+START_TESTCASE SMS-SMSStack-NA-3056
+//!@SYMTestCaseID SMS-SMSStack-NA-3056
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Write Status Report To SIM
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Writing of a status report to the sim
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestWriteStatusReportToSIM z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber49
+END_TESTCASE SMS-SMSStack-NA-3056
+
+
+START_TESTCASE SMS-SMSStack-NA-3057
+//!@SYMTestCaseID SMS-SMSStack-NA-3057
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc  Test Tx Sms With Delayed Completion
+//!@SYMTestPriority critical
+//!@SYMTestActions   Test transmit of a sms with delayed completion
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile z:\sms\smswap.sms-sendTryTimeout.esk c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+
+RUN_TEST_STEP 500 TE_smsprt TestTxSmsWithDelayedCompletion z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber60
+
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
+END_TESTCASE SMS-SMSStack-NA-3057
+
+
+START_TESTCASE SMS-SMSStack-NA-3058
+//!@SYMTestCaseID SMS-SMSStack-NA-3058
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Sms Store Read Cancel
+//!@SYMTestPriority critical
+//!@SYMTestActions Test sms store read with cancel
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSmsStoreReadCancel
+END_TESTCASE SMS-SMSStack-NA-3058
+
+
+START_TESTCASE SMS-SMSStack-NA-3059
+//!@SYMTestCaseID SMS-SMSStack-NA-3059
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Bind When Powered Down With Publish Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test bind when powered down with publish and subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestBindWhenPoweredDownWithPublishSubscribe
+END_TESTCASE SMS-SMSStack-NA-3059
+
+
+START_TESTCASE SMS-SMSStack-NA-3060
+//!@SYMTestCaseID SMS-SMSStack-NA-3060
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc TestObserverNotifiedWhenPoweredDownWithPublishSubscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test observer notified when powered down with publish and subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestObserverNotifiedWhenPoweredDownWithPublishSubscribe z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber59
+
+END_TESTCASE SMS-SMSStack-NA-3060
+
+START_TESTCASE SMS-SMSStack-NA-3061
+//!@SYMTestCaseID SMS-SMSStack-NA-3061
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Sms CNumber Change WithPublish Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test sms CNumber change with publish and subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSmsCNumberChangeWithPublishSubscribe z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber55
+END_TESTCASE SMS-SMSStack-NA-3061
+
+
+START_TESTCASE SMS-SMSStack-NA-3062
+//!@SYMTestCaseID SMS-SMSStack-NA-3062
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Status Report Time
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Status Report Time
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestStatusReportTime z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber62
+END_TESTCASE SMS-SMSStack-NA-3062
+
+
+START_TESTCASE SMS-SMSStack-NA-3063
+//!@SYMTestCaseID SMS-SMSStack-NA-3063
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Tx 8Bit Wap With Status
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test Transmit 8Bit wap message with status
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestTx8BitWapWithStatus z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber63
+END_TESTCASE SMS-SMSStack-NA-3063
+
+
+START_TESTCASE SMS-SMSStack-NA-3064
+//!@SYMTestCaseID SMS-SMSStack-NA-3064
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Sim Store Corrupt Message
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test sim store with corrupt message
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestSimStoreCorruptMessage z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber64
+END_TESTCASE SMS-SMSStack-NA-3064
+
+
+
+START_TESTCASE SMS-SMSStack-NA-3065
+//!@SYMTestCaseID SMS-SMSStack-NA-3065
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Corrupt Pdu With Negative Response
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test a corrupt pdu with anegative response
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile z:\sms\testsmswap.sms.esk c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_TEST_STEP 500 TE_smsprt TestCorruptPduWithNegativeResponse z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber65
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
+END_TESTCASE SMS-SMSStack-NA-3065
+
+
+START_TESTCASE SMS-SMSStack-NA-3066
+//!@SYMTestCaseID SMS-SMSStack-NA-3066
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Boot Timer can be configured to a non default value
+//!@SYMTestPriority critical
+//!@SYMTestActions  Check that boot timer can be configured from smswap.sms.esk file.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.esk c:\private\101F7989\esock\smswap.sms.bak
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile z:\sms\smswap.sms-bootTimerTimeout.esk c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\smswap.sms.esk
+RUN_TEST_STEP 500 TE_smsprt TestBootTimer z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber45
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS copyfile c:\private\101F7989\esock\smswap.sms.bak c:\private\101F7989\esock\smswap.sms.esk
+RUN_UTILS DeleteFile c:\private\101F7989\esock\smswap.sms.bak
+END_TESTCASE SMS-SMSStack-NA-3066
+
+
+START_TESTCASE SMS-SMSStack-NA-3067
+//!@SYMTestCaseID SMS-SMSStack-NA-3067
+//!@SYMREQ REQ4612
+//!@SYMTestCaseDesc Test CSmsMessageTimeStamp
+//!@SYMTestPriority critical
+//!@SYMTestActions Create message with know system utc time.  Set and get also checked
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageTimeStamp
+END_TESTCASE SMS-SMSStack-NA-3067
+
+START_TESTCASE SMS-SMSStack-NA-3068
+//!@SYMTestCaseID SMS-SMSStack-NA-3068
+//!@SYMREQ REQ4612
+//!@SYMTestCaseDesc Test service center time stamp in PDU with CSmsMessage interface.
+//!@SYMTestPriority critical
+//!@SYMTestActions Simulate receiving deliver PDU's.  Create message and interogate PDU and check time stamp and validity period.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageWithDeliverPDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber66
+END_TESTCASE SMS-SMSStack-NA-3068
+
+START_TESTCASE SMS-SMSStack-NA-3069
+//!@SYMTestCaseID SMS-SMSStack-NA-3069
+//!@SYMREQ REQ4612
+//!@SYMTestCaseDesc Test Status Report
+//!@SYMTestPriority critical
+//!@SYMTestActions  Test status report
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageWithStatusReportPDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber67
+END_TESTCASE SMS-SMSStack-NA-3069
+
+START_TESTCASE SMS-SMSStack-NA-3070
+//!@SYMTestCaseID SMS-SMSStack-NA-3070
+//!@SYMREQ REQ4612
+//!@SYMTestCaseDesc Test Submit PDU
+//!@SYMTestPriority critical
+//!@SYMTestActions  Create a submit message.  Send it using SimTSY.  SimTSY will validate the PDU to what is expected.  Status=0
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestCSmsMessageWithSubmitPDU z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber68
+END_TESTCASE SMS-SMSStack-NA-3070
+
+START_TESTCASE SMS-SMSStack-NA-3071
+//!@SYMTestCaseID SMS-SMSStack-NA-3071
+//!@SYMREQ DEF055800
+//!@SYMTestCaseDesc Test Handling of PDUs with PID 0x40
+//!@SYMTestPriority critical
+//!@SYMTestActions  Check that PDUs with PID 0x40 are acknowledged but not forwarded to the client
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 500 TE_smsprt TestHandlePID40h z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber69
+END_TESTCASE SMS-SMSStack-NA-3071
+
+RUN_SCRIPT  z:\testdata\scripts\smsstackcleanprivatedata.script
--- a/smsprotocols/smsstack/smsprot/Test/group/bld.inf	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Test/group/bld.inf	Wed Aug 18 10:57:47 2010 +0300
@@ -85,7 +85,6 @@
 //
 // TE_SMSPRT test files...
 //
-../TE_Smsprt/TE_smsprt.script                            z:/testdata/scripts/te_smsprt.script
 ../TE_Smsprt/TE_smsprt_setup.script                      z:/testdata/scripts/te_smsprt_setup.script
 ../TE_Smsprt/tsmsprt_config.txt                          z:/sms/tsmsprt_config.txt
 ../TE_Smsprt/tsmsprt_config_extra.txt                    z:/sms/tsmsprt_config_extra.txt
@@ -99,6 +98,10 @@
 ../TE_Smsprt/smswap.sms-AutomaticDeletionOfType0.esk     z:/sms/smswap.sms-automaticdeletionoftype0.esk
 ../TE_Smsprt/smswap.sms-AutoDeletionClass2.esk           z:/sms/smswap.sms-autodeletionclass2.esk
 ../TE_Smsprt/testsmswap.Sms.esk                          z:/sms/testsmswap.sms.esk
+../TE_Smsprt/te_smsprt_gsmu.script                       z:/testdata/scripts/te_smsprt_gsmu.script
+../TE_Smsprt/te_smsprt_smsstack.script                   z:/testdata/scripts/te_smsprt_smsstack.script
+../TE_Smsprt/te_smsprt_prot.script                       z:/testdata/scripts/te_smsprt_prot.script
+
 
 //SMSOutOfDiskSpace
 ../TE_Smsprt/Te_SMSStackOutOfDiskSpace.script            z:/testdata/scripts/te_smsstackoutofdiskspace.script
--- a/smsprotocols/smsstack/smsprot/traces/fixed_id.definitions	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/traces/fixed_id.definitions	Wed Aug 18 10:57:47 2010 +0300
@@ -639,32 +639,32 @@
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0xa
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0xb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0xc
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0xd
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0xe
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0xf
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x10
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x11
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x12
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x13
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x14
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x15
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x16
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x17
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x18
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x19
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x3
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x4
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x5
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_1=0x2b6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_10=0x2bf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_11=0x2c0
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_12=0x2c1
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_13=0x2c2
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_14=0x2c3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_15=0x2c4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_16=0x2c5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_17=0x2c6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_18=0x2c7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_19=0x2c8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_2=0x2b7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_20=0x2c9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_21=0x2ca
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_22=0x2cb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_23=0x2cc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_24=0x2cd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_25=0x2ce
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_26=0x2cf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_3=0x2b8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_4=0x2b9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_5=0x2ba
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_6=0x2bb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_7=0x2bc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_8=0x2bd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_9=0x2be
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
--- a/smsprotocols/smsstack/smsu/inc/smsuaddr.H	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/smsu/inc/smsuaddr.H	Wed Aug 18 10:57:47 2010 +0300
@@ -252,6 +252,15 @@
 	IMPORT_C TInt IdentifierMatch() const;
 	IMPORT_C void SetIdentifierMatch(TInt aIdentifier);
 	IMPORT_C TPtrC8 TextMatch() const;
+	
+	/**
+	 *  Sets the match text. The matching is case-insensitive comparison 
+	 *  done against the leading text in the message. Wild card matching
+	 *  is not supported.
+	 *  
+	 *  @param aText The match text
+	 *  @capability None
+	 */
 	IMPORT_C void SetTextMatch(const TDesC8& aText);
 	IMPORT_C TBool operator==(const TSmsAddr& aAddr) const;
 	};
--- a/smsprotocols/smsstack/test/group/te_smsstack.iby	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/test/group/te_smsstack.iby	Wed Aug 18 10:57:47 2010 +0300
@@ -62,9 +62,11 @@
 
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsinter.script                         testdata\scripts\te_smsinter.script
 
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT.script                           testdata\scripts\TE_SMSPRT.script
 data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT_setup.script                     testdata\scripts\TE_SMSPRT_setup.script
 data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SMSPRT.cfg                              testdata\configs\te_smsprt.cfg
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_gsmu.script                      testdata\scripts\te_smsprt_gsmu.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_smsstack.script                  testdata\scripts\te_smsprt_smsstack.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_prot.script                      testdata\scripts\te_smsprt_prot.script
 
 data=EPOCROOT##epoc32\data\z\sms\smswap.sms-sendTryTimeout.esk                           SMS\smswap.sms-sendTryTimeout.esk
 data=EPOCROOT##epoc32\data\z\sms\smswap.sms-bootTimerTimeout.esk                         SMS\smswap.sms-bootTimerTimeout.esk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/smsstack_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\test\TE_SMSPDUDB\TE_smspdudb.script"-"c:\testdata\scripts\TE_smspdudb.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\test\TE_R6SMS\TE_R6SMS.script"-"c:\testdata\scripts\TE_R6SMS.script"
+
+
+
+
--- a/smsprotocols/smsstack/test/smsstacktestutilities.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/test/smsstacktestutilities.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1504,7 +1504,7 @@
  */
 	{
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) 
-    LogSmsIfPDU(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
+    LogSmsIfPDUL(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
     TBuf<40> timestamp;
     SmsTimeStampL(timestamp);
     OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1, "%S",timestamp);
--- a/smsprotocols/smsstack/test/traces/fixed_id.definitions	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/test/traces/fixed_id.definitions	Wed Aug 18 10:57:47 2010 +0300
@@ -25,246 +25,246 @@
 [TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1=0x37
 [TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NEWL_1=0x38
 [TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1=0x36
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x181
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x182
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x20f
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x216
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x217
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x210
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x206
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x204
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x205
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x214
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x215
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x20c
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x218
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x219
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x21a
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x211
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x20e
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x20d
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x202
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x203
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x21b
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x209
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x20a
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x20b
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x207
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x208
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x212
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x213
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x531
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x532
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x5bf
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x5c6
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x5c7
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x5c0
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x5b6
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x5b4
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x5b5
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x5c4
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x5c5
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x5bc
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x5c8
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x5c9
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x5ca
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x5c1
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x5be
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x5bd
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x5b2
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x5b3
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x5cb
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x5b9
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x5ba
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x5bb
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x5b7
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x5b8
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x5c2
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x5c3
 [TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1=0x3
 [TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1=0x2
 [TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1=0x5
 [TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1=0x4
 [TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_NEWLC_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x1f8
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x1f9
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x1fa
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x1fb
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x1f2
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x1f5
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0x1eb
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x1f7
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x1f1
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x1f0
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x1f4
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x1ed
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0x1e9
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x1ef
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x1f3
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x1f6
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x1ec
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x1ee
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0x1ea
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0x1e8
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0x1e7
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0x1d6
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0x1d4
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0x1d5
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0x1c5
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0x1bd
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0x1c6
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0x1bf
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0x1c3
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0x1be
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0x1c0
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0x1c4
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0x1c2
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0x1c1
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x1fc
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x1fd
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x1fe
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x17c
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x17d
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x180
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x17f
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x17e
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x16a
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x16c
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x16b
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x16d
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x16e
-[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x169
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x5a8
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x5a9
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x5aa
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x5ab
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x5a2
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x5a5
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0x59b
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x5a7
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x5a1
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x5a0
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x5a4
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x59d
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0x599
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x59f
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x5a3
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x5a6
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x59c
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x59e
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0x59a
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0x598
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0x597
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0x586
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0x584
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0x585
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0x575
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0x56d
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0x576
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0x56f
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0x573
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0x56e
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0x570
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0x574
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0x572
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0x571
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x5ac
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x5ad
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x5ae
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x52c
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x52d
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x530
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x52f
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x52e
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x51a
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x51c
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x51b
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x51d
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x51e
+[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x519
 [TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA1_1=0x8
 [TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA_1=0x7
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x157
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x14c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x153
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x154
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x155
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x144
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x152
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x166
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x149
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x14a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x132
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x14b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x148
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x136
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x160
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x134
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x168
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x159
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x150
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x13c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x13d
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x13e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x13f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x140
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x161
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x162
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x163
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x164
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x135
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x15f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x133
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x158
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x147
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x146
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x156
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x13a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x13b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x131
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x130
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x138
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x139
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x143
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x14d
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x14e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x14f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x145
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x165
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x167
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x142
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x15b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x15c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x15e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x137
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x151
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x141
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x15a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x15d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0x199
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0x1ab
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0x197
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0x19b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0x1a9
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0x1a5
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0x1b7
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x186
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x187
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0x19f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0x1a1
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0x190
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0x191
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0x192
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0x193
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x184
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x185
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x183
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0x1a7
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x18a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0x18e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0x1ad
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0x1b9
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x188
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0x19a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0x1ac
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0x198
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0x19c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0x1aa
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0x1a6
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0x1b8
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0x1a0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0x1a2
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0x194
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0x195
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0x196
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0x1a8
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x18b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0x18f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0x1ae
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0x1ba
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x189
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0x1b2
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0x1b0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0x1b4
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0x19e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0x1a4
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0x18d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0x1b6
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0x1b1
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0x1af
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0x1b3
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0x19d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0x1a3
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0x18c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0x1bc
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0x1b5
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0x1bb
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x171
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x172
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x16f
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x170
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x173
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x175
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x174
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x176
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x177
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x178
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x179
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x17b
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x17a
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0x1e2
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0x1e6
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0x1de
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0x1da
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0x1e0
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0x1e3
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0x1df
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0x1db
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0x1e1
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0x1dd
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0x1e5
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0x1dc
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0x1e4
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0x1d9
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0x1d7
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0x1d8
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0x1d3
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0x1cf
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0x1c7
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0x1cb
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0x1d0
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0x1c8
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0x1cc
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0x1ce
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0x1ca
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0x1d2
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0x1cd
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0x1c9
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0x1d1
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x507
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x4fc
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x503
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x504
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x505
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x4f4
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x502
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x516
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x4f9
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x4fa
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x4e2
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x4fb
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x4f8
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4e6
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x510
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x4e4
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x518
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x509
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x500
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x4ec
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x4ed
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x4ee
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x4ef
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x4f0
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x511
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x512
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x513
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x514
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x4e5
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x50f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x4e3
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x508
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x4f7
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x4f6
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x506
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4ea
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4eb
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x4e1
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x4e0
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4e8
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4e9
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x4f3
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x4fd
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x4fe
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x4ff
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x4f5
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x515
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x517
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x4f2
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x50b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x50c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x50e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4e7
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x501
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x4f1
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x50a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x50d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0x549
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0x55b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0x547
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0x54b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0x559
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0x555
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0x567
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x536
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x537
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0x54f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0x551
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0x540
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0x541
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0x542
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0x543
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x534
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x535
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x533
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0x557
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x53a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0x53e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0x55d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0x569
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x538
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0x54a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0x55c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0x548
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0x54c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0x55a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0x556
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0x568
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0x550
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0x552
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0x544
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0x545
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0x546
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0x558
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x53b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0x53f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0x55e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0x56a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x539
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0x562
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0x560
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0x564
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0x54e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0x554
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0x53d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0x566
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0x561
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0x55f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0x563
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0x54d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0x553
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0x53c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0x56c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0x565
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0x56b
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x521
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x522
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x51f
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x520
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x523
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x525
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x524
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x526
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x527
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x528
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x529
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x52b
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x52a
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0x592
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0x596
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0x58e
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0x58a
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0x590
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0x593
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0x58f
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0x58b
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0x591
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0x58d
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0x595
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0x58c
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0x594
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0x589
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0x587
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0x588
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0x583
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0x57f
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0x577
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0x57b
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0x580
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0x578
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0x57c
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0x57e
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0x57a
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0x582
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0x57d
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0x579
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0x581
 [TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ADDINFORMATIONELEMENTL_1=0xc
 [TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_BODY_1=0x10
 [TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTINDEX_1=0xa
@@ -301,9 +301,9 @@
 [TRACE]TRACE_BORDER[0x84]_TGSMSMSTELNUMBER_ISINSTANCEOF_1=0x6
 [TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1=0x15
 [TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1=0x16
-[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x1ff
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x201
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x200
+[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x5af
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x5b1
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x5b0
 [TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1=0x87
 [TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1=0x83
 [TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1=0x84
@@ -331,30 +331,30 @@
 [TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x95
 [TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1=0x98
 [TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x255
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x258
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x257
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x256
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x259
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x29d
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x2a7
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x2a8
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x2a9
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x29f
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x2a0
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x2a1
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x2a2
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x2a6
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x2a3
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x2a5
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x2a4
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x29e
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x6f4
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x6fe
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x6fd
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x6f7
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x6f6
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x6f5
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x6fc
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x6f8
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x6f9
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x6fa
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x6fb
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x73c
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x746
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x747
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x748
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x73e
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x73f
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x740
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x741
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x745
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x742
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x744
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x743
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x73d
 [TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_ADDRESS_1=0x47
 [TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DOSETPARSEDADDRESSL_1=0x4e
 [TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DUPLICATEL_1=0x46
@@ -369,6 +369,15 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1=0x665
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2=0x666
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3=0x667
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4=0x668
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1=0x669
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2=0x66a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3=0x66b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4=0x66c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5=0x66d
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
@@ -376,29 +385,23 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5=0x2f0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6=0x2f1
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_3=0x2ee
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_4=0x2ef
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x29a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x295
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x297
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x29b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x299
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x298
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x296
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x739
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x734
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x736
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x73a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x738
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x737
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x735
 [TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1=0x6
 [TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DATA_1=0x8
 [TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DECODEL_1=0xb
@@ -414,49 +417,49 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETDATAL_1=0x9
 [TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETHEADERPRESENT_1=0xf
 [TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x291
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x293
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x294
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x292
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x28e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x28f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x290
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x250
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0x214
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0x213
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x27c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x278
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x27e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x27d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x27a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x279
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x27b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x267
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x26c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x269
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x268
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x26b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x26a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x26e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x26d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x29c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x226
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x225
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x227
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x228
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x229
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0x217
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0x216
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0x218
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0x219
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0x215
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0x210
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0x212
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0x211
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x730
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x732
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x733
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x731
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x72d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x72e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x72f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x6ef
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x6ee
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0x6b3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0x6b2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x71b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x717
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x71d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x71c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x719
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x718
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x71a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x706
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x70b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x708
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x707
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x70a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x709
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x70d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x70c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x73b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x6c9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x6c5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x6c4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x6c6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x6c7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x6c8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0x6b6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0x6b5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0x6b7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0x6b8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0x6b9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0x6b4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0x6af
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0x6ae
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0x6b1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0x6b0
 [TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_CONSTRUCTL_1=0x59
 [TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_DECODEL_1=0x58
 [TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_ENCODEL_1=0x57
@@ -464,150 +467,150 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWDATAL_1=0x5a
 [TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL1_1=0x56
 [TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x23e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x232
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x233
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x234
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x231
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x243
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x230
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x245
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x235
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x236
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x240
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x241
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x242
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x237
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x238
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x239
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x249
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x246
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x244
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x247
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0x209
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0x208
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0x206
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0x207
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0x200
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0x202
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0x203
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0x205
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0x204
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0x1d8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0x1da
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x265
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x266
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x264
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x263
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x260
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x261
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x262
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0x224
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0x223
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0x220
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0x221
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0x222
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x28b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x286
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x28d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x28c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x288
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x287
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x28a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x289
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x283
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x27f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x285
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x284
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x281
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x280
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x282
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x273
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x26f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x276
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x275
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x274
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x277
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x270
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x272
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x271
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x252
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x251
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x253
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x254
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x6dd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x6d1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x6d2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x6d3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x6d0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x6e2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x6cf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x6e4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x6d4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x6d5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x6df
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x6e0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x6e1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x6d6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x6d7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x6d8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x6d9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x6da
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x6db
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x6e7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x6e8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x6e5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x6ce
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x6e3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x6dc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x6de
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x6e6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x6e9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x6ea
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x6eb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0x682
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x680
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x681
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0x67d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x683
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x684
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0x685
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0x686
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0x687
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0x688
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0x6a8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0x6a7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0x67e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0x699
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0x6aa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0x6a5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0x6a6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0x676
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0x675
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0x66f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0x670
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0x67c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0x67a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0x67b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0x6ad
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0x697
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0x698
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0x689
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0x692
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0x693
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0x68a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0x68b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0x68c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0x68d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0x68e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0x68f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0x690
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0x691
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0x694
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0x695
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0x696
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0x67f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0x69a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0x69b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0x69c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0x69d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0x69e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0x69f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0x6a0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0x6a1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0x6a2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0x6ac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0x6ab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0x6a4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0x6a3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0x671
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0x672
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0x677
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0x678
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0x673
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0x674
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0x679
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0x6a9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x6ed
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x6ec
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x704
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x705
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x703
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x702
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x6ff
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x700
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x701
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0x6bb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0x6ba
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0x6bc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0x6bd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0x6be
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x6cb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x6ca
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x6cc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x6cd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0x6c3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0x6c2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0x6bf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0x6c0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0x6c1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x72a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x725
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x72c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x72b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x727
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x726
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x729
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x728
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x722
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x71e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x724
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x723
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x720
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x71f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x721
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x712
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x70e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x715
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x714
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x713
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x716
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x70f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x711
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x710
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x6f1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x6f0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x6f2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x6f3
 [TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1=0x6c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_APPENDBODYL_1=0x6f
 [TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_BODYLENGTHINUDLUNITS_1=0x78
@@ -698,526 +701,3 @@
 [TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL1_1=0x53
 [TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL_1=0x52
 [TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_TIME_1=0x51
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x95
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x96
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x123
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x12a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x12b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x124
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x11a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x118
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x119
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x128
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x129
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x120
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x12c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x12d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x12e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x125
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x122
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x121
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x116
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x117
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x12f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x11d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x11e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x11f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x11b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x11c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x126
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x127
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x10c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x10d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x10e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x10f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x106
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x109
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0xff
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x10b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x105
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x104
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x108
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x101
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0xfd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x103
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x107
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x10a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x100
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x102
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0xfe
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0xfc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0xfb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0xea
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0xe8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0xe9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0xd9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0xd1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0xda
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0xd3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0xd7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0xd2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0xd4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0xd8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0xd6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0xd5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x110
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x111
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x112
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x90
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x91
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x94
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x93
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x92
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x7e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x80
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x7f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x81
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x82
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x7d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x6b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x60
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x67
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x68
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x69
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x58
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x66
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x7a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x5d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x5e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x46
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x5f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x5c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x74
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x48
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x7c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x6d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x64
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x50
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x51
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x52
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x53
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x54
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x75
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x76
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x77
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x78
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x49
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x73
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x47
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x6c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x5b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x5a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x6a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x45
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x44
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x57
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x61
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x62
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x63
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x59
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x79
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x7b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x56
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x6f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x70
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x72
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x65
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x55
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x6e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x71
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0xad
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0xbf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0xab
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0xaf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0xbd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0xb9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0xcb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x9a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x9b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0xb3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0xb5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0xa4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0xa5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0xa6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0xa7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x98
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x99
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x97
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0xbb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x9e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0xa2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0xc1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0xcd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x9c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0xae
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0xc0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0xac
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0xb0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0xbe
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0xba
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0xcc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0xb4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0xb6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0xa8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0xa9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0xaa
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0xbc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x9f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0xa3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0xc2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0xce
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x9d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0xc6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0xc4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0xc8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0xb2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0xb8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0xa1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0xca
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0xc5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0xc3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0xc7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0xb1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0xb7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0xa0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0xd0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0xc9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0xcf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x85
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x86
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x83
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x84
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x87
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x89
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x88
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x8a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x8b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x8c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x8d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x8f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x8e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0xf6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0xfa
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0xf2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0xee
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0xf4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0xf7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0xf3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0xef
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0xf5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0xf1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0xf9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0xf0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0xf8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0xed
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0xeb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0xec
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0xe7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0xe3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0xdb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0xdf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0xe4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0xdc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0xe0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0xe2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0xde
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0xe6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0xe1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0xdd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0xe5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x113
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x115
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x114
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x130
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x13a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x139
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x133
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x132
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x131
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x138
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x134
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x135
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x136
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x137
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x17e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x188
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x189
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x18a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x180
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x181
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x182
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x183
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x187
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x184
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x186
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x185
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x17f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x17b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x176
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x178
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x17c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x17a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x179
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x177
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x16c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x16e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x16f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x16d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x169
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x16a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x16b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x12b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x12a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0xef
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0xee
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x157
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x153
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x159
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x158
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x155
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x154
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x156
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x142
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x147
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x144
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x143
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x146
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x145
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x149
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x148
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x17d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x105
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x101
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x100
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x102
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x103
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x104
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0xf2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0xf1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0xf3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0xf4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0xf5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0xf0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0xeb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0xea
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0xed
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0xec
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x119
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x10d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x10e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x10f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x10c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x11e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x10b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x120
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x110
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x111
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x11b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x11c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x11d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x112
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x113
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x114
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x115
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x116
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x117
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x123
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x124
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x121
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x10a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x11f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x118
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x11a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x122
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x125
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x126
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x127
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0xbe
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xbd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0xb9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xc0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0xc1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0xc2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0xc3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0xc4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0xe4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0xe3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0xba
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0xd5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0xe6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0xe1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0xe2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0xb2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0xb1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0xab
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0xac
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0xb8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0xb6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0xb7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0xe9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0xd3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0xd4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0xc5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0xce
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0xcf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0xc6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0xc7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0xc8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0xc9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0xca
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0xcb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0xcc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0xcd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0xd0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0xd1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0xd2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0xbb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0xd6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0xd7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0xd8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0xd9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0xda
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0xdb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0xdc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0xdd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0xde
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0xe8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0xe7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0xe0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0xdf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0xad
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0xae
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0xb3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0xb4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0xaf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0xb0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0xb5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0xe5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x129
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x128
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x140
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x141
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x13f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x13e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x13b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x13c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x13d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0xf7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0xf6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0xf8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0xf9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0xfa
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x107
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x106
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x108
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x109
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0xff
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0xfe
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0xfb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0xfc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0xfd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1=0x1cf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x166
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x161
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x168
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x167
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x163
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x162
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x165
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x164
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x15e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x15a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x160
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x15f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x15c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x15b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x15d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x14e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x14a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x151
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x150
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x14f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x152
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x14b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x14d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x14c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x12d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x12c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x12e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x12f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFHEXBUF_1=0x1a5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_1=0x1ae
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_10=0x1b7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_2=0x1af
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_3=0x1b0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_4=0x1b1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_5=0x1b2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_6=0x1b3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x1b4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x1b5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x1b6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x18b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0x194
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0x195
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0x196
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0x197
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0x198
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0x199
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x19a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x19b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x19c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x19d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x18c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x19e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x19f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x1a0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x1a1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x1a2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x1a3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x18d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x18e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x18f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x190
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x191
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x192
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x193
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x1c2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x1cb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x1cc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_12=0x1cd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_13=0x1ce
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_2=0x1c3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_3=0x1c4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_4=0x1c5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_5=0x1c6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_6=0x1c7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_7=0x1c8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_8=0x1c9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_9=0x1ca
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_1=0x1b8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_10=0x1c1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_2=0x1b9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_3=0x1ba
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_4=0x1bb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_5=0x1bc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_6=0x1bd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_7=0x1be
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_8=0x1bf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_9=0x1c0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_1=0x1a6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_2=0x1a7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_3=0x1a8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_4=0x1a9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_5=0x1aa
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_6=0x1ab
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_7=0x1ac
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_8=0x1ad
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/wapprot/Group/wapport_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPDGRM\TE_wapdgrm.script"-"c:\testdata\scripts\TE_wapdgrm.script"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr.script"-"c:\testdata\scripts\TE_wapthdr.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr_setup.script"-"c:\testdata\scripts\TE_wapthdr_setup.script"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapProt.script"-"c:\testdata\scripts\Te_WapProt.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapStackOutOfDiskSpace_ARM_UREL.script"-"c:\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script"
+
+
--- a/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions	Wed Aug 18 10:57:47 2010 +0300
@@ -1,51 +1,51 @@
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_BORDER=0x84
 [GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x5f
+[TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x12f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x12e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x133
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x132
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x12d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x12b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x12c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x130
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x131
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x135
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x12a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x117
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x120
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x121
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x122
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x123
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x124
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x125
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x126
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x127
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x128
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x129
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x118
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x119
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x11a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x11b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x11c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x11d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x11e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x11f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x134
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x136
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x137
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x139
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x13c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x141
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x13f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x13b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x13a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x13d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x13e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x138
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x142
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x140
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1=0x34
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CREATEHEADER_1=0x33
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_ENCODESEGMENTSL_1=0x2d
@@ -54,50 +54,3 @@
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2=0x32
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_1=0x2e
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_2=0x2f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0x1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPTHDRBASE_PANIC_1=0x2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CTESTLOGGEROVERFLOW_DOTESTSTEPL_1=0x35
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x19
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x18
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x1d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x1c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x17
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x15
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x16
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x1a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x1b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x1f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x14
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0xa
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0xb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0xc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0xd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0xe
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0xf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x10
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x11
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x12
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x13
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x1e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x20
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x21
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x23
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x26
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x2b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x29
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x25
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x24
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x27
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x28
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x22
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x2c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x2a
--- a/smsprotocols/smsstack/wapprot/traces/fixed_id.definitions	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/traces/fixed_id.definitions	Wed Aug 18 10:57:47 2010 +0300
@@ -146,32 +146,32 @@
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0xa
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0xb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0xc
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0xd
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0xe
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0xf
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x10
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x11
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x12
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x13
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x14
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x15
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x16
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x17
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x18
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x19
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x3
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x4
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x5
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_1=0xd3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_10=0xdc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_11=0xdd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_12=0xde
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_13=0xdf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_14=0xe0
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_15=0xe1
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_16=0xe2
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_17=0xe3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_18=0xe4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_19=0xe5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_2=0xd4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_20=0xe6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_21=0xe7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_22=0xe8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_23=0xe9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_24=0xea
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_25=0xeb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_26=0xec
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_3=0xd5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_4=0xd6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_5=0xd7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_6=0xd8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_7=0xd9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_8=0xda
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_9=0xdb
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
 [TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
--- a/telephonyprotocols/pdplayer/group/bld.inf	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/group/bld.inf	Wed Aug 18 10:57:47 2010 +0300
@@ -30,7 +30,7 @@
 PRJ_TESTMMPFILES
 
 
-#include "../test/controlplane/group/BLD.INF"
+#include "../test/controlplane/group/bld.inf"
 
 #endif
 
--- a/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -58,7 +58,7 @@
 #endif
 
 const TUint8 KGenericNifChallengeSize = 8;
-const TUint KGenericNifIdLength = 1;
+
 
 //-=========================================================
 //
@@ -615,38 +615,38 @@
     TUint8 challenge[KGenericNifChallengeSize] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     
     TUint8 i=0;
-    while(i < KGenericNifChallengeSize)
+    while((i < KGenericNifChallengeSize) && (aProtocolConfigOption.iChallenge.Length() < aProtocolConfigOption.iChallenge.MaxLength()))
         {
         challenge[i] = (TUint8)(Math::Rand(seedValue)%256);
         aProtocolConfigOption.iChallenge.Append(challenge[i++]);
         }
 
     //Response
-    TBuf8<KGenericNifIdLength+KCommsDbSvrMaxColumnNameLength+KGenericNifChallengeSize> message;
-    message.Append(aProtocolConfigOption.iId);
-    message.Append(aProtocolConfigOption.iAuthInfo.iPassword);
-    message.Append(aProtocolConfigOption.iChallenge);
-    
-    TInt length = 1 /*iId length */ + aProtocolConfigOption.iAuthInfo.iPassword.Length() + KGenericNifChallengeSize;
-
+    TInt length = 1 /*iId length */ + aProtocolConfigOption.iAuthInfo.iPassword.Length() + aProtocolConfigOption.iChallenge.Length();
     HBufC8* buf = HBufC8::NewL(length);
-    
     CleanupStack::PushL(buf);
      
     TPtr8 ptr((TUint8*)buf->Des().Ptr(),length);
-    
-    ptr.Copy(message);
+    ptr.Append(aProtocolConfigOption.iId);
+    ptr.Append(aProtocolConfigOption.iAuthInfo.iPassword);
+    ptr.Append(aProtocolConfigOption.iChallenge);
     
     CMD5* md5=0;
     md5 = CMD5::NewL();
-    
     CleanupStack::PushL(md5);
-    
     TPtrC8 Response = md5->Hash(ptr);
-    
-    aProtocolConfigOption.iResponse.Copy(Response);
-    
-    CleanupStack::PopAndDestroy(2);		//buf, md5
+   
+    if (Response.Length() < aProtocolConfigOption.iResponse.MaxLength())
+        {
+        aProtocolConfigOption.iResponse.Copy(Response);
+        }
+    else
+        {
+        // Just a defensive measure - this should not happen.
+        User::Leave(KErrCorrupt);
+        }
+
+    CleanupStack::PopAndDestroy(2);     //buf, md5
     }
 
 void TCreatePrimaryPDPCtx::DoL()
@@ -1156,7 +1156,27 @@
 DEFINE_SMELEMENT(TAwaitingContextBlockedOrUnblocked, NetStateMachine::MState, PDPSCprStates::TContext)
 TBool TAwaitingContextBlockedOrUnblocked::Accept()
     {
-    return TAwaitingPDPFSMMessage::Accept(KContextBlockedEvent) || TAwaitingPDPFSMMessage::Accept(KContextUnblockedEvent);
+
+    if (TAwaitingPDPFSMMessage::Accept(KContextBlockedEvent) || TAwaitingPDPFSMMessage::Accept(KContextUnblockedEvent))
+        {
+        //check if there is a data flow as well. Incase we are getting the notification and the Data Client has already
+        //been destroyed, we will just ignore the notification. (ou1cimx1#466386)
+        RNodeInterface* theOnlyDataClient = iContext.iNode.GetFirstClient<TDefaultClientMatchPolicy>(TCFClientType::EData);
+        if (theOnlyDataClient == NULL)
+            {
+            // clear the message and return EFalse.
+            iContext.iMessage.ClearMessageId();
+            return EFalse;
+            }
+        else
+            {
+            return ETrue;
+            }
+        }
+    else
+        {
+        return EFalse;
+        }
     }
 
 DEFINE_SMELEMENT(TForwardContextBlockedOrUnblockedToDC, NetStateMachine::MStateTransition, PDPSCprStates::TContext)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/group/te_PDP_ControlPlane.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,16 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\test\controlplane\scripts\te_PDP_ControlPlane.script"-"c:\testdata\scripts\te_PDP_ControlPlane.script"
--- a/telephonyprotocols/pdplayer/test/controlplane/group/te_pdpcontrolplane.iby	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/test/controlplane/group/te_pdpcontrolplane.iby	Wed Aug 18 10:57:47 2010 +0300
@@ -18,17 +18,17 @@
 #ifndef TE_PDPCONTROLPLANE_IBY
 #define TE_PDPCONTROLPLANE_IBY
 
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside1.xml Testdata\configs\te_controlplanenetworkside1.xml
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside_config.txt Testdata\configs\te_controlplanenetworkside_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworkside1.xml testdata\configs\te_controlplanenetworkside1.xml
+data=EPOCROOT##epoc32\data\z\TestData\configs\te_controlplanenetworkside_config.txt testdata\configs\te_controlplanenetworkside_config.txt
 
-data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_PDP_ControlPlane.script Testdata\scripts\te_PDP_ControlPlane.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworksideloopbackcsy.ini Testdata\configs\te_controlplanenetworksideloopbackcsy.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdp_controlplane.script testdata\scripts\te_pdp_controlplane.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworksideloopbackcsy.ini testdata\configs\te_controlplanenetworksideloopbackcsy.ini
 
-data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_PDP_ControlPlane28.script Testdata\scripts\te_PDP_ControlPlane28.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside_test28.ini Testdata\configs\te_controlplanenetworkside_test28.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdp_controlplane28.script testdata\scripts\te_pdp_controlplane28.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworkside_test28.ini testdata\configs\te_controlplanenetworkside_test28.ini
 
-data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_PDP_ControlPlane29.script Testdata\scripts\te_PDP_ControlPlane29.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside_test29.ini Testdata\configs\te_controlplanenetworkside_test29.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdp_controlplane29.script testdata\scripts\te_pdp_controlplane29.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworkside_test29.ini testdata\configs\te_controlplanenetworkside_test29.ini
 
 
 #endif // TE_PDPCONTROLPLANE_IBY
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/Te_UmtsGprsSCPR.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_Cap_UmtsGprsScpr.script"-"c:\testdata\scripts\te_Cap_UmtsGprsScpr.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_UmtsGprsScprConfig1.script"-"c:\testdata\scripts\te_UmtsGprsScprConfig1.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_UmtsGprsScprConfig2.script"-"c:\testdata\scripts\te_UmtsGprsScprConfig2.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_UmtsGprsScprConfig3.script"-"c:\testdata\scripts\te_UmtsGprsScprConfig3.script"
+
+//running some of the networkingsrv test scripts. becuase there regression can be caused by us.
+
+"\sf\os\networkingsrv\networkcontrol\qosfwconfig\qostest\te_qos\scripts\TE_QoSSuite.script"-"c:\testdata\scripts\TE_QoSSuite.script"
+"\sf\os\networkingsrv\networkcontrol\qosfwconfig\qostest\te_qos\scripts\CIT_P192_Qos_SimTsy2.script"-"c:\testdata\scripts\CIT_P192_Qos_SimTsy2.script"
+"\sf\os\networkingsrv\networkingtestandutils\networkingintegrationtest\te_DedicatedSignalling1ryCtx\scripts\Te_DedicatedSignalling1ryCtx.script"-"c:\testdata\scripts\Te_DedicatedSignalling1ryCtx.script"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_mbms/group/te_mbms.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,16 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_mbms\scripts\MBMSBroadcast.script"-"c:\testdata\scripts\MBMSBroadcast.script"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_Spud.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,16 @@
+
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spud\scripts\TE_SpudUnitTest.script"-"c:\testdata\scripts\TE_SpudUnitTest.script"
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_SpudNetworkSide.xml	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_SpudNetworkSide.xml	Wed Aug 18 10:57:47 2010 +0300
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
  under the terms of "Eclipse Public License v1.0"
@@ -138,6 +138,15 @@
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Mobile</LocationRef>
     </IAP>
+	
+	<IAP operation="add">
+        <Name>Loopback_GRPS_11</Name>
+        <IAPService>OutgoingGPRS.SPUD_Echo_5</IAPService>
+        <IAPBearer>ModemBearer.Loopback_SPUD_2</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
 </IAPTable>
 
 
@@ -435,6 +444,18 @@
         <IpAddr>192.168.1.2</IpAddr>
         <UmtsR99QoSAndOnRef>UmtsR99QoSAndOn.BAD_QOS</UmtsR99QoSAndOnRef>       
     </OutgoingGPRS>
+	
+	<OutgoingGPRS operation="add">
+        <Name>SPUD_Echo_5</Name>
+      	<PDPType>IPV4</PDPType>
+        <IfParams>lowernif=RAWIP</IfParams>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
+		<IfAuthPass>aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeee</IfAuthPass>
+		<DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <IpAddr>192.168.1.2</IpAddr>
+    </OutgoingGPRS>
 </OutgoingGPRSTable>
 
 <DefaultGPRSTable>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini	Wed Aug 18 10:57:47 2010 +0300
@@ -1,6 +1,15 @@
 [ESockCheck]
 SimTsyTestNum = 0
 
+[PrimaryActivationCHAP]
+SimTsyTestNum = 69
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = 0
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
 
 [PrimaryActivationOk1]
 SimTsyTestNum = 1
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt	Wed Aug 18 10:57:47 2010 +0300
@@ -2859,4 +2859,134 @@
 NotifyContextStatusChangeType = PublishSubscribe
 # NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
 
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
\ No newline at end of file
+# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
+
+############################################################################
+###################              T E S T 69              ####################
+############################################################################
+############################################################################
+# Test case for success results for CHAP authentication protocol
+############################################################################
+[test69]
+# DefaultContextparamGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
+
+# ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+SetContextConfigGPRS = 0,Test,,0,2,0,2,RasUser,aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeee,,,,,1
+# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
+# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
+R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
+R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
+
+# TFTfilter = 0<id> 1<evaluationPrecedenceIndex> 2<srcAddr> 3<srcAddrSubnetMask>  4<protocolNumberOrNextHeader>
+#	      5<srcPortMin> 6<srcPortMax> 7<destPortMin> 8<destPortMax> 9<ipSecSPI> 10<toSorTrafficClass>
+#	      11<flowLabel>
+TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+TFTfilter = 1, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+
+#TProfileReqR99 = 0<contextName> 1<reqTraffic> 2<minTraffic> 3<reqDeliveryOrder> 4<minDeliveryOrder>
+#		  5<reqErroneousSDU> 6<minErroneousSDU> 7<maxSDUSize> 8<minSDUSize>
+#		 9<reqUpLinkBitRate> 10<reqDownLinkBitRate> 11<minUpLinkBitRate> 12<minDownLinkBitRate> 
+#		 
+#		 13<reqBitErrorRatio> 14<minBitErrorRatio> 15<reqSDUErrorRatio> 16<minSDUErrorRatio>
+#		 17<reqTrafficHandlingPriority> 18<minTrafficHandlingPriority>
+#		 19<reqTransferDelay> 20<minTransferDelay> 21<reqGuaranteedUpLinkBitRate> 22<reqGuaranteedDownLinkBitRate>
+#		 23<minGuaranteedUpLinkBitRate> 24<minGuaranteedDownLinkBitRate>
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0
+QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0
+QosProfileReqR99 = SECONDARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+QosProfileReqR99 = SECONDARY2,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0, 0, 0
+
+
+
+#TProfileNegR99 =<contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery> <negMaxSDUSize>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> 
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+QosProfileNegR99 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+
+
+#TQosProfileCapsR99 = <trafficCap> <deliveryOrderReqCap> <deliverErroneousSDUCap>
+#		      <BERCap> <SDUErrorRatioCap> <trafficHandlingPriorityCap>
+QosProfileCapsR99= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04
+
+QosNetworkNotificationType = PublishSubscribe
+# QosNetworkNotification = <contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> <negMaxSDUSize>
+QosNetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+QosNetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+
+#SetProfileFail= <contextName> <numberOfTimes> <errorCode> <setProfileDigit>
+SetProfileFail = NEG_99, 0x04, 0x02
+
+#QosprofileReqGPRS= <minPrecedence> <reqPrecedence> <minDelay> <reqDelay> <minReliability> <reqReliability> <minPeek> <reqPeek>
+#		    <minMean> <reqMean>
+QosProfileReqGPRS= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020
+QosProfileReqGPRS= 0x04, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020
+
+#QosProfileNegGPRS=<negPrecedence> <negDelay><negReliability> <negPeek> <negMean>
+QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002
+QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002
+
+#QosProfileCapsGPRS=<negPrecedenceCap> <negDelayCap> <negReliabilityCap><negPeekCap> <negMeanCap>
+QosProfileCapsGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 
+
+# QosProfileReq
+# = <TTrafficClass>, <TTrafficClass>, <TDeliveryOrder>, <TDeliveryOrder>
+# <TErroneousSDUDelivery>, <TErroneousSDUDelivery>
+# <TErroneousSDUDelivery>, <TInt iReqMaxSDUSize>, <TInt iMinAcceptableMaxSDUSize>
+# <TBitRate>, <TBitRate>, <TBitErrorRatio>, 
+# <TBitErrorRatio>, <TSDUErrorRatio>, <TSDUErrorRatio>, <TTrafficHandlingPriority>, <TTrafficHandlingPriority>
+# <TInt	iReqTransferDelay>, <TInt iMaxTransferDelay>, <TBitRate>, <TBitRate>
+
+# QosProfileNeg = <TQoSPrecedence>, <TQoSDelay>, <TQoSReliability>, <TQoSPeakThroughput>, <TQoSMeanThroughput>
+# <TTrafficClass>, <TDeliveryOrder>, <TErroneousSDUDelivery>, <TInt iMaxSDUSize>, <TBitRate>, 
+# <TBitErrorRatio>, <TSDUErrorRatio>, <TTrafficHandlingPriority>
+# <TInt iTransferDelay>, <TBitRate>		
+
+DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
+# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+
+ReleaseMode = 5, 5
+# Packet Release mode = <Release> <Duration>
+
+#RegStatus=<duration> <regStat> <networkIndex> 
+RegStatus= 5,3
+RegStatus= 2,5,0
+RegStatus= 2,7,3
+RegStatus= 5,2
+RegStatus= 2,5,0
+
+# NetworkRegStatus = <Duration>, <RegistrationStatus>
+NetworkRegStatusType = PublishSubscribe
+NetworkRegStatus= 5,2
+NetworkRegStatus= 5,1
+NetworkRegStatus= 5,1
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
\ No newline at end of file
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Wed Aug 18 10:57:47 2010 +0300
@@ -20,59 +20,59 @@
 REM Feature QoS is not included in this ROM
 REM Temporary patch
 #else
-file=ABI_DIR\DEBUG_DIR\TE_SpudNetworkSide.exe		System\Libs\TE_SpudNetworkSide.exe
+file=ABI_DIR\DEBUG_DIR\te_spudnetworkside.exe		System\Libs\te_spudnetworkside.exe
 #endif
 
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide.script 		testdata\scripts\TE_SpudNetworkSide.script 
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_ppp.script 	testdata\scripts\TE_SpudNetworkSide_ppp.script 
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_nifman.script 	testdata\scripts\TE_SpudNetworkSide_nifman.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_PppSize_spud.script 			testdata\scripts\TE_PppSize_spud.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SpudNetworkside_Channel.script 	testdata\scripts\Te_SpudNetworkside_Channel.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_r4_and_r5.script 		testdata\scripts\TE_SpudNetworkSide_r4_and_r5.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_config.txt 	testdata\configs\TE_SpudNetworkSide_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp_config.txt 	testdata\configs\TE_SpudNetworkSide_ppp_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp_config2.txt 	testdata\configs\TE_SpudNetworkSide_ppp_config2.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman_config.txt 	testdata\configs\TE_SpudNetworkSide_nifman_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside.script 		testdata\scripts\te_spudnetworkside.script 
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_ppp.script 	testdata\scripts\te_spudnetworkside_ppp.script 
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_nifman.script 	testdata\scripts\te_spudnetworkside_nifman.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pppsize_spud.script 			testdata\scripts\te_pppsize_spud.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_channel.script 	testdata\scripts\te_spudnetworkside_channel.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_r4_and_r5.script 		testdata\scripts\te_spudnetworkside_r4_and_r5.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_config.txt 	testdata\configs\te_spudnetworkside_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_ppp_config.txt 	testdata\configs\te_spudnetworkside_ppp_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_ppp_config2.txt 	testdata\configs\te_spudnetworkside_ppp_config2.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman_config.txt 	testdata\configs\te_spudnetworkside_nifman_config.txt
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudNetworkSide_config_r4_and_r5.txt   testdata\configs\te_spudNetworkSide_config_r4_and_r5.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide.xml 			testdata\configs\TE_SpudNetworkSide.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp.xml		testdata\configs\TE_SpudNetworkSide_ppp.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_PppLoopback.xml		testdata\configs\TE_SpudNetworkSide_PppLoopback.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman.xml		testdata\configs\TE_SpudNetworkSide_nifman.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_r4_and_r5.xml 			testdata\configs\TE_SpudNetworkSide_r4_and_r5.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide.ini 			testdata\configs\TE_SpudNetworkSide.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman.ini		testdata\configs\TE_SpudNetworkSide_nifman.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_platsec.ini 	testdata\configs\TE_SpudNetworkSide_platsec.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini testdata\configs\TE_SpudNetworkSideLoopbackCSY.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini	testdata\configs\TE_SpudNetworkSideLoopbackCSY_serial.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_r4_and_r5.ini 			testdata\configs\TE_SpudNetworkSide_r4_and_r5.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside.xml 			testdata\configs\te_spudnetworkside.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_ppp.xml		testdata\configs\te_spudnetworkside_ppp.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_PppLoopback.xml		testdata\configs\te_spudnetworkside_PppLoopback.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.xml		testdata\configs\te_spudnetworkside_nifman.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.xml 			testdata\configs\te_spudnetworkside_r4_and_r5.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside.ini 			testdata\configs\te_spudnetworkside.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.ini		testdata\configs\te_spudnetworkside_nifman.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_platsec.ini 	testdata\configs\te_spudnetworkside_platsec.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworksideLoopbackcsy.ini testdata\configs\te_spudnetworksideLoopbackcsy.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworksideLoopbackcsy_serial.ini	testdata\configs\te_spudnetworksideLoopbackcsy_serial.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.ini 			testdata\configs\te_spudnetworkside_r4_and_r5.ini
 #ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-data=EPOCROOT##epoc32\data\z\TestData\Configs\qospolicies.ini 					testdata\configs\qospolicies.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\qospolicies.ini 					testdata\configs\qospolicies.ini
 #endif
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_spud.ini								testdata\configs\TE_PPPSize_spud.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_spud.xml								testdata\configs\TE_PPPSize_spud.xml
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_config.txt								testdata\configs\TE_PPPSize_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt			testdata\configs\TE_SpudNetworkSide_Channel_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_spud.ini								testdata\configs\te_pppsize_spud.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_spud.xml								testdata\configs\te_pppsize_spud.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_config.txt								testdata\configs\te_pppsize_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_channel_config.txt			testdata\configs\te_spudnetworkside_channel_config.txt
 
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdplayer_ip6.script 		testdata\scripts\te_pdplayer_ip6.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6.ini								testdata\configs\te_pdplayer_ip6.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6.cfg								testdata\configs\te_pdplayer_ip6.cfg
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6_loopbackcsy.ini								testdata\configs\te_pdplayer_ip6_loopbackcsy.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6_simtsy_config.txt			testdata\configs\te_pdplayer_ip6_simtsy_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6.ini								testdata\configs\te_pdplayer_ip6.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6.cfg								testdata\configs\te_pdplayer_ip6.cfg
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6_loopbackcsy.ini								testdata\configs\te_pdplayer_ip6_loopbackcsy.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6_simtsy_config.txt			testdata\configs\te_pdplayer_ip6_simtsy_config.txt
 
 //stress tests
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdpstresstestsparam.ini						testdata\configs\te_pdpstresstestsparam.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdpstresstestsparam.ini						testdata\configs\te_pdpstresstestsparam.ini
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdpstresstest1.script 							testdata\scripts\te_pdpstresstest1.script
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdpstresstests.script 							testdata\scripts\te_pdpstresstests.script
 
 //sip tests
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_spudnetworkside_sipaddress_config.txt			testdata\configs\te_spudnetworkside_sipaddress_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_spudnetworkside_sipaddress.ini					testdata\configs\te_spudnetworkside_sipaddress.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_sipaddress_config.txt			testdata\configs\te_spudnetworkside_sipaddress_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_sipaddress.ini					testdata\configs\te_spudnetworkside_sipaddress.ini
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_sipaddress.script 		testdata\scripts\te_spudnetworkside_sipaddress.script
 
 //Min Max MMU tests
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_RawIpSize.ini			testdata\configs\te_rawipsize.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_RawIpSize_config.txt					testdata\configs\te_rawipsize_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_RawIpSize.cfg					testdata\configs\te_rawipsize.cfg
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_RawIpSize.script 		testdata\scripts\te_rawipsize.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_rawipsize.ini			testdata\configs\te_rawipsize.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_rawipsize_config.txt					testdata\configs\te_rawipsize_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_rawipsize.cfg					testdata\configs\te_rawipsize.cfg
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_rawipsize.script 		testdata\scripts\te_rawipsize.script
 
 #endif // TE_SPUD_NETWORK_SIDE_IBY
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/te_spudNetworkSide.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,23 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_pdplayer_ip6.script"-"c:\testdata\scripts\te_pdplayer_ip6.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_pdpstresstests.script"-"c:\testdata\scripts\te_pdpstresstests.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_PppSize_spud.script"-"c:\testdata\scripts\TE_PppSize_spud.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide.script"-"c:\testdata\scripts\TE_spudNetworkSide.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_SpudNetworkside_Channel.script"-"c:\testdata\scripts\TE_SpudNetworkside_Channel.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_nifman.script"-"c:\testdata\scripts\TE_spudNetworkSide_nifman.script"
+""\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_ppp_9x.script"-"c:\testdata\scripts\TE_spudNetworkSide_ppp.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_R4_and_R5.script"-"c:\testdata\scripts\TE_spudNetworkSide_R4_and_R5.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_spudnetworkside_sipaddress.script"-"c:\testdata\scripts\te_spudnetworkside_sipaddress.script"
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script	Wed Aug 18 10:57:47 2010 +0300
@@ -569,14 +569,29 @@
 RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
 END_TESTCASE            NET-Spud-NetworkSide-0830
 
+START_TESTCASE          NET-Spud-NetworkSide-0831
+//! @SYMTestCaseID      NET-Spud-NetworkSide-0831
+//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using CHAP authentication protocol.
+//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
+//! @SYMTestActions Explicitly start a connection using CHAP protocol.
+//! @SYMTestExpectedResults  Primary PDP context is activated, RConnection::Start returns KErrNone.
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestType CIT
+RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationCHAP
+DELAY 3000
+RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
+END_TESTCASE            NET-Spud-NetworkSide-0831
+
+
 run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
 //The agentdialog.ini contains UID of agent dummy notifier which will make sure that authorization info is returned successfully.
 RUN_UTILS  CopyFile z:\TestData\Configs\agentdialog.ini c:\private\101F7989\esock\agentdialog.ini
 ced -i z:\TestData\Configs\te_spudnetworkside_promptforauth.xml
 run_script z:\TestData\scripts\te_esock_test_loadesock.script
 
-START_TESTCASE          NET-Spud-NetworkSide-0831
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0831
+START_TESTCASE          NET-Spud-NetworkSide-0832
+//! @SYMTestCaseID      NET-Spud-NetworkSide-0832
 //! @SYMTestCaseDesc Sanity check: successfully activate Primary context when prompt for authorization is true.
 //! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
 //! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context.
@@ -587,7 +602,8 @@
 RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationOk1
 DELAY 3000
 RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0831
+END_TESTCASE            NET-Spud-NetworkSide-0832
+
 
 run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudRSubConn/group/te_spudRSubConn.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudRSubConn\scripts\TE_spudRSubConn.script"-"c:\testdata\scripts\TE_spudRSubConn.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudRSubConn\scripts\te_spud_staticip.script"-"c:\testdata\scripts\te_spud_staticip.script"
--- a/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconnExtFactory.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconnExtFactory.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -22,7 +22,7 @@
 
 #include <networking/qos3gpp_subconparams.h>
 #include <ecom/implementationproxy.h>
-#include <networking/qos3GPP_subconparams_factory.h>
+#include <networking/qos3gpp_subconparams_factory.h>
 
 /**
 Data required for instantiating ECOM Plugin
--- a/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconparams.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconparams.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -28,7 +28,7 @@
 #include <ecom/implementationproxy.h>
 #include <networking/qos3gpp_subconparams.h>
 #include <comms-infras/metatypearray.h>
-#include <networking/qos3GPP_subconparams_factory.h>
+#include <networking/qos3gpp_subconparams_factory.h>
 
 START_ATTRIBUTE_TABLE( CSubConQosR99ParamSet, KSubCon3GPPExtParamsFactoryUid, KSubConQosR99ParamsType )
 	REGISTER_ATTRIBUTE( CSubConQosR99ParamSet, iTrafficClass, TMetaNumber )
Binary file telephonyprotocols/rawipnif/doc_pub/Raw_IP_NIF_Detailed_Design.doc has changed
--- a/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_EtelMM.script	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_EtelMM.script	Wed Aug 18 10:57:47 2010 +0300
@@ -39,7 +39,7 @@
 //!                mobile signal, mobile auto redial etc.  
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT
-RUN_TEST_STEP 300 Te_EtelMM TestPhone
+RUN_TEST_STEP 600 Te_EtelMM TestPhone
 
 END_TESTCASE TEL-ETEL-NA-2001
 
Binary file telephonyserver/etelmultimode/doc_pub/ETelMM_API_Design_Document.doc has changed
Binary file telephonyserver/etelmultimode/doc_pub/ETelMM_Architecture_Design.doc has changed
Binary file telephonyserver/etelmultimode/doc_pub/ETelMM_UseCase_Analysis.doc has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserver/etelmultimode/group/etelmm_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\telephonyserver\etelmultimode\TETEL\te_EtelMM\TE_mmLocationServices.ini"-"c:\testdata\configs\TE_mmLocationServices.ini"
+
+"\sf\os\cellularsrv\telephonyserver\etelmultimode\TETEL\te_EtelMM\TE_EtelMM.script"-"c:\testdata\scripts\TE_EtelMM.script"
+"\sf\os\cellularsrv\telephonyserver\etelmultimode\TETEL\te_EtelMM\TE_EtelMM_LCS.script"-"c:\testdata\scripts\TE_EtelMM_LCS.script"
Binary file telephonyserver/etelpacketdata/doc_pub/ETel_Packet_API_Design.doc has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserver/etelpacketdata/group/etelpckt_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\telephonyserver\etelpacketdata\Te_EtelPacket\te_etelpacket.ini"-"c:\testdata\configs\te_etelpacket.ini"
+"\sf\os\cellularsrv\telephonyserver\etelpacketdata\Te_EtelPacket\Te_EtelPacket.script"-"c:\testdata\scripts\Te_EtelPacket.script"
+"\sf\os\cellularsrv\telephonyserver\etelpacketdata\Te_EtelPacket\Te_EtelPacket_no_adaptive_tcp_receive_window_size.script"-"c:\testdata\scripts\Te_EtelPacket_no_adaptive_tcp_receive_window_size.script"
Binary file telephonyserver/etelserverandcore/doc_pub/ETel_Core_API_Design.doc has changed
Binary file telephonyserver/etelserverandcore/doc_pub/ETel_Telephony_Server_Design.doc has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserver/etelserverandcore/group/etel_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\telephonyserver\etelserverandcore\TETEL\TE_ETEL\epocetel.ini"-"c:\testdata\configs\epocetel.ini"
+"\sf\os\cellularsrv\telephonyserver\etelserverandcore\TETEL\TE_ETEL\TE_Etel.script"-"c:\testdata\scripts\TE_Etel.script"
+
Binary file telephonyserver/etelsimtoolkit/doc_pub/(U)SAT_ETel_API_Specification.doc has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserver/etelsimtoolkit/group/etelsat_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyserver\etelsimtoolkit\tetel\Te_EtelSat\TE_EtelSat.script"-"c:\testdata\scripts\TE_EtelSat.script"
+
--- a/telephonyserver/etelsimtoolkit/tetel/Te_EtelSat/TE_EtelSat.script	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserver/etelsimtoolkit/tetel/Te_EtelSat/TE_EtelSat.script	Wed Aug 18 10:57:47 2010 +0300
@@ -31,7 +31,7 @@
 //!@SYMTestActions Tests RSat functions
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatFns
+RUN_TEST_STEP 300 Te_EtelSat TestSatFns
 
 END_TESTCASE TEL-ETEL-NA-4000
 
@@ -43,7 +43,7 @@
 //!@SYMTestActions Tests RSat Envelope Cmds functions
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatEnvelopeCmds
+RUN_TEST_STEP 300 Te_EtelSat TestSatEnvelopeCmds
 
 END_TESTCASE TEL-ETEL-NA-4001
 
@@ -55,7 +55,7 @@
 //!@SYMTestActions Tests RSat control functions
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatControl
+RUN_TEST_STEP 300 Te_EtelSat TestSatControl
 
 END_TESTCASE TEL-ETEL-NA-4002
 
@@ -67,7 +67,7 @@
 //!@SYMTestActions Calls RSat Proactive Commands
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1a
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1a
 
 END_TESTCASE TEL-ETEL-NA-4003
 
@@ -79,7 +79,7 @@
 //!@SYMTestActions Calls RSat Proactive Commands
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1b
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1b
 
 END_TESTCASE TEL-ETEL-NA-4004
 
@@ -91,7 +91,7 @@
 //!@SYMTestActions Calls RSat Proactive Commands
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1c
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1c
 
 END_TESTCASE TEL-ETEL-NA-4005
 
@@ -103,7 +103,7 @@
 //!@SYMTestActions Calls RSat Proactive Commands
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1d
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1d
 
 END_TESTCASE TEL-ETEL-NA-4006
 
@@ -115,7 +115,7 @@
 //!@SYMTestActions Calls RSat Proactive Commands
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1e
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1e
 END_TESTCASE TEL-ETEL-NA-4007
 
 START_TESTCASE TEL-ETEL-NA-4008
@@ -126,7 +126,7 @@
 //!@SYMTestActions Calls RSat Proactive Commands
 //!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
 //!@SYMTestType CT 
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1f
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1f
 END_TESTCASE TEL-ETEL-NA-4008
 
 START_TESTCASE TEL-ETEL-NA-4009
@@ -137,5 +137,5 @@
 //!@SYMTestActions Calls RSat Proactive Commands
 //!@SYMTestExpectedResults Pass, client and TSY data is consistent.
 //!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1g
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1g
 END_TESTCASE TEL-ETEL-NA-4009
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Wed Aug 18 10:57:47 2010 +0300
@@ -1178,6 +1178,13 @@
          */
         CMmONStoreTsy* GetONStoreTsy();
 
+		/**
+         * Set pointer to ONStoreTsy
+         *          
+         *
+         */
+        void SetONStoreTsy(CMmONStoreTsy* aMmONStoreTsy);
+
         /** 
          * Get pointer to DTMF Tsy
          *          
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmsecuritytsy.h	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmsecuritytsy.h	Wed Aug 18 10:57:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -241,10 +241,12 @@
          * Delivers current lock information
          *          
          *
+         * @param aTsyReqHandle
          * @param aPackage Parameters where lock information is stored
          * @return KErrNone or KErrArgument
          */
-        virtual TInt GetLockInfoL( const TDataPackage& aPackage );
+        virtual TInt GetLockInfoL( const TTsyReqHandle aTsyReqHandle,
+                const TDataPackage& aPackage );
 
         /**
          * Sets TSY notify if lock information changes
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -281,6 +281,9 @@
 
         // Notification cancels
         case EPacketQoSNotifyProfileChanged:
+            // Reset the GSM/WCDMA extension from previous notify request
+            iMmPacketQoSGsmWcdmaExt->NotifyProfileChangedCancel();
+            
             // Reset tsy request handle
             iTsyReqHandleStore->ResetTsyReqHandle( 
                 EMultimodePacketQoSNotifyParameterChanged );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -110,6 +110,7 @@
         {
         // deregister tsy object from message manager
         iMmPhone->MessageManager()->DeregisterTsyObject(this);
+		iMmPhone->SetONStoreTsy(NULL);
         }
 
     if ( NULL != iTsyReqHandleStore )
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1923,7 +1923,7 @@
         {
         CAcquireEntry* entry = NULL;
         // Call is owned, add this req handle to acquire list
-// coverity [resource_leak]
+
 // TRAP macro releases memory while exception caught and trapError != KErrNone
         TRAP( trapError, ( entry = CAcquireEntry::NewL( aTsyReqHandle ) ) );
         if ( trapError != KErrNone )
@@ -1935,6 +1935,7 @@
             {
             iList->iAcquireList.AddLast( *entry );
             }
+        // coverity[leaked_storage]
         }
 
     return KErrNone;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1461,8 +1461,8 @@
         {
         CAcquireEntry* entry = NULL;
         // Call is owned, add this req handle to acquire list
-// coverity [resource_leak]
-// TRAP macro releases memory while exception caught and trapError != KErrNone
+
+        // TRAP macro releases memory while exception caught and trapError != KErrNone
         TRAP( trapError,
             entry = CAcquireEntry::NewL( aTsyReqHandle );
             );
@@ -1475,6 +1475,7 @@
             {
             iList->iAcquireList.AddLast( *entry );
             }
+        // coverity[leaked_storage]
         }
 
     return KErrNone;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -6713,6 +6713,19 @@
     }
 
 // ---------------------------------------------------------------------------
+// CMmPhoneTsy::SetONStoreTsy
+// ONStoreTsy can set iMmONStoreTsy pointer to NULL when it is closed
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+void CMmPhoneTsy::SetONStoreTsy(
+        CMmONStoreTsy* aMmONStoreTsy
+        )
+    {
+    iMmONStoreTsy = aMmONStoreTsy;
+    }
+
+// ---------------------------------------------------------------------------
 // CMmPhoneTsy::GetONStoreTsy
 // Returns pointer to CMmONStoreTsy
 // (other items were commented in a header).
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -111,7 +111,7 @@
                 REINTERPRET_CAST( TUint32*, dataPtr ) );
             break;
                 case EMobilePhoneGetLockInfo:
-            ret = GetLockInfoL( aPackage );
+            ret = GetLockInfoL( aTsyReqHandle, aPackage );
             break;
         // Notify Change of Lock Information
         case EMobilePhoneNotifyLockInfoChange:
@@ -294,7 +294,7 @@
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
-TInt CMmSecurityTsy::GetLockInfoL( const TDataPackage& aPackage ) 
+TInt CMmSecurityTsy::GetLockInfoL( const TTsyReqHandle aTsyReqHandle, const TDataPackage& aPackage )
     {
 OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETLOCKINFOL_1, "LTSY: CMmSecurityTsy::GetLockInfoL - Client call");
     
@@ -308,13 +308,18 @@
         //save pointer to client side for completion
         iRetGetLockInfo = data;
 
+#ifdef REQHANDLE_TIMER
+        iMmPhoneTsy->SetTypeOfResponse( CMmPhoneTsy::EMultimodePhoneGetLockInfo, aTsyReqHandle );
+#else
+        iMmPhoneTsy->iTsyReqHandleStore->SetTsyReqHandle( 
+                    CMmPhoneTsy::EMultimodePhoneGetLockInfo, aTsyReqHandle );
+#endif //REQHANDLE_TIMER
+
         ret = iMmPhoneTsy->iMmPhoneExtInterface->GetLockInfoL( aPackage );
          
-        if ( KErrNone == ret )
+        if ( KErrNone != ret )
             {
-            //save req handle type
-            iMmPhoneTsy->iReqHandleType = 
-                CMmPhoneTsy::EMultimodePhoneGetLockInfo;
+            iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetLockInfo );
             }
         }
 
--- a/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -460,7 +460,7 @@
     User::LeaveIfError(configFile.Size(configFileSize));
 
     RBuf8 fileBuf;
-    fileBuf.Create(configFileSize);
+    User::LeaveIfError(fileBuf.Create(configFileSize));
     CleanupClosePushL(fileBuf);
     User::LeaveIfError(configFile.Read(fileBuf));
 
--- a/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -35,7 +35,6 @@
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_messagewaiting_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_messagewaiting_individual.script"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_enstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_enstore_individual.script"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mbmscontext_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mbmscontext_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\group\commsdbg.ini"-"c:\logs\commsdbg.ini"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\102029A2.txt"-"c:\private\10202be9\102029A2.txt"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282DFE.txt"-"c:\private\10202be9\10282DFE.txt"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282826.txt"-"c:\private\10202be9\10282826.txt"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,92 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callemergency_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callemergency_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_datacallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_datacallcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callbarring_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callbarring_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_sessionmanagement_individual.script"-"c:\testdata\scripts\te_ctsycomponent_sessionmanagement_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_eapauthentication_individual.script"-"c:\testdata\scripts\te_ctsycomponent_eapauthentication_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_usernetworkaccess_individual.script"-"c:\testdata\scripts\te_ctsycomponent_usernetworkaccess_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_networkcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_networkcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_dtmf_individual.script"-"c:\testdata\scripts\te_ctsycomponent_dtmf_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetservice_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smsstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smsstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_supplementaryservicecaps_individual.script"-"c:\testdata\scripts\te_ctsycomponent_supplementaryservicecaps_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_usimapplication_individual.script"-"c:\testdata\scripts\te_ctsycomponent_usimapplication_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonecontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonecontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smspstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smspstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smsmessaging_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smsmessaging_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonecapability_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonecapability_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smartcardapplication_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smartcardapplication_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_alternatelineservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_alternatelineservice_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_ussdmessaging_individual.script"-"c:\testdata\scripts\te_ctsycomponent_ussdmessaging_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonebookstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonebookstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_privacy_individual.script"-"c:\testdata\scripts\te_ctsycomponent_privacy_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callforwarding_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callforwarding_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_multicallcallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_multicallcallcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_networksecurity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_networksecurity_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callwaiting_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callwaiting_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_signalstrength_individual.script"-"c:\testdata\scripts\te_ctsycomponent_signalstrength_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonepower_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonepower_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_linecontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_linecontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_personalisation_individual.script"-"c:\testdata\scripts\te_ctsycomponent_personalisation_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_multimediacallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_multimediacallcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phoneidentity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phoneidentity_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_conferencecallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_conferencecallcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonestore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonestore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonesecurity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonesecurity_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_authorisation_individual.script"-"c:\testdata\scripts\te_ctsycomponent_authorisation_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_apncontrollist_individual.script"-"c:\testdata\scripts\te_ctsycomponent_apncontrollist_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetqos_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetqos_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetcontext_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetcontext_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_trafficchannel_individual.script"-"c:\testdata\scripts\te_ctsycomponent_trafficchannel_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_alternatingcall_individual.script"-"c:\testdata\scripts\te_ctsycomponent_alternatingcall_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callownership_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callownership_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_subscriberinfo_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_subscriberinfo_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_airtimeduration_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_airtimeduration_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_customipc_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_customipc_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_usertousersignalling_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_usertousersignalling_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_featmgr_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_featmgr_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_systemstate_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_systemstate_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcontrol_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callinformation_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callinformation_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_telephonyaudiocontrol_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_telephonyaudiocontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_onstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_onstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_broadcastmessaging_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_broadcastmessaging_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcompletion_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcompletion_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcost_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcost_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mms_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mms_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_fax_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_fax_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_fixeddialling_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_fixeddialling_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_ims_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_ims_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_indicator_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_indicator_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_lbs_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_lbs_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mailboxnumbers_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mailboxnumbers_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_messagewaiting_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_messagewaiting_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_enstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_enstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mbmscontext_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mbmscontext_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\102029A2.txt"-"c:\private\10202be9\102029A2.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282DFE.txt"-"c:\private\10202be9\10282DFE.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282826.txt"-"c:\private\10202be9\10282826.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282827.txt"-"c:\private\10202be9\10282827.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\standard.ini"-"c:\testdata\configs\standard.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001b.ini"-"c:\testdata\configs\testgetphoneid0001b.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001c.ini"-"c:\testdata\configs\testgetphoneid0001c.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001d.ini"-"c:\testdata\configs\testgetphoneid0001d.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001e.ini"-"c:\testdata\configs\testgetphoneid0001e.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001f.ini"-"c:\testdata\configs\testgetphoneid0001f.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001g.ini"-"c:\testdata\configs\testgetphoneid0001g.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001h.ini"-"c:\testdata\configs\testgetphoneid0001h.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001i.ini"-"c:\testdata\configs\testgetphoneid0001i.ini"
\ No newline at end of file
--- a/telephonyserverplugins/common_tsy/test/component/inc/cctsyonstorefu.h	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsyonstorefu.h	Wed Aug 18 10:57:47 2010 +0300
@@ -64,6 +64,7 @@
     void TestGetInfo0001bL();
     void TestGetInfo0001cL();
     void TestGetInfo0001dL();
+	void TestGetInfo0001eL();
 	void TestGetInfo0002L();
 	void TestGetInfo0003L();
 	void TestGetInfo0004L();
--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script	Wed Aug 18 10:57:47 2010 +0300
@@ -276,6 +276,17 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyONStoreFU.TestGetInfo0001dL
 END_TESTCASE BA-CTSY-PBON-OSGI-0001d
 
+START_TESTCASE BA-CTSY-PBON-OSGI-0001e
+//!@SYMTestCaseID BA-CTSY-PBON-OSGI-0001e
+//!@SYMComponent telephony_ctsy
+//!@SYMTestCaseDesc Test support in CTSY for ONStore is closed before complete initialisation
+//!@SYMTestPriority High
+//!@SYMTestActions Invokes RMobileONStore::GetInfo
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyONStoreFU.TestGetInfo0001eL
+END_TESTCASE BA-CTSY-PBON-OSGI-0001e
+
 START_TESTCASE BA-CTSY-PBON-OSGI-0002
 //!@SYMTestCaseID BA-CTSY-PBON-OSGI-0002
 //!@SYMComponent telephony_ctsy
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsyonstorefu.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsyonstorefu.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -67,6 +67,7 @@
     ADD_TEST_STEP_ISO_CPP(CCTsyONStoreFU, TestGetInfo0001bL);
     ADD_TEST_STEP_ISO_CPP(CCTsyONStoreFU, TestGetInfo0001cL);
     ADD_TEST_STEP_ISO_CPP(CCTsyONStoreFU, TestGetInfo0001dL);
+	ADD_TEST_STEP_ISO_CPP(CCTsyONStoreFU, TestGetInfo0001eL);
 	ADD_TEST_STEP_ISO_CPP(CCTsyONStoreFU, TestGetInfo0002L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyONStoreFU, TestGetInfo0003L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyONStoreFU, TestGetInfo0004L);
@@ -2676,6 +2677,71 @@
     CleanupStack::PopAndDestroy(5, this); // this, etc...
     }
 
+
+/**
+@SYMTestCaseID BA-CTSY-PBON-OSGI-0001e
+@SYMComponent  telephony_ctsy
+@SYMTestCaseDesc Test support in CTSY for ONStore is closed before complete initialisation
+@SYMTestPriority High
+@SYMTestActions Invokes RMobileONStore::GetInfo
+@SYMTestExpectedResults Pass
+@SYMTestType CT
+*/
+void CCTsyONStoreFU::TestGetInfo0001eL()
+    {
+    // Since we can not get the ON store info from the SIM if the ADN storage was not initilized, the 
+    // CTSY must make sure that the ADN storage was initilize before requesting to get the ON store info from 
+    // the LTSY. This test test if the CTSY knows to create a new ADN and wait for the initilization to complete.
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 expData;
+    CleanupClosePushL(expData);
+
+    RBuf8 completeData;
+    CleanupClosePushL(completeData);
+
+    RMobileONStore  onStore;
+    TInt ret = onStore.Open(iPhone);
+    ASSERT_EQUALS(KErrNone, ret);
+    CleanupClosePushL(onStore);
+        
+        
+    TRequestStatus requestStatus;
+    RMobileONStore::TMobileONStoreInfoV1 storeInfo;
+    RMobileONStore::TMobileONStoreInfoV1Pckg storePckg(storeInfo);
+    
+    TName name(KETelIccAdnPhoneBook);
+    expData.Close();
+    TMockLtsyPhoneBookData0 storeInitData(name);
+    storeInitData.SerialiseL(expData);
+    iMockLTSY.ExpectL(EMmTsyPhoneBookStoreInitIPC, expData);   
+
+    onStore.GetInfo(requestStatus, storePckg);      
+    ASSERT_EQUALS(KRequestPending, requestStatus.Int());
+    User::After(KOneSecond);
+    ASSERT_EQUALS(KRequestPending, requestStatus.Int());
+
+    CStorageInfoData storageData;
+    SetStorageInfoData(storageData);
+    
+    ASSERT_EQUALS(KErrNone, iMockLTSY.PauseCompletion());
+    
+    TMockLtsyPhoneBookData1< CStorageInfoData > retStoreInitC(name, storageData);
+    completeData.Close();
+    retStoreInitC.SerialiseL(completeData);
+    onStore.Close();
+    iMockLTSY.CompleteL(EMmTsyPhoneBookStoreInitIPC, KErrNone, completeData, 0);
+
+    ASSERT_EQUALS(KErrNone, iMockLTSY.ResumeCompletion());
+
+    User::After(KOneSecond);
+    
+    CleanupStack::PopAndDestroy(4, this); // this, etc...
+    }
+
+
 /**
 @SYMTestCaseID BA-CTSY-PBON-OSGI-0002
 @SYMComponent  telephony_ctsy
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsypacketqosfu.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsypacketqosfu.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1520,6 +1520,46 @@
 	AssertMockLtsyStatusL();
 	ASSERT_EQUALS(KErrCancel, requestNotify.Int());
 
+    //-------------------------------------------------------------------------
+    // Test change of profile in the LTSY when the Notification request has
+	// been cancelled by the client
+    //-------------------------------------------------------------------------
+	RPacketQoS::TQoSR5Negotiated qosR5Negotiated;
+	TPckg< RPacketQoS::TQoSR5Negotiated > pckgQoSR5Negotiated(qosR5Negotiated);
+
+	ChangeProfileDataL<RPacketQoS::TQoSR5Requested>(packetContext, packetQoS, contextName, data);
+
+    TRequestStatus requestGet;
+	packetQoS.GetProfileParameters(requestGet, pckgQoSR5Negotiated);
+	
+	User::WaitForRequest(requestGet);
+	AssertMockLtsyStatusL();
+	ASSERT_EQUALS(KErrNone, requestGet.Int());
+	    
+	ASSERT_EQUALS(qosR5Negotiated.iSignallingIndication        , 1                                            );
+	ASSERT_EQUALS(qosR5Negotiated.iSourceStatisticsDescriptor  , RPacketQoS::ESourceStatisticsDescriptorSpeech);
+	ASSERT_EQUALS(qosR5Negotiated.iTrafficClass                , RPacketQoS::ETrafficClassStreaming           );
+	ASSERT_EQUALS(qosR5Negotiated.iDeliveryOrderReqd           , RPacketQoS::EDeliveryOrderRequired           );
+	ASSERT_EQUALS(qosR5Negotiated.iDeliverErroneousSDU         , RPacketQoS::EErroneousSDUDeliveryRequired    );
+	ASSERT_EQUALS(qosR5Negotiated.iMaxSDUSize                  , 0x100                                        );
+	ASSERT_EQUALS(qosR5Negotiated.iMaxRate.iUplinkRate         , 10000                                        );
+	ASSERT_EQUALS(qosR5Negotiated.iMaxRate.iDownlinkRate       , 10000                                        );
+	ASSERT_EQUALS(qosR5Negotiated.iBER                         , RPacketQoS::EBEROnePerHundredThousand        );
+	ASSERT_EQUALS(qosR5Negotiated.iSDUErrorRatio               , RPacketQoS::ESDUErrorRatioOnePerTenThousand  );
+	ASSERT_EQUALS(qosR5Negotiated.iTrafficHandlingPriority     , RPacketQoS::ETrafficPriority2                );
+	ASSERT_EQUALS(qosR5Negotiated.iTransferDelay               , 1000                                         );
+	ASSERT_EQUALS(qosR5Negotiated.iGuaranteedRate.iDownlinkRate, 1000                                         );
+	ASSERT_EQUALS(qosR5Negotiated.iGuaranteedRate.iUplinkRate  , 1000                                         );
+
+	TRequestStatus requestNotify1;
+	packetQoS.NotifyProfileChanged(requestNotify1, pckgQoSGPRSNegotiated);   
+
+    ChangeProfileDataL<RPacketQoS::TQoSGPRSRequested>(packetContext, packetQoS, contextName, data);
+
+	User::WaitForRequest(requestNotify1);
+	AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, requestNotify1.Int());
+
 	CleanupStack::PopAndDestroy(3); // packetService, packetContext, packetQoS
 	CleanupStack::PopAndDestroy(2); // data, this
 	
--- a/telephonyserverplugins/common_tsy/test/integration/group/integration_test.pkg	Tue Jul 06 15:36:38 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\ctsyintegration_setup.ini"-"c:\testdata\configs\ctsyintegration_setup.ini"
-// note using NTN version of config data here:
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\ctsyintegration_ntn_data.ini"-"c:\testdata\configs\ctsyintegration_data.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\uk_commdb.cfg"-"c:\testdata\configs\uk_commdb.cfg"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\testexecute.ini"-"c:\system\data\testexecute.ini"
-
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_airtimeduration_auto.script"-"c:\testdata\scripts\te_ctsyintegration_airtimeduration_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_alternatelineservice_auto.script"-"c:\testdata\scripts\te_ctsyintegration_alternatelineservice_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_apncontrollist_auto.script"-"c:\testdata\scripts\te_ctsyintegration_apncontrollist_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_broadcastmessaging_auto.script"-"c:\testdata\scripts\te_ctsyintegration_broadcastmessaging_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callbarring_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callbarring_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callcontrol_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callcontrol_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callcost_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callcost_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callforwarding_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callforwarding_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callownership_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callownership_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callwaiting_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callwaiting_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_conferencecallcontrol1_auto.script"-"c:\testdata\scripts\te_ctsyintegration_conferencecallcontrol1_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_conferencecallcontrol2_auto.script"-"c:\testdata\scripts\te_ctsyintegration_conferencecallcontrol2_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_conferencecallcontrol3_auto.script"-"c:\testdata\scripts\te_ctsyintegration_conferencecallcontrol3_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_customapi_auto.script"-"c:\testdata\scripts\te_ctsyintegration_customapi_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_dtmf_auto.script"-"c:\testdata\scripts\te_ctsyintegration_dtmf_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_enstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_enstore_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_fixeddialling_auto.script"-"c:\testdata\scripts\te_ctsyintegration_fixeddialling_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_indicator_auto.script"-"c:\testdata\scripts\te_ctsyintegration_indicator_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_mailboxnumbers_auto.script"-"c:\testdata\scripts\te_ctsyintegration_mailboxnumbers_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_networkcontrol_auto.script"-"c:\testdata\scripts\te_ctsyintegration_networkcontrol_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_networksecurity_auto.script"-"c:\testdata\scripts\te_ctsyintegration_networksecurity_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_onstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_onstore_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_packetcontext_auto.script"-"c:\testdata\scripts\te_ctsyintegration_packetcontext_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_packetservice_auto.script"-"c:\testdata\scripts\te_ctsyintegration_packetservice_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonebookstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonebookstore_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonecapability_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonecapability_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phoneidentity_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phoneidentity_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonepower_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonepower_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonesecurity_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonesecurity_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonestore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonestore_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_signalstrength_auto.script"-"c:\testdata\scripts\te_ctsyintegration_signalstrength_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_smsmessaging_auto.script"-"c:\testdata\scripts\te_ctsyintegration_smsmessaging_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_smspstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_smspstore_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_smsstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_smsstore_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_subscriberinfo_auto.script"-"c:\testdata\scripts\te_ctsyintegration_subscriberinfo_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_supplementaryservicecaps_auto.script"-"c:\testdata\scripts\te_ctsyintegration_supplementaryservicecaps_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_usernetworkaccess_auto.script"-"c:\testdata\scripts\te_ctsyintegration_usernetworkaccess_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_usimapplication_auto.script"-"c:\testdata\scripts\te_ctsyintegration_usimapplication_auto.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_ussdmessaging_auto.script"-"c:\testdata\scripts\te_ctsyintegration_ussdmessaging_auto.script"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/ctsydispatchlayer/test/dispatchertests/group/te_ctsydispatcher_component.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent.script"-"c:\testdata\scripts\te_ctsydispatchcomponent.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_multiparty_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_multiparty_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_callcontrol_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_callcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_cellbroadcast_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_cellbroadcast_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_packetservices_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_packetservices_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebook_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebook_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebooken_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebooken_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebookon_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebookon_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phone_hwrm_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phone_hwrm_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phone_individual.scriptt"-"c:\testdata\scripts\te_ctsydispatchcomponent_phone_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sat_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sat_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_security_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_security_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sim_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sim_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sms_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sms_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_suppl_serv_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_suppl_serv_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebooken_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebooken_negative_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebookon_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebookon_neg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebook_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebook_negative_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_cellbroadcast_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_cellbroadcast_neg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sim_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sim_neg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sms_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sms_neg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_multiparty_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_multiparty_neg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_callcontrol_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_callcontrol_negative_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_packetservices_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_packetservices_neg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phone_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phone_negative_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_security_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_security_negative_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_suppl_serv_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_suppl_serv_negative_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sat_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sat_neg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_timeout.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_timeout.script"
+
+
+
+
+
--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp	Wed Aug 18 10:57:47 2010 +0300
@@ -27,9 +27,9 @@
 
 SOURCEPATH      ../src
 
-SOURCE          CMmMessageRouter.CPP
-SOURCE          CmmCustomStubExt.cpp
-SOURCE          CMmMockMessHandler.cpp
+SOURCE          cmmmessagerouter.cpp
+SOURCE          cmmcustomstubext.cpp
+SOURCE          cmmmockmesshandler.cpp
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../simatk_tsy_stub/inc
--- a/telephonyserverplugins/licenseetsystub/simatk_tsy_stub/group/simatktsy.mmp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/simatk_tsy_stub/group/simatktsy.mmp	Wed Aug 18 10:57:47 2010 +0300
@@ -34,7 +34,7 @@
 USERINCLUDE     ../../licensee_tsy_stub/inc
 
 
-LIBRARY         ETel.lib             // Etel server and core API
+LIBRARY         etel.lib             // Etel server and core API
 LIBRARY         euser.lib            // E32 user library
 
 LINKAS          SIMATKTSY.dll
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/multimodetsy/group/te_mmtsy_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,22 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+
+"\sf\os\cellularsrv\telephonyserverplugins\multimodetsy\test\Te_LoopBack\Te_LoopBack.script"-"c:\testdata\scripts\Te_LoopBack.script"
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simatktsy/tests/group/te_csat_component.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,40 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_providelocalinfo_individual.script"-"c:\testdata\scripts\te_csatcomponent_providelocalinfo_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendussd_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendussd_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_frames_individual.script"-"c:\testdata\scripts\te_csatcomponent_frames_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupeventlist_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupeventlist_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_refresh_individual.script"-"te_csatcomponent_refresh_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupmenu_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupmenu_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_displaytext_individual.script"-"c:\testdata\scripts\te_csatcomponent_displaytext_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_getinput_individual.script"-"c:\testdata\scripts\te_csatcomponent_getinput_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_getinkey_individual.script"-"c:\testdata\scripts\te_csatcomponent_getinkey_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendsms_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendsms_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_openchannel_individual.script"-"c:\testdata\scripts\te_csatcomponent_openchannel_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupcall_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupcall_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_closechannel_individual.script"-"c:\testdata\scripts\te_csatcomponent_closechannel_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_multimediamsg_individual.script"-"c:\testdata\scripts\te_csatcomponent_multimediamsg_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_languagenotification_individual.script"-"c:\testdata\scripts\te_csatcomponent_languagenotification_individual.scriptt"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_selectitem_individual.script"-"c:\testdata\scripts\te_csatcomponent_selectitem_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupidlemodetext_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupidlemodetext_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendss_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendss_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendreceivedata_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendreceivedata_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_senddtmf_individual.script"-"c:\testdata\scripts\te_csatcomponent_senddtmf_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_getchannelstatus_individual.script"-"c:\testdata\scripts\te_csatcomponent_getchannelstatus_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_playtone_individual.script"-"c:\testdata\scripts\te_csatcomponent_playtone_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_launchbrowser_individual.script"-"c:\testdata\scripts\te_csatcomponent_launchbrowser_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_individual.script"-"c:\testdata\scripts\te_csatcomponent_individual.script"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/group/simtsy_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,44 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\test_config.txt"-"c:\testdata\configs\test_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimCed.cfg"-"c:\testdata\configs\Te_SimCed.cfg"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config1.txt"-"c:\testdata\configs\Te_Sim_config1.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config2.txt"-"c:\testdata\configs\Te_Sim_config2.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config3.txt"-"c:\testdata\configs\Te_Sim_config3.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config4.txt"-"c:\testdata\configs\Te_Sim_config4.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimData\Te_SimData_config.txt"-"c:\testdata\configs\Te_SimData_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\te_simeap\te_simeap_config.txt"-"c:\testdata\configs\te_simeap_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimMisc\Te_SimMisc_config.txt"-"c:\testdata\configs\Te_SimMisc_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimNetwork\Te_SimNetwork_config.txt"-"c:\testdata\configs\Te_SimNetwork_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPacket\Te_SimPacket_config.txt"-"c:\testdata\configs\Te_SimPacket_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPhBk\Te_SimPhBk_config.txt"-"c:\testdata\configs\Te_SimPhBk_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSms\Te_SimSms_config.txt"-"c:\testdata\configs\Te_SimSms_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSS\Te_SimSS_config.txt"-"c:\testdata\configs\Te_SimSS_config.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimVoice\Te_SimVoice_config.txt"-"c:\testdata\configs\Te_SimVoice_config.txt"
+
+
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim.script"-"c:\testdata\scripts\Te_Sim.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimData\Te_SimData.script"-"c:\testdata\scripts\Te_SimData.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\te_simeap\te_simeap.script"-"c:\testdata\scripts\te_simeap.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimMisc\Te_SimMisc.script"-"c:\testdata\scripts\Te_SimMisc.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimNetwork\Te_SimNetwork.script"-"c:\testdata\scripts\Te_SimNetwork.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPacket\Te_SimPacket.script"-"c:\testdata\scripts\Te_SimPacket.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPhBk\Te_SimPhBk.script"-"c:\testdata\scripts\Te_SimPhBk.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSms\Te_SimSms.script"-"c:\testdata\scripts\Te_SimSms.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSS\Te_SimSS.script"-"c:\testdata\scripts\Te_SimSS.script"
+"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimVoice\Te_SimVoice.script"-"c:\testdata\scripts\Te_SimVoice.script"
+
+
--- a/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -111,8 +111,6 @@
 		(aContextConfigLHS.iProtocolConfigOption.iAuthProtocol != aContextConfigRHS.iProtocolConfigOption.iAuthProtocol) ||
 		(aContextConfigLHS.iProtocolConfigOption.iUsername.Compare(aContextConfigRHS.iProtocolConfigOption.iUsername) != 0) ||
 		(aContextConfigLHS.iProtocolConfigOption.iPassword.Compare(aContextConfigRHS.iProtocolConfigOption.iPassword) != 0) ||
-		(aContextConfigLHS.iProtocolConfigOption.iChallenge.Compare(aContextConfigRHS.iProtocolConfigOption.iChallenge) != 0) ||
-		(aContextConfigLHS.iProtocolConfigOption.iResponse.Compare(aContextConfigRHS.iProtocolConfigOption.iResponse) != 0) ||
 		// These line are commented as these parameters currently are usually returned by the network and not required for
 		// setting the context configuration
 		//		(aContextConfigLHS.iProtocolConfigOption.iPrimaryDNS.Compare(aContextConfigRHS.iProtocolConfigOption.iPrimaryDNS) != 0) ||
@@ -120,9 +118,19 @@
 		(aContextConfigLHS.iProtocolConfigOption.iId != aContextConfigRHS.iProtocolConfigOption.iId) ||
 		(aContextConfigLHS.iPdpHeaderCompression != aContextConfigRHS.iPdpHeaderCompression) ||
 		(aContextConfigLHS.iPdpDataCompression != aContextConfigRHS.iPdpDataCompression))
-		{
+	    // challenge is generated randomly and response is generated using MD5 in CHAP protocol, so it is not possible to check
+	    {
 		return EFalse;
 		}
+	else if (aContextConfigLHS.iProtocolConfigOption.iAuthProtocol != RPacketContext::EProtocolCHAP) 
+	    {// if not CHAP we still try to check challenge and response just in case
+        if ((aContextConfigLHS.iProtocolConfigOption.iChallenge.Compare(aContextConfigRHS.iProtocolConfigOption.iChallenge) != 0) ||
+	        (aContextConfigLHS.iProtocolConfigOption.iResponse.Compare(aContextConfigRHS.iProtocolConfigOption.iResponse) != 0))
+            {
+            return EFalse;
+            }
+	    }
+
 		// else considered equal.
 		
 	return ETrue;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/dial/group/dial_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyutils\dial\Test\TE_Dial\TE_Dial.script"-"c:\testdata\scripts\TE_Dial.script"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/etel3rdpartyapi/Group/etelisv_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv.ini"-"c:\testdata\configs\TE_EtelIsv.ini"
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv.cfg"-"c:\testdata\configs\TE_EtelIsv.cfg"
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv_config.txt"-"c:\testdata\configs\TE_EtelIsv_config.txt"
+
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv.script"-"c:\testdata\scripts\TE_EtelIsv.script"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/etel3rdpartyapi/Test/te_etelisvcaps/group/tetelisvcaps_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,22 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\testdata\te_etelisvcaps.ini"-"c:\testdata\configs\te_etelisvcaps.ini"
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\testdata\te_etelisvcaps_comms.cfg"-"c:\testdata\configs\te_etelisvcaps_comms.cfg"
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\testdata\te_etelisvcaps_simtsy.cfg"-"c:\testdata\configs\te_etelisvcaps_simtsy.cfg"
+
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\scripts\te_etelisvcaps.script"-"c:\testdata\scripts\te_etelisvcaps.script"
+"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\scripts\te_etelisvcaps_teststeps.script"-"c:\testdata\scripts\te_etelisvcaps_teststeps.script"
+
--- a/telephonyutils/etel3rdpartyapi/src/TelephonyFuncCall.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyutils/etel3rdpartyapi/src/TelephonyFuncCall.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -437,6 +437,7 @@
 		aTelCallStatus=CTelephony::EStatusReconnectPending;
 		break;
 	case RMobileCall::EStatusDisconnecting:
+	case RMobileCall::EStatusDisconnectingWithInband:
 		aTelCallStatus=CTelephony::EStatusDisconnecting;
 		break;
 	case RMobileCall::EStatusHold:
--- a/telephonyutils/etel3rdpartyapi/src/TelephonyFunctions.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/telephonyutils/etel3rdpartyapi/src/TelephonyFunctions.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -354,14 +354,14 @@
 	for( TInt i=0; i<EMaxNumberOperations; i++)
 		{
 		TRequestStatus dummy(KErrNone);
-		iReqPendingTable.Append(EFalse);
-		iReqStatusTable.Append(&dummy);
+		iReqPendingTable.AppendL(EFalse);
+		iReqStatusTable.AppendL(&dummy);
 		}
 	for( TInt j=0; j<CTelephony::EISVMaxNumOfCalls; j++)
 		{
 		RMobileCall aDummyCall;
-		iCallPool.Append(aDummyCall);
-		iCallPoolStatus.Append(EUnset);
+		iCallPool.AppendL(aDummyCall);
+		iCallPoolStatus.AppendL(EUnset);
 		}
 
 	__ASSERT_DEBUG(iState==EIdle, User::Invariant());
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/telephonywatchers/group/telwatcher_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers.cfg"-"c:\testdata\configs\TE_TelWatchers.cfg"
+"\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers_config.txt"-"c:\testdata\configs\TE_TelWatchers_config.txt"
+
+"\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers.script"-"c:\testdata\scripts\TE_TelWatchers.script"
+
+
--- a/wapstack/wapmessageapi/client/wapmessage.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/wapstack/wapmessageapi/client/wapmessage.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -15,6 +15,7 @@
 
 
 #include <wapmessage.h>
+#include <in_iface.h>
 #include <ecom/ecom.h>
 
 /** The WAP Messaging API.  Four interfaces are defined that provide bound and fully-specified versions of WDP and Connectionless Push.
--- a/wapstack/wapmessageapi/group/swapmsg.mmp	Tue Jul 06 15:36:38 2010 +0300
+++ b/wapstack/wapmessageapi/group/swapmsg.mmp	Wed Aug 18 10:57:47 2010 +0300
@@ -26,12 +26,11 @@
 
 UID	0x10009D8D 	0x101fbb36
 VENDORID 0x70000001
-	
-#include <comms-infras/commsdebugutility.mmh>
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 USERINCLUDE		 ../. ../inc
+USERINCLUDE 	 ../traces
 
 SOURCEPATH ../sws
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wapstack/wapmessageapi/group/wapmessage_test.pkg	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,22 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\wapstack\te_wapstack\testdata\WapStackSuite_Config.ini"-"c:\testdata\configs\WapStackSuite_Config.ini"
+"\sf\os\cellularsrv\wapstack\te_wapstack\testdata\WapStackSuite.ini"-"c:\testdata\configs\WapStackSuite.ini"
+"\sf\os\cellularsrv\wapstack\te_wapstack\scripts\Te_WapStackSuite.script"-"c:\testdata\scripts\Te_WapStackSuite.script"
+
+
+
--- a/wapstack/wapmessageapi/inc/wapmessage.h	Tue Jul 06 15:36:38 2010 +0300
+++ b/wapstack/wapmessageapi/inc/wapmessage.h	Wed Aug 18 10:57:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,8 +20,6 @@
 #include <e32base.h>
 #include <e32std.h>
 #include <in_sock.h>
-#include <nifman.h>
-#include <in_iface.h>
 
 /** 
 * @file
--- a/wapstack/wapmessageapi/sws/ActiveSocket.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/wapstack/wapmessageapi/sws/ActiveSocket.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -12,6 +12,10 @@
 //
 // Description:
 //
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ActiveSocketTraces.h"
+#endif
 
 #include "ActiveSocket.h"
 #include <es_wsms.h>
@@ -19,7 +23,6 @@
 #include "wapmsgerr.h"
 #include <wap_sock.h>
 #include "WapMessageApiAgent.h"
-#include "WapSwsLog.h"
 #include "WapMsgUtils.h"
 
 using namespace Wap;
@@ -81,7 +84,7 @@
 			}
 		default:
 		    {
-			LOG(SwsLog::Printf(_L("CActiveSocket::NewL Unknown Bearer Type"));)
+            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKET_NEWL_1, "CActiveSocket::NewL Unknown Bearer Type");
 			User::Leave(Wap::EBearerError);
 		    }
 		}
@@ -144,7 +147,7 @@
 			}
 		default:
 		    {
-			LOG(SwsLog::Printf(_L("CActiveSocket::NewL Unknown Bearer Type"));)
+		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKET_NEWL_1_1, "CActiveSocket::NewL Unknown Bearer Type");
 			User::Leave(Wap::EBearerError);
 		    }
 		}
@@ -270,7 +273,7 @@
 		}
 	else
 		{
-		LOG(SwsLog::Printf(_L("CActiveSocketUDP::GetServerAddress: Alloc Memory Err=%d"), err);)
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKET_GETREMOTEADDRESS_1, "CActiveSocket::GetRemoteAddress: Alloc Memory Err=%d", err);
 		}
 	return err;
 	}
@@ -482,7 +485,7 @@
 		{
 	case ESocketWaitingForLength:
 			{
-			LOG(SwsLog::Printf(_L("CActiveSocketSMS::RunL() ESocketWaitingForLength"));)
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_RUNL_1, "CActiveSocketSMS::RunL() ESocketWaitingForLength");
 			iMessageRecord->SetDataState(EPendingLength);
 			iSocketState=ESocketIdle;
 			TWapNotificationInfo info(iBearerType, iStatus.Int());
@@ -492,7 +495,7 @@
 			}
 	case ESocketWaitingForData:
 			{
-			LOG(SwsLog::Printf(_L("CActiveSocketSMS::RunL() ESocketWaitingForData"));)
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_RUNL_2, "CActiveSocketSMS::RunL() ESocketWaitingForData");
 			iMessageRecord->SetDataState(EPendingData);
 			iSocketState=ESocketIdle;
 			TWapNotificationInfo info(iBearerType, iStatus.Int());
@@ -502,7 +505,7 @@
 			break;
 			}
 	default:
-		LOG(SwsLog::Printf(_L("CActiveSocketSMS::RunL() Unknown State")););
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_RUNL_3, "CActiveSocketSMS::RunL() Unknown State");
 		}
 	}
 void CActiveSocketSMS::DoCancel() 
@@ -526,7 +529,7 @@
 			break;
 			}
 	default:
-		LOG(SwsLog::Printf(_L("CActiveSocketSMS::DoCancel() Unknown State")););	
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_DOCANCEL_1, "CActiveSocketSMS::DoCancel() Unknown State");	
 		}
 	}
 
@@ -662,7 +665,7 @@
 		{
 	case ESocketWaitingForLength:
 			{
-			LOG(SwsLog::Printf(_L("CActiveSocketUDP::RunL() ESocketWaitingForLength"));)
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_RUNL_1, "CActiveSocketUDP::RunL() ESocketWaitingForLength");        
 			iMessageRecord->SetPduSize(iBuf.Length()+ iRxlength());
 			if(iRxlength() > 0)
 				{
@@ -680,7 +683,7 @@
 			}
 	case ESocketWaitingForData:
 			{
-			LOG(SwsLog::Printf(_L("CActiveSocketUDP::RunL() ESocketWaitingForData"));)
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_RUNL_2, "CActiveSocketUDP::RunL() ESocketWaitingForData");
 			iMessageRecord->SetDataState(EPendingData);
 			iSocketState=ESocketIdle;
 			TWapNotificationInfo info(iBearerType, iStatus.Int());
@@ -689,7 +692,7 @@
 			break;
 			}
 	default:
-		LOG(SwsLog::Printf(_L("CActiveSocketUDP::RunL() Unknown State"));)
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_RUNL_3, "CActiveSocketUDP::RunL() Unknown State");
 		break;
 		}
 	}
@@ -714,7 +717,7 @@
 			break;
 			}
 	default:
-		LOG(SwsLog::Printf(_L("CActiveSocketUDP::DoCancel() Unknown State")););	
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_DOCANCEL_1, "CActiveSocketUDP::DoCancel() Unknown State");	
 		}
 	}
 
@@ -931,7 +934,7 @@
 	if (!iWspHeader && !iWspBody)
 		{
 		// if no data, should not be here at all
-		LOG(SwsLog::Printf(_L("CWspMessageRecord::GetWspData() No Data Available"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGERECORD_GETWSPDATA_1, "CWspMessageRecord::GetWspData() No Data Available");
 		CleanUpData();
 		return KErrBadDescriptor;
 		}
@@ -1065,7 +1068,7 @@
 	if (!iPdu)
 		{
 		//Should not be here at all
-		LOG(SwsLog::Printf(_L("CWdpMessageRecord::GetPduData No Data Available"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGERECORD_GETPDUDATA_1, "CWdpMessageRecord::GetPduData No Data Available");
 		CleanUpData();
 		return KErrBadDescriptor;
 		}
--- a/wapstack/wapmessageapi/sws/CLWSPPduHandler.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/wapstack/wapmessageapi/sws/CLWSPPduHandler.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,9 +13,13 @@
 // Description:
 //
 
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CLWSPPduHandlerTraces.h"
+#endif
+
 #include "CLWSPPduHandler.h"
 #include "wapmsgerr.h"
-#include "WapSwsLog.h"
 
 void CCLWSPPduHandler::UnpackWSPPduL(HBufC8* aWSPPdu, TWSPPduType& aType, HBufC8*& aWSPHeader, HBufC8*& aBody, TUint8& aId, TWSPStatus& aStatus)
 /** 
@@ -35,8 +39,8 @@
 	TPtr8 des=aWSPPdu->Des();
 	if(des.Length() < KPDUTransactionIDAndPDUTypeLength)
 	{
-		LOG(SwsLog::Printf(_L("CCLWSPPduHandler::UnpackWSPPduL() Corrupted InComing Wsp PDU"));)
-		User::Leave(KErrCorrupt);
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLWSPPDUHANDLER_UNPACKWSPPDUL_1, "CCLWSPPduHandler::UnpackWSPPduL() Corrupted InComing Wsp PDU");
+        User::Leave(KErrCorrupt);
 	}
 	aId=des[KPDUHeaderTransactionIDOffSet];
 	aType=TWSPPduType(des[KPDUHeaderWSPPDUTypeOffSet]);
@@ -49,7 +53,7 @@
 		UnpackPushPduL(aWSPPdu, aWSPHeader, aBody);
 		break;
 	default:
-		LOG(SwsLog::Printf(_L("CCLWSPPduHandler::UnpackWSPPduL() Unknown InComing Wsp PDU Type"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLWSPPDUHANDLER_UNPACKWSPPDUL_2, "CCLWSPPduHandler::UnpackWSPPduL() Unknown InComing Wsp PDU Type");
 		User::Leave(KErrCorrupt);
 		}
 	}
@@ -85,8 +89,8 @@
 		break;
 
 	default:
-		LOG(SwsLog::Printf(_L("CCLWSPPduHandler::PackWSPPduL() Unknown Method Invoke Wsp PDU Type"));)
-		User::Leave(Wap::EWspClParameterError);
+	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLWSPPDUHANDLER_PACKWSPPDUL_1, "CCLWSPPduHandler::PackWSPPduL() Unknown Method Invoke Wsp PDU Type");
+	    User::Leave(Wap::EWspClParameterError);
 		}
 	}
 
--- a/wapstack/wapmessageapi/sws/WapMessageApiAgent.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ b/wapstack/wapmessageapi/sws/WapMessageApiAgent.cpp	Wed Aug 18 10:57:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -12,13 +12,16 @@
 //
 // Description:
 //
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "WapMessageApiAgentTraces.h"
+#endif
 
 #include "WapMessageApiAgent.h"
 #include "WapMsgUtils.h"
 #include "CLWSPPduHandler.h"
 #include <es_wsms.h>
 #include <wapmsgerr.h>
-#include "WapSwsLog.h"
 
 CWapAsyncCallBack::CWapAsyncCallBack( const TCallBack& aCallBack, TInt aPriority )
 :   CActive( aPriority ), iCallBack( aCallBack )
@@ -191,14 +194,14 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalPort: Trying to GetLocalPort on unconnected API."));)
-		return KErrNotReady;
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALPORT_1, "CWapMessageApiAgent::GetLocalPort: Trying to GetLocalPort on unconnected API.");
+        return KErrNotReady;
 		}
 	CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer);
 	if (!sock)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalPort: Can not find Last Bearer."));)
-		return Wap::EBearerError;
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALPORT_2, "CWapMessageApiAgent::GetLocalPort: Can not find Last Bearer.");
+        return Wap::EBearerError;
 		}
 	sock->GetLocalPort(aLocalPort);
 	return KErrNone;
@@ -215,13 +218,13 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalAddress: Trying to GetLocalAddress on unconnected API."));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_1, "CWapMessageApiAgent::GetLocalAddress: Trying to GetLocalAddress on unconnected API.");
 		return KErrNotReady;
 		}
 	CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer);
 	if (!sock)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalAddress: Can not find Last Bearer"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_2, "CWapMessageApiAgent::GetLocalAddress: Can not find Last Bearer");
 		return Wap::EBearerError;
 		}
 	TSockAddr& localHost=sock->GetLocalAddress();
@@ -229,7 +232,7 @@
 	TRAP(err, aLocalHost=localHost.AllocL())
 	if (err)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalAddress: Alloc Memory Err=%d"), err);)
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_3, "CWapMessageApiAgent::GetLocalAddress: Alloc Memory Err=%d", err);
 		}
 	return err;
 	}
@@ -245,7 +248,7 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetBearer: Trying to GetBearer on unconnected API."));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETBEARER_1, "CWapMessageApiAgent::GetBearer: Trying to GetBearer on unconnected API.");
 		return KErrNotReady;
 		}
 	aBearer=iLastPduBearer;
@@ -263,13 +266,13 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetServerAddress: Trying to GetServerAddress on unconnected API."));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_1, "CWapMessageApiAgent::GetServerAddress: Trying to GetServerAddress on unconnected API.");
 		return KErrNotReady;
 		}
 	CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer);
 	if (!sock)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetServerAddress: Can not find last error."));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_2, "CWapMessageApiAgent::GetServerAddress: Can not find last error.");
 		return Wap::EBearerError;
 		}
 	return sock->GetRemoteAddress(aServerHost);
@@ -333,14 +336,14 @@
 		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, aPort))
 		if (ret!=KErrNone)
 			{
-			LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."),ret);)
+            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.",ret);
 			return ret;
 			}
 		iIsOpen=ETrue;
 		}
 	else
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Trying Connect twice to the API."));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2, "CWapMessageApiAgent::Connect:Trying Connect twice to the API.");
 		ret=KErrInUse;
 		}
 	return ret;
@@ -361,7 +364,7 @@
 	{
 	if (aSocketServHandle==0 || !aConnection)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Parameter Error"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1_1, "CWapMessageApiAgent::Connect:Parameter Error");
 		return KErrArgument;
 		}
 	TInt ret=KErrNone;
@@ -371,14 +374,14 @@
 		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, aPort, aConnection))
 		if (ret!=KErrNone)
 			{
-			LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."), ret);)
+            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1_2, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.", ret);
 			return ret;
 			}
 		iIsOpen=ETrue;
 		}
 	else
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Trying to Connect twice to the API."));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1_3, "CWapMessageApiAgent::Connect:Trying to Connect twice to the API.");
 		ret=KErrInUse;
 		}
 	return ret;
@@ -399,7 +402,7 @@
 	{
 	if (aBearer==Wap::EAll)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Connect to EAll Error"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_1, "CWapMessageApiAgent::SendWspMessage:Connect to EAll Error");
 		return Wap::EBearerError;
 		}
 	TInt ret=KErrNone;
@@ -409,20 +412,20 @@
 		TRAP(ret, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
 		if (ret!=KErrNone)
 			{
-			LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: BuildAddress err=%d."), ret);)
+            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_2, "CWapMessageApiAgent::Connect: BuildAddress err=%d.", ret);
 			return ret;
 			}
 		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, remoteAddr))
 		if (ret!=KErrNone)
 			{
-			LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."), ret);)
+            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_3, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.", ret);
 			return ret;
 			}
 		iIsOpen=ETrue;
 		}
 	else
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Trying to Connect twice to the API."));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_4, "CWapMessageApiAgent::Connect:Trying to Connect twice to the API.");
 		ret=KErrInUse;
 		}
 	return ret;
@@ -460,12 +463,12 @@
 	{
 	if (aBearer==Wap::EAll)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Connect to EAll Error"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_1, "CWapMessageApiAgent::SendWspMessage:Connect to EAll Error");
 		return Wap::EBearerError;
 		}
 	if (aSocketServHandle==0 || !aConnection)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Parameter Error"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_2, "CWapMessageApiAgent::Connect:Parameter Error");		
 		return KErrArgument;
 		}
 	TInt ret=KErrNone;
@@ -476,20 +479,20 @@
 		TRAP(ret, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
 		if (ret!=KErrNone)
 			{
-			LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: BuildAddress err=%d."),ret);)
+            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_3, "CWapMessageApiAgent::Connect: BuildAddress err=%d.",ret);
 			return ret;
 			}
 		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, remoteAddr, aConnection))
 		if (ret!=KErrNone)
 			{
-			LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."),ret);)
+            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_4, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.",ret);
 			return ret;
 			}
 		iIsOpen=ETrue;
 		}
 	else
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Connect to a connected API."));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_5, "CWapMessageApiAgent::Connect:Connect to a connected API.");
 		ret=KErrInUse;
 		}
 	return ret;
@@ -558,12 +561,12 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Tryig to send to unconnected API"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1, "CWapMessageApiAgent::SendWspMessage:Tryig to send to unconnected API");
 		return KErrNotReady;
 		}
 	if (aBearer==Wap::EAll)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Send to EAll Error"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_2, "CWapMessageApiAgent::SendWspMessage:Send to EAll Error");
 		return Wap::EBearerError;
 		}
 	HBufC8* sendBuf=NULL;
@@ -572,13 +575,13 @@
 	TRAP(err, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
 	if (err!=KErrNone)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage: BuildAddress err=%d."),err);)
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_3, "CWapMessageApiAgent::SendWspMessage: BuildAddress err=%d.", err);
 		return err;
 		}
 	TRAP(err, CCLWSPPduHandler::PackWSPPduL(sendBuf, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId))
 	if (err!=KErrNone)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d"),err);)
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_4, "CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d", err);
 		return err;
 		}
 	CActiveSocket* sendSock=GetActiveSocketByBearer(aBearer);
@@ -596,7 +599,7 @@
 		}
 	else
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage: Can not find Bearer"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_5, "CWapMessageApiAgent::SendWspMessage: Can not find Bearer");
 		err=Wap::EBearerError;
 		}
 	delete sendBuf;
@@ -618,12 +621,12 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Trying to send to unconnected API"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_1, "CWapMessageApiAgent::SendWspMessage:Tryig to send to unconnected API");
 		return KErrNotReady;
 		}
 	if (!iBearers[0])
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:No Bearer"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_2, "CWapMessageApiAgent::SendWspMessage:No Bearer");
 		return Wap::EBearerError;
 		}
 	HBufC8* sendBuf=NULL;
@@ -631,7 +634,7 @@
 	TRAP(err, CCLWSPPduHandler::PackWSPPduL(sendBuf, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId))
 	if (err!=KErrNone)
 		{
-		LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d"),err);)
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_3, "CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d",err);
 		return err;
 		}
 	Wap::TBearer bearer=iBearers[0]->GetBearerType();
@@ -667,14 +670,14 @@
 		{
 		reqStatus=&aReqStatus;
 		User::RequestComplete(reqStatus, KErrNotReady);
-		LOG(SwsLog::Printf(_L("CWspMessageApiAgent::ReceiveWspMessage: Trying to recvive from unconnected API"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_1, "CWspMessageApiAgent::ReceiveWspMessage: Trying to recevive from unconnected API");
 		return KErrNotReady;
 		}
 	if (iRequestActive)
 		{
 		reqStatus=&aReqStatus;
 		User::RequestComplete(reqStatus, KErrInUse);
-		LOG(SwsLog::Printf(_L("CWspMessageApiAgent::ReceiveWspMessage:Outstanding Receive exist"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_2, "CWspMessageApiAgent::ReceiveWspMessage:Outstanding Receive exist");
 		return KErrInUse;
 		}
 	//Record the client buffer
@@ -744,7 +747,7 @@
 @returns KErrNone on successful completion, or one of the system error codes on failure.
 */
 	{
-	LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification is called"));)
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_1, "CWspMessageApiAgent::Notification is called");
 	TWapNotificationInfo& info=*(reinterpret_cast<TWapNotificationInfo*>(const_cast<TUint8*>(aData.Ptr())));
 	Wap::TBearer bearer=info.iBearer;
 	CActiveSocket* currentSocket=GetActiveSocketByBearer(bearer);
@@ -760,7 +763,7 @@
 			{
 			if (err!=KErrNone)
 				{
-				LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU length err status:%d"), err);)
+                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_2, "CWspMessageApiAgent::Notification PDU length err status:%d", err);
 				currentSocket->CleanUpData();
 				if (iRequestActive)
 					{
@@ -771,7 +774,7 @@
 				}
 			else
 				{
-				LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU length is received"));)
+                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_3, "CWspMessageApiAgent::Notification PDU length is received");
 				if ((err=currentSocket->Receive())!=KErrNone)
 					{
 					currentSocket->CleanUpData();
@@ -790,7 +793,7 @@
 			CActiveSocket* sock=GetActiveSocketByStatus(EReading);
 			if (err!=KErrNone)
 				{
-				LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU data is received with Err status:%d"), err);)
+                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_4, "CWspMessageApiAgent::Notification PDU data is received with Err status:%d", err);
 				currentSocket->CleanUpData();
 				if (iRequestActive && !sock)
 					{
@@ -801,7 +804,7 @@
 				}
 			else
 				{
-				LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU data is received"));)
+                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_5, "CWspMessageApiAgent::Notification PDU data is received");
 				if (!sock && iRequestActive)
 					{
 					iTimeoutTimer->Cancel();
@@ -822,7 +825,7 @@
 			break;
 			}
 	default:
-		LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification() Unknown Event From Bearer"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_6, "CWspMessageApiAgent::Notification() Unknown Event From Bearer");
 		;	
 		}
 	}
@@ -893,7 +896,7 @@
 		{
 		reqStatus=&aReqStatus;
 		User::RequestComplete(reqStatus, KErrNotReady);
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::ReceiveWdpMessage:Recv From unconnected API"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_1, "CWdpMessageApiAgent::ReceiveWdpMessage: Recv From unconnected API");
 		return KErrNotReady;
 		}
 	//if the length has been read
@@ -903,7 +906,7 @@
 		{
 		reqStatus=&aReqStatus;
 		User::RequestComplete(reqStatus, KErrInUse);
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::ReceiveWdpMessage:in wrong state"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_2, "CWdpMessageApiAgent::ReceiveWdpMessage:in wrong state");
 		return KErrInUse;
 		}
 	if (sock1)
@@ -948,7 +951,7 @@
 			{
 			reqStatus=&aReqStatus;
 			User::RequestComplete(reqStatus, err);
-			LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::ReceiveWdpMessage:err=%d"), err);)
+			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_3, "CWdpMessageApiAgent::ReceiveWdpMessage:err=%d",err);
 			return err;
 			}
 		}
@@ -970,7 +973,7 @@
 		{
 		reqStatus=&aReqStatus;
 		User::RequestComplete(reqStatus, KErrNotReady);
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::AwaitRecvDataSize:Wait For Data length From unconnected API"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_1, "CWdpMessageApiAgent::AwaitRecvDataSize:Wait For Data length From unconnected API");
 		return KErrNotReady;
 		}
 	//if the length has been read or there is some data pending, then error completion
@@ -981,7 +984,7 @@
 		{
 		reqStatus=&aReqStatus;
 		User::RequestComplete(reqStatus, KErrInUse);
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::AwaitRecvDataSize:in wrong state"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_2, "CWdpMessageApiAgent::AwaitRecvDataSize:in wrong state");
 		return KErrInUse;
 		}
 	//if there is a pending length, then get it
@@ -1033,12 +1036,12 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1, "CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API");
 		return KErrNotReady;
 		}
 	if (aBearer==Wap::EAll)
 		{
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:Wrong Bearer"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_2, "CWdpMessageApiAgent::SendWdpMessage:Wrong Bearer");
 		return Wap::EBearerError;
 		}
 	TSockAddr remoteAddr;
@@ -1046,7 +1049,7 @@
 	TRAP(err, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
 	if (err)
 		{
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:BuildAddrL Err=%d"), err);)
+        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_3, "CWdpMessageApiAgent::SendWdpMessage:BuildAddrL Err=%d", err);
 		return err;
 		}
 	CActiveSocket* sendSock=GetActiveSocketByBearer(aBearer);
@@ -1064,7 +1067,7 @@
 		}
 	else
 		{
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:No Bearer"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_4, "CWdpMessageApiAgent::SendWdpMessage:No Bearer");
 		err=Wap::EBearerError;
 		}
 	return err;
@@ -1081,12 +1084,12 @@
 	{
 	if (!iIsOpen)
 		{
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_1, "CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API");
 		return KErrNotReady;
 		}
 	if (!iBearers[0])
 		{
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:No Bearer"));)
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_2, "CWdpMessageApiAgent::SendWdpMessage:No Bearer");
 		return Wap::EBearerError;
 		}
 	Wap::TBearer bearer=iBearers[0]->GetBearerType();
@@ -1178,7 +1181,7 @@
 			}
 		break;
 	default:
-		LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::Notification() Unknown Event From Bearer"));)
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_NOTIFICATION_1, "CWdpMessageApiAgent::Notification() Unknown Event From Bearer");
 		;
 		}
 	}
--- a/wapstack/wapmessageapi/sws/WapSwsLog.cpp	Tue Jul 06 15:36:38 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// WAPLOG.CPP
-// 
-//
-
-
-#ifdef _DEBUG
-
-#include "WapSwsLog.h"
-
-void SwsLog::Write(const TDesC& aDes)
-/*
- * Write aText to the log
- */
-	{
-	RFileLogger::Write(KSWSLogFolder(),KSWSLogFile(),EFileLoggingModeAppend,aDes);
-	}
-
-void SwsLog::Printf(TRefByValue<const TDesC> aFmt,...)
-/*
- * Write a mulitple argument list to the log, trapping and ignoring any leave
- */
-	{
-	VA_LIST list;
-	VA_START(list,aFmt);
-	RFileLogger::WriteFormat(KSWSLogFolder(),KSWSLogFile(),EFileLoggingModeAppend,aFmt,list);
-	}
-	
-#endif // _DEBUG
-
--- a/wapstack/wapmessageapi/sws/WapSwsLog.h	Tue Jul 06 15:36:38 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __WAPLOG_H__
-#define __WAPLOG_H__
-
-#ifdef _DEBUG
-
-	#include <comms-infras/commsdebugutility.h>
-	#define LOG(MSG) MSG
-
-	#if defined (DETAILED_LOG)
-		#define LOG_DETAILED(MSG) MSG
-	#else
-		#define LOG_DETAILED(MSG)
-	#endif
-
-	_LIT(KSWSLogFolder,"sws");
-	_LIT(KSWSLogFile,"sws.txt");
-	_LIT(KEndOfLine,"\r\n");
-
-	class SwsLog
-		{
-	public:
-		static void Write(const TDesC& aDes);
-	    static void Printf(TRefByValue<const TDesC> aFmt, ...);
-		};
-#else
-
-	#define LOG(MSG)
-	#define LOG_DETAILED(MSG)
-
-#endif
-
-#endif
--- a/wapstack/wapmessageapi/sws/swswapmsgsource.mmpi	Tue Jul 06 15:36:38 2010 +0300
+++ b/wapstack/wapmessageapi/sws/swswapmsgsource.mmpi	Wed Aug 18 10:57:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,5 +20,4 @@
 SOURCE			WapBoundCLPush.cpp WapFullySpecCLPush.cpp
 SOURCE			WapBoundCLWSP.cpp WapFullySpecCLWSP.cpp
 SOURCE			WapMsgUtils.cpp WapSwsTimeout.cpp ActiveSocket.cpp
-SOURCE			CLWSPPduHandler.cpp WapMessageApiAgent.cpp
-SOURCE			WapSwsLog.cpp
\ No newline at end of file
+SOURCE			CLWSPPduHandler.cpp WapMessageApiAgent.cpp
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wapstack/wapmessageapi/traces/OstTraceDefinitions.h	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+//#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wapstack/wapmessageapi/traces/fixed_id.definitions	Wed Aug 18 10:57:47 2010 +0300
@@ -0,0 +1,68 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_INTERNALS=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_DOCANCEL_1=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_RUNL_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_RUNL_2=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_RUNL_3=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_DOCANCEL_1=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_RUNL_1=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_RUNL_2=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_RUNL_3=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKET_GETREMOTEADDRESS_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKET_NEWL_1=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKET_NEWL_1_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CCLWSPPDUHANDLER_PACKWSPPDUL_1=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CCLWSPPDUHANDLER_UNPACKWSPPDUL_1=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CCLWSPPDUHANDLER_UNPACKWSPPDUL_2=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1_1=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1_2=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1_3=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_1=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_2=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_3=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_4=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_1=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_2=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_3=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_4=0x21
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_5=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETBEARER_1=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_1=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_2=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_3=0x15
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALPORT_1=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALPORT_2=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_1=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_2=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_1=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_2=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_NOTIFICATION_1=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_1=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_2=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_3=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_1=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_2=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_2=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_3=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_4=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGERECORD_GETPDUDATA_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_1=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_2=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_3=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_4=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_5=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_6=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_1=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_2=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_1=0x27
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_2=0x28
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_3=0x29
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_2=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_3=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_4=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_5=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGERECORD_GETWSPDATA_1=0xc