# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1266616773 -7200 # Node ID 962e6306d9d2b191257fe26b273be61cdde6d8b5 # Parent 3553901f7fa8a1c01975551163051a13e92798fa Revision: 201007 Kit: 201007 diff -r 3553901f7fa8 -r 962e6306d9d2 smsprotocols/smsstack/gsmu/test/te_gsmu_ems/Te_gsmu_emsSuiteStepBase.h --- a/smsprotocols/smsstack/gsmu/test/te_gsmu_ems/Te_gsmu_emsSuiteStepBase.h Tue Feb 02 01:41:59 2010 +0200 +++ b/smsprotocols/smsstack/gsmu/test/te_gsmu_ems/Te_gsmu_emsSuiteStepBase.h Fri Feb 19 23:59:33 2010 +0200 @@ -27,6 +27,7 @@ #include // Please add your include here if you have #include +#include #include #include "gsmumsg.h" #include "gsmubuf.h" diff -r 3553901f7fa8 -r 962e6306d9d2 smsprotocols/smsstack/smsu/group/bld.inf --- a/smsprotocols/smsstack/smsu/group/bld.inf Tue Feb 02 01:41:59 2010 +0200 +++ b/smsprotocols/smsstack/smsu/group/bld.inf Fri Feb 19 23:59:33 2010 +0200 @@ -30,7 +30,7 @@ ../inc/smsuset.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsuset.h) ../inc/smsuset.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsuset.inl) ../inc/smsustrm.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsustrm.h) -../inc/smsustrm.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(smsustrm.inl) +../inc/smsustrm.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsustrm.inl) ../inc/smsulog.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsulog.h) ../inc/smsulog.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsulog.inl) ../inc/smsuact.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsuact.h) diff -r 3553901f7fa8 -r 962e6306d9d2 smsprotocols/smsstack/smsu/inc/smsuaddr.H --- a/smsprotocols/smsstack/smsu/inc/smsuaddr.H Tue Feb 02 01:41:59 2010 +0200 +++ b/smsprotocols/smsstack/smsu/inc/smsuaddr.H Fri Feb 19 23:59:33 2010 +0200 @@ -28,7 +28,6 @@ #include #include -#include /** SMS sockets family identifier.*/ const TUint KSMSAddrFamily = 0x010; diff -r 3553901f7fa8 -r 962e6306d9d2 smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h --- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h Tue Feb 02 01:41:59 2010 +0200 +++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h Fri Feb 19 23:59:33 2010 +0200 @@ -37,6 +37,7 @@ #include #include #include +#include #include "WapProtSuiteDefs.h" #include "wap_sock.h" #include "smsustrm.h" diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/gprsumtsqosinterface/inc/UmtsNifControlIf.h --- a/telephonyprotocols/gprsumtsqosinterface/inc/UmtsNifControlIf.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/gprsumtsqosinterface/inc/UmtsNifControlIf.h Fri Feb 19 23:59:33 2010 +0200 @@ -19,7 +19,7 @@ #define __UMTSNIF_CONTROL__ #include - +#include #if MM_ETEL_API #include "uscl_packet.h" // RPacketContext from UMTSSim #include "uscl_qos.h" // RPacketQoS from UMTSSim diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/group/bld.inf --- a/telephonyprotocols/pdplayer/group/bld.inf Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/group/bld.inf Fri Feb 19 23:59:33 2010 +0200 @@ -29,5 +29,8 @@ PRJ_TESTMMPFILES + +#include "..\test\controlplane\group\bld.inf" + #endif diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/inc/PDPParamMapper.h --- a/telephonyprotocols/pdplayer/inc/PDPParamMapper.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/inc/PDPParamMapper.h Fri Feb 19 23:59:33 2010 +0200 @@ -23,6 +23,7 @@ #ifndef SYMBIAN_PDPPARAMMAPPER_H #define SYMBIAN_PDPPARAMMAPPER_H +#include #include #include diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/inc/PDPProvision.h --- a/telephonyprotocols/pdplayer/inc/PDPProvision.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/inc/PDPProvision.h Fri Feb 19 23:59:33 2010 +0200 @@ -27,9 +27,9 @@ #ifndef PDPPROVISION_H_ #define PDPPROVISION_H_ +#include #include #include // TMDBElementId -#include namespace ESock { diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/inc/PDPSCPR.h --- a/telephonyprotocols/pdplayer/inc/PDPSCPR.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/inc/PDPSCPR.h Fri Feb 19 23:59:33 2010 +0200 @@ -23,6 +23,7 @@ #ifndef SYMBIAN_PDPSPR_H #define SYMBIAN_PDPSPR_H +#include #include #include #include @@ -30,9 +31,11 @@ #include #include #include +#include + #include "PDPFSM.h" #include "PDPParamMapper.h" -#include + namespace PDPSCprStates { class TSelfInit; diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/inc/pdpmcpr.h --- a/telephonyprotocols/pdplayer/inc/pdpmcpr.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/inc/pdpmcpr.h Fri Feb 19 23:59:33 2010 +0200 @@ -23,6 +23,7 @@ #ifndef SYMBIAN_PDPMCPR_H #define SYMBIAN_PDPMCPR_H +#include #include #include #include @@ -31,8 +32,10 @@ #include #include + +#include "PDPProvision.h" #include "pdpmcprfactory.h" -#include "PDPProvision.h" + #if defined __CFLOG_ACTIVE || defined SYMBIAN_TRACE_ENABLE #define KPdpMCprTag KESockMetaConnectionTag diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/src/PDPConfig.cpp --- a/telephonyprotocols/pdplayer/src/PDPConfig.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/src/PDPConfig.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -82,6 +82,10 @@ getErr = KErrNone; iUmtsGprsRelease = TPacketDataConfigBase::KConfigGPRS; } + + TBool useEdge = EFalse; + + aIapView->GetBoolL(KCDTIdWCDMAUseEdge | KCDTIdOutgoingGprsRecord, useEdge); getErr = InitialiseScratchContext(iUmtsGprsRelease); //-==================================================== @@ -104,7 +108,7 @@ // GPRS specific RetrieveGprsCompression(contextGPRS.iPdpCompression, aIapView); RetrieveGprsAnonymousAccess(contextGPRS.iAnonymousAccessReqd, aIapView); - contextGPRS.iUseEdge = EFalse; + contextGPRS.iUseEdge = useEdge; } break; case TPacketDataConfigBase::KConfigRel5: @@ -119,7 +123,7 @@ contextR5.iProtocolConfigOption.iDnsAddresses.iPrimaryDns, contextR5.iProtocolConfigOption.iDnsAddresses.iSecondaryDns, aIapView); RetrieveAuthenticationInfoL(contextR5.iProtocolConfigOption, aIapView); - contextR5.iUseEdge = EFalse; + contextR5.iUseEdge = useEdge; RetrieveUmtsPacketFlowIdentifierL(contextR5.iPFI, aIapView); } @@ -134,7 +138,7 @@ contextUMTS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns, contextUMTS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns, aIapView); RetrieveAuthenticationInfoL(contextUMTS.iProtocolConfigOption, aIapView); - contextUMTS.iUseEdge = EFalse; + contextUMTS.iUseEdge = useEdge; RetrieveUmtsPacketFlowIdentifierL(contextUMTS.iPFI, aIapView); } break; diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/src/pdpmcpr.cpp --- a/telephonyprotocols/pdplayer/src/pdpmcpr.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/src/pdpmcpr.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -20,15 +20,16 @@ @internalComponent */ +#include +#include +#include +#include +#include #include #include "pdpmcpr.h" #include "pdpmcprstates.h" #include "PDPProvision.h" #include "psdavailabilitylistener.h" -#include -#include -#include -#include using namespace Messages; using namespace MeshMachine; diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp --- a/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -20,15 +20,19 @@ @internalComponent */ +#include #include -#include "pdpmcprfactory.h" -#include "pdpmcpr.h" #include #include #include #include +#include "pdpmcprfactory.h" +#include "pdpmcpr.h" + + + #ifdef _DEBUG #define KPdpMCprFactoryTag KESockMetaConnectionTag _LIT8(KPdpMCprFactorySubTag, "pdpmcprfactory"); diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/src/pdpmcprstates.cpp --- a/telephonyprotocols/pdplayer/src/pdpmcprstates.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/src/pdpmcprstates.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -13,6 +13,7 @@ // Description: // +#include #include #include #include diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp --- a/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -204,6 +204,7 @@ } else { + // Kick off this class' mini state machine in the RunL TRequestStatus* status = &iStatus; User::RequestComplete(status, KErrNone); } diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside1.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside1.xml Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,669 @@ + + + + + + + + + + + + + Intranet + + + + Intranet2 + + + + Intranet3 + + + + Intranet4 + + + + Intranet5 + + + + Intranet6 + + + + + + + Loopback_GRPS_1 + OutgoingGPRS.RawIP_Bounce_1 + ModemBearer.Loopback_RawIP_1 + Network.Intranet + 0 + Location.Mobile + + + Loopback_GRPS_2 + OutgoingGPRS.SPUD_Echo_2 + ModemBearer.Loopback_SPUD_2 + Network.Intranet + 0 + Location.Mobile + + + + Loopback_GRPS_3 + OutgoingGPRS.RawIP_Bounce_3 + ModemBearer.Loopback_RawIP_3 + Network.Intranet2 + 0 + Location.Mobile + + + Loopback_GRPS_4 + OutgoingGPRS.SPUD_Echo_4 + ModemBearer.Loopback_SPUD_4 + Network.Intranet2 + 0 + Location.Mobile + + + Loopback_GRPS_5 + OutgoingGPRS.RawIP_Bounce_1 + ModemBearer.Loopback_RawIP_3 + Network.Intranet2 + 0 + Location.Mobile + + + Loopback_GRPS_6 + OutgoingGPRS.SPUD_Multi_1 + ModemBearer.Loopback_SPUD_5 + Network.Intranet3 + 0 + Location.Mobile + + + Loopback_GRPS_7 + OutgoingGPRS.SPUD_Multi_2 + ModemBearer.Loopback_SPUD_6 + Network.Intranet4 + 0 + Location.Mobile + + + Loopback_GRPS_8 + OutgoingGPRS.SPUD_Multi_3 + ModemBearer.Loopback_SPUD_7 + Network.Intranet5 + 0 + Location.Mobile + + + Loopback_GRPS_9 + OutgoingGPRS.SPUD_Multi_4 + ModemBearer.Loopback_SPUD_8 + Network.Intranet6 + 0 + Location.Mobile + + + + + + + Default Loopback Modem + NULLAGT + PKTLOOPBACK + C32Bca + SIM + 8 + 1 + NONE + 115200 + 0 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + 0 + FALSE + 4 + 6 + 180 + 0 + + + + Loopback_RawIP_1 + RAWIP + PKTLOOPBACK + PKTLOOPBACK::501 + + + + Loopback_SPUD_2 + SPUD + + + + Loopback_RawIP_3 + RAWIP + PKTLOOPBACK + PKTLOOPBACK::503 + + + + Loopback_SPUD_4 + SPUD + + + + WinTunnel_SPUD_5 + NULLAGT + SPUD + + + + Loopback_SPUD_5 + SPUD + + + + Loopback_SPUD_6 + SPUD + + + + Loopback_SPUD_7 + SPUD + + + + Loopback_SPUD_8 + SPUD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ConnectionPreferencesTable1 + 1 + OUTGOING + DONOTPROMPT + PSD + IAP.Loopback_GRPS_2 + + + + + + GlobalSettingsTable1 + 3 + 2 + 1 + 1 + 2 + 2 + 2 + Location.Mobile + Location.Mobile + GSM + Network.Intranet + mm + + + + + + + + + Default Outgoing GPRS + Test + IPV4 + FALSE + FALSE + FALSE + 2 + 4 + 3 + 3 + 31 + 2 + 4 + 3 + 3 + 31 + FALSE + FALSE + FALSE + 255.255.255.0 + ip + RasUser + 1 + 194.72.6.51 + 194.72.6.51 + FALSE + FALSE + FALSE + UmtsR99QoSAndOn.PRIMARY1 + + + + RawIP_Bounce_1 + IPV4 + FALSE + FALSE + FALSE + 192.168.1.1 + + + + SPUD_Echo_2 + IPV4 + lowernif=RAWIP + FALSE + TRUE + TRUE + 192.168.1.2 + + + + RawIP_Bounce_3 + IPV4 + FALSE + FALSE + FALSE + 192.168.2.3 + + + + SPUD_Echo_4 + IPV4 + lowernif=RAWIP + FALSE + FALSE + FALSE + 192.168.2.4 + + + SPUD_Multi_1 + IPV4 + lowernif=RAWIP + FALSE + TRUE + TRUE + 192.168.1.10 + + + SPUD_Multi_2 + IPV4 + lowernif=RAWIP + FALSE + TRUE + TRUE + 192.168.1.11 + + + SPUD_Multi_3 + IPV4 + lowernif=RAWIP + FALSE + TRUE + TRUE + 192.168.1.12 + + + SPUD_Multi_4 + IPV4 + lowernif=RAWIP + FALSE + TRUE + TRUE + 192.168.1.13 + + + + + + Dummy Default GPRS Settings + Access point name + IPV6 + www.wid.com + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + TRUE + TRUE + FALSE + TRUE + + + + + + + + + Default Location + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + + + + Office + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + 9, + + + + Mobile + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + + + + + + + + + + PRIMARY1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + 0 + + + + SECONDARY1 + 4 + 4 + 1 + 1 + 8 + 8 + 768 + 512 + 1024 + 1024 + 1024 + 1024 + 0 + 0 + 1 + 1 + 1 + 1 + 250 + 250 + 1024 + 1024 + 1024 + 1024 + FALSE + FALSE + 0 + + + + PRIMARY2 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + 0 + + + + SECONDARY2 + 4 + 4 + 1 + 1 + 8 + 8 + 768 + 512 + 1024 + 1024 + 1024 + 1024 + 0 + 0 + 1 + 1 + 1 + 1 + 250 + 250 + 1024 + 1024 + 1024 + 1024 + FALSE + FALSE + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 0.0.0.0 + 255.255.255.255 + 192.168.1.1 + 255.255.255.255 + 0 + 1031 + 3461 + 3461 + 17 + 2 + 1 + + + + 2 + 0 + 0 + 1 + 2 + 1 + + + + diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_config.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_config.txt Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,163 @@ +############################################################################ +############################################################################ +################### T E S T 0 #################### +############################################################################ +############################################################################ +# Test case for success results +############################################################################ +[test0] +# DefaultContextparamGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2 + +# ContextConfigGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1 +# TRel99ContextConfig = , , , , +# , , +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = SECONDARY2, 0, 0, 0, 0, 0, 0, 0 + +# TFTfilter = 0 1 2 3 4 +# 5 6 7 8 9 10 +# 11 +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 1 2 3 4 +# 5 6 7 8 +# 9 10 11 12 +# +# 13 14 15 16 +# 17 18 +# 19 20 21 22 +# 23 24 +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 +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 +QosProfileReqR5 = 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, 0, 0 +QosProfileReqR5 = 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, 0, 0 + + + +#TProfileNegR99 = +# +# +# +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 +QosProfileNegR99 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3 +QosProfileNegR99 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3 +QosProfileNegR99 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 + +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 +QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0 +QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0 +QosProfileNegR5 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0 + + +#TQosProfileCapsR99 = +# +QosProfileCapsR99= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04 + +QosNetworkNotificationType = PublishSubscribe +# QosNetworkNotification = +# +# +# +QosNetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 +QosNetworkNotification = PRIMARY2, 0x04, 0x02, 0x04, 0x02, 1, 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 = PRIMARY2, 0x04, 0x02, 0x04, 0x02, 1, 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= +SetProfileFail = NEG_99, 0x04, 0x02 + +#QosprofileReqGPRS= +# +QosProfileReqGPRS= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020 +QosProfileReqGPRS= 0x04, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020 + +#QosProfileNegGPRS= +QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 +QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 + +#QosProfileCapsGPRS= +QosProfileCapsGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 + +# QosProfileReq +# = , , , +# , +# , , +# , , , +# , , , , +# , , , + +# QosProfileNeg = , , , , +# , , , , , +# , , +# , + +DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2 +# DefaultContextparamRel99 = , , , +# ProtocolConfigOption = , , , , +# , , , + +ReleaseMode = 5, 5 +# Packet Release mode = + +#RegStatus= +RegStatus= 5,3 +RegStatus= 2,5,0 +RegStatus= 2,7,3 +RegStatus= 5,2 +RegStatus= 2,5,0 + +# NetworkRegStatus = , +NetworkRegStatusType = PublishSubscribe +NetworkRegStatus= 5,2 +NetworkRegStatus= 5,1 +NetworkRegStatus= 5,1 + +# CommSetup = +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1 +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1 +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::506, 18, 0, SECONDARY2 + +############################################################################ +# failure events +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , + +# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6 +NotifyContextStatusChange = PRIMARY1, 0, 6 +NotifyContextStatusChange = PRIMARY1, 0, 4 +NotifyContextStatusChange = PRIMARY1, 0, 1 +NotifyContextStatusChange = SECONDARY1, 0, 6 +NotifyContextStatusChange = SECONDARY1, 0, 4 +NotifyContextStatusChange = SECONDARY1, 0, 1 + +# EStatusSuspended = 5 EStatusActive = 3 +NotifyContextStatusChange = PRIMARY1, 0, 5 +NotifyContextStatusChange = PRIMARY1, 0, 3 +NotifyContextStatusChange = SECONDARY1, 0, 5 +NotifyContextStatusChange = SECONDARY1, 0, 3 + diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test28.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test28.ini Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,101 @@ +[SimTsy] +TestSection=0 + +[CreateSockSvr1] +SocketServName=SockSvr1 + +[ConnectSockSvr1] +SocketServName=SockSvr1 + +[CreateConn1] +ConnName=Conn1 + +[OpenConn1] +ConnName=Conn1 +SocketServName=SockSvr1 + +[CreateConnectionServA] +ConnServName=ConnServA + +[ConnectConnectionServA] +ConnServName=ConnServA +TierName=LinkTier + +[CreateConnectionServS] +ConnServName=ConnServS + +[ConnectConnectionServS] +ConnServName=ConnServS +TierName=LinkTier + +[APNotificationRequest1A] +ConnServName=ConnServA +NotificationName=NotifA +QueryAPStatusFilter=C-R-AYS- +QueryAPMatch0=2 + +[APNotificationRequest1S] +ConnServName=ConnServS +NotificationName=NotifS +QueryAPStatusFilter=C-R-A-SY + +[StartConn1_1] +ConnName=Conn1 +SocketServName=SockSvr1 +IAP=2 + +[ReceiveNotification1A] +NotificationName=NotifA +WaitPeriod=5 +ExpectedNumberOfAPs=1 +ExpectedAP1=2 +ExpectedAP1Status=C?R?AYS? + +[ReceiveNotification1S] +NotificationName=NotifS +WaitPeriod=5 +ExpectedNumberOfAPs=1 +ExpectedAP1=2 +ExpectedAP1Status=C?R?A?SY + +[StopConn1_1] +ConnName=Conn1 +ConnStopType=EStopNormal + +[SetSimTsyUnavailable] +AccessPointId=2 +AccessPointState=Unavailable + +[ReceiveNotification2A] +NotificationName=NotifA +WaitPeriod=5 +ExpectedNumberOfAPs=1 +ExpectedAP1=2 +ExpectedAP1Status=C?R?ANS? + +[ReceiveNotification2S] +NotificationName=NotifS +WaitPeriod=5 +ExpectedNumberOfAPs=1 +ExpectedAP1=2 +ExpectedAP1Status=C?R?A?SN + +[CancelAPNotifRequestA] +ConnServName=ConnServA +NotificationName=NotifA + +[CancelAPNotifRequestS] +ConnServName=ConnServS +NotificationName=NotifS + +[CloseConn1] +ConnName=Conn1 + +[CloseConnectionServA] +ConnServName=ConnServA + +[CloseConnectionServS] +ConnServName=ConnServS + +[CloseSockSvr1] +SocketServName=SockSvr1 diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test29.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test29.ini Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,71 @@ +[SimTsy] +TestSection=0 + +[CreateSockSvr1] +SocketServName=SockSvr1 + +[ConnectSockSvr1] +SocketServName=SockSvr1 + +[CreateConn1] +ConnName=Conn1 + +[OpenConn1] +ConnName=Conn1 +SocketServName=SockSvr1 + +[CreateConnectionServ1] +ConnServName=ConnServ1 + +[ConnectConnectionServ1] +ConnServName=ConnServ1 +TierName=LinkTier + +[SetSimTsyAvailable] +AccessPointId=2 +AccessPointState=Available + +[APQuery1] +ConnServName=ConnServ1 +QueryAPStatusFilter=C-R-A?S- +QueryAPMatch0=2 +ExpectedNumberOfAPs=1 +ExpectedAP1=2 +ExpectedAP1Status=C?R?AYS? + +[SetSimTsyUnavailable] +AccessPointId=2 +AccessPointState=Unavailable + +[APQuery1a] +ConnServName=ConnServ1 +QueryAPStatusFilter=C-R-A?S? +QueryAPMatch0=2 +ExpectedNumberOfAPs=1 +ExpectedAP1=2 +ExpectedAP1Status=C?R?ANSN + +[StartConn1_1] +ConnName=Conn1 +SocketServName=SockSvr1 +IAP=2 + +[APQuery2] +ConnServName=ConnServ1 +QueryAPStatusFilter=C-R-A?SY +ExpectedNumberOfAPs=1 +ExpectedAP1=2 +ExpectedAP1Status=C?R?AYSY + +[StopConn1_1] +ConnName=Conn1 +ConnStopType=EStopNormal + +[CloseConn1] +ConnName=Conn1 + +[CloseConnectionServ1] +ConnServName=ConnServ1 + +[CloseSockSvr1] +SocketServName=SockSvr1 diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworksideloopbackcsy.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworksideloopbackcsy.ini Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,29 @@ +# Defining a loopback between port A and B is as follows: +# Port = ,,,, +# Ports 501 to 522 are mapped to contexts on the default SIM +# Ports 523 to 544 are mapped to contexts on SIM2 +# +[Defaults] +Port= 0,1,1,10,1500 +Port= 501,502,0,10,1500 +Port= 503,504,0,10,1500 +Port= 505,506,0,10,1500 +Port= 507,508,0,10,1500 +Port= 509,510,0,10,1500 +Port= 511,512,0,10,1500 +Port= 513,514,0,10,1500 +Port= 515,516,0,10,1500 +Port= 517,518,0,10,1500 +Port= 519,520,0,10,1500 +Port= 521,522,0,10,1500 +Port= 523,524,0,10,1500 +Port= 525,526,0,10,1500 +Port= 527,528,0,10,1500 +Port= 529,530,0,10,1500 +Port= 531,532,0,10,1500 +Port= 533,534,0,10,1500 +Port= 535,536,0,10,1500 +Port= 537,538,0,10,1500 +Port= 539,540,0,10,1500 +Port= 541,542,0,10,1500 +Port= 543,544,0,10,1500 diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/group/bld.inf Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,42 @@ +// 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" +// 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: +// Network-side events / errors SPUD testing +// +// + +/** + @file +*/ + +PRJ_EXPORTS + +PRJ_TESTEXPORTS + +../configs/te_controlplanenetworkside1.xml z:/testdata/configs/te_controlplanenetworkside1.xml +../configs/te_controlplanenetworkside_config.txt z:/testdata/configs/te_controlplanenetworkside_config.txt +../configs/te_controlplanenetworkside_test28.ini z:/testdata/configs/te_controlplanenetworkside_test28.ini +../configs/te_controlplanenetworkside_test29.ini z:/testdata/configs/te_controlplanenetworkside_test29.ini + +../configs/te_controlplanenetworksideloopbackcsy.ini z:/testdata/configs/te_controlplanenetworksideloopbackcsy.ini + + +../scripts/te_PDP-ControlPlane.script z:/testdata/scripts/te_PDP-ControlPlane.script +../scripts/te_PDP-ControlPlane28.script z:/testdata/scripts/te_PDP-ControlPlane28.script +../scripts/te_PDP-ControlPlane29.script z:/testdata/scripts/te_PDP-ControlPlane29.script + +PRJ_MMPFILES + +PRJ_TESTMMPFILES + + diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane.script Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,43 @@ +// +// 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" +// 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: +// + +PRINT Run Control Plane Networkside Tests. + +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script +ced z:\TestData\Configs\te_controlplanenetworkside1.xml +run_script z:\TestData\scripts\te_esock_test_loadesock.script + +RUN_UTILS MkDir c:\simtsy\ +RUN_UTILS MkDir c:\private\ +RUN_UTILS MkDir c:\private\101F7989\ +RUN_UTILS MkDir c:\private\101F7989\esock\ +RUN_UTILS MakeReadWrite c:\simtsy\config.txt +RUN_UTILS MakeReadWrite c:\config.txt +RUN_UTILS MakeReadWrite c:\loopback.ini +RUN_UTILS DeleteFile c:\simtsy\config.txt +RUN_UTILS DeleteFile c:\config.txt +RUN_UTILS DeleteFile c:\loopback.ini +RUN_UTILS CopyFile z:\TestData\Configs\te_controlplanenetworkside_config.txt c:\simtsy\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\te_controlplanenetworkside_config.txt c:\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\te_controlplanenetworksideloopbackcsy.ini c:\loopback.ini + +LOAD_SUITE te_esockteststepsSuite -SharedData + +RUN_SCRIPT Z:\TestData\Scripts\te_PDP-ControlPlane28.script +RUN_SCRIPT Z:\TestData\Scripts\te_PDP-ControlPlane29.script + +PRINT Complete_te_controlplanenetworkside tests + diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane28.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane28.script Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,86 @@ +// +// 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" +// 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: +// + + +PRINT Running CASE28 +PRINT Validating notifications on the PDP tier + +// +LOAD_SUITE te_esockteststepsSuite -SharedData +RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script + +START_TESTCASE PDP-ControlPlane-0028 +//! @SYMTestCaseID PDP-ControlPlane-0028 +//! @SYMTestCaseDesc Validating notifications on the PDP tier +//! @SYMPREQ 2624 +//! @SYMTestActions Creating server connection to PDP tier, opening connections on SIM1/SIM2. +//! @SYMTestExpectedResults Validating that notifications are received when a connection is opened on SIM1/SIM2 +//! @SYMTestPriority High +//! @SYMTestStatus Under development +//! @SYMTestType UT + +// start simtsy +RUN_TEST_STEP 100 te_esockteststepsSuite StartSimTSYStep z:\testdata\configs\te_controlplanenetworkside_test28.ini SimTsy + +// create and open the first connection +RUN_TEST_STEP 100 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateSockSvr1 +RUN_TEST_STEP 100 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ConnectSockSvr1 +RUN_TEST_STEP 100 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateConn1 +RUN_TEST_STEP 100 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini OpenConn1 + +// Connect at *link* tier +RUN_TEST_STEP 100 te_esockteststepsSuite CreateRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateConnectionServA +RUN_TEST_STEP 100 te_esockteststepsSuite ConnectRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ConnectConnectionServA +RUN_TEST_STEP 100 te_esockteststepsSuite CreateRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateConnectionServS +RUN_TEST_STEP 100 te_esockteststepsSuite ConnectRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ConnectConnectionServS + +// Request all changes to AP active status +RUN_TEST_STEP 100 te_esockteststepsSuite RequestAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini APNotificationRequest1A +RUN_TEST_STEP 100 te_esockteststepsSuite RequestAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini APNotificationRequest1S + +// Start connection on bearer and detect change at AP +RUN_TEST_STEP 100 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini StartConn1_1 +RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification1A +RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification1S + +// Stop connection and detect change at AP +RUN_TEST_STEP 100 te_esockteststepsSuite stoprconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini StopConn1_1 +RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyUnavailable +RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification2A +RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification2S + + +// Cancel the notification request +RUN_TEST_STEP 100 te_esockteststepsSuite CancelAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CancelAPNotifRequestA +RUN_TEST_STEP 100 te_esockteststepsSuite CancelAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CancelAPNotifRequestS + +// Clean up connections +RUN_TEST_STEP 100 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseConn1 + +// Close and cleanup resources +RUN_TEST_STEP 100 te_esockteststepsSuite CloseRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseConnectionServA +RUN_TEST_STEP 100 te_esockteststepsSuite CloseRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseConnectionServS +RUN_TEST_STEP 100 te_esockteststepsSuite closersocketservStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseSockSvr1 +RUN_TEST_STEP 100 te_esockteststepsSuite cleanallStep + +// stop simtsy +RUN_TEST_STEP 100 te_esockteststepsSuite StopSimTSYStep z:\testdata\configs\te_controlplanenetworkside_test28.ini SimTsy + +// Shutdown +RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script +RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script + +END_TESTCASE PDP-ControlPlane-0028 diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane29.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane29.script Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,90 @@ +// +// 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" +// 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: +// + + +PRINT Running CASE29 +PRINT Validating AP Queries on the PDP tier. + +// +LOAD_SUITE te_esockteststepsSuite -SharedData +RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script + +START_TESTCASE PDP-ControlPlane-0029 +//! @SYMTestCaseID PDP-ControlPlane-0029 +//! @SYMTestCaseDesc Validating AP Queries on the PDP tier. +//! @SYMPREQ 2624 +//! @SYMTestActions Creating server connection, opening connections on SIM1/SIM2 validating AP Query for PDP Tier. +//! @SYMTestExpectedResults AP Queries successful. +//! @SYMTestPriority High +//! @SYMTestStatus Under development +//! @SYMTestType UT + +// start simtsy +RUN_TEST_STEP 100 te_esockteststepsSuite StartSimTSYStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SimTsy + +// create and open the first connection +RUN_TEST_STEP 100 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CreateSockSvr1 +RUN_TEST_STEP 100 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\te_controlplanenetworkside_test29.ini ConnectSockSvr1 +RUN_TEST_STEP 100 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CreateConn1 +RUN_TEST_STEP 100 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini OpenConn1 + +// Connect at *link* tier +RUN_TEST_STEP 100 te_esockteststepsSuite CreateRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CreateConnectionServ1 +RUN_TEST_STEP 100 te_esockteststepsSuite ConnectRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test29.ini ConnectConnectionServ1 + +// Make first *link* AP unavailable *AP2* +RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyAvailable + +RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery1 + +// Make first *link* AP available *AP2* +RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyUnavailable + +RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery1a + +// Start connection on bearer and detect change at AP +RUN_TEST_STEP 100 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini StartConn1_1 +// This will tell us the number of started APs (1) and its id. +RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery2 + +// Clean up connections + +RUN_TEST_STEP 100 te_esockteststepsSuite stoprconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini StopConn1_1 +RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyUnavailable + +RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery1a + +RUN_TEST_STEP 100 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CloseConn1 + +// Close and cleanup resources +RUN_TEST_STEP 100 te_esockteststepsSuite CloseRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CloseConnectionServ1 +RUN_TEST_STEP 100 te_esockteststepsSuite closersocketservStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CloseSockSvr1 +RUN_TEST_STEP 100 te_esockteststepsSuite cleanallStep + +// stop simtsy +RUN_TEST_STEP 100 te_esockteststepsSuite StopSimTSYStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SimTsy + +// Shutdown +RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script +RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script + +END_TESTCASE PDP-ControlPlane-0029 + + + + + + diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp --- a/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -1122,7 +1122,7 @@ { if (errTsy == KErrNone) { - err = KErrNone; + err = KErrCompletion; } else if ((errTsy & 0xFFFF0000) != 0xFFFF0000) { diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini Fri Feb 19 23:59:33 2010 +0200 @@ -410,3 +410,23 @@ ParametersType = UmtsR99QoSAndOnTableRecord ParametersRecordId = 2 PolicySelector = 1 + +[PrimaryActivationEndUpWithInactiveContext] +SimTsyTestNum = 103 +PrimaryIapId1 = 2 +PrimaryActivationErr1 = -17 + +[PrimaryActivationEndUpWithInactiveContext2] +SimTsyTestNum = 104 +PrimaryIapId1 = 2 +PrimaryActivationErr1 = -2 + +[PrimaryActivationEndUpWithInactiveContext3] +SimTsyTestNum = 105 +PrimaryIapId1 = 2 +PrimaryActivationErr1 = -65536 + +[PrimaryActivationEndUpWithInactiveContext4] +SimTsyTestNum = 106 +PrimaryIapId1 = 2 +PrimaryActivationErr1 = -17 diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt Fri Feb 19 23:59:33 2010 +0200 @@ -2566,3 +2566,297 @@ NotifyContextStatusChange = SECONDARY1, 0, 5 NotifyContextStatusChange = SECONDARY1, 0, 3 + +############################################################################ +############################################################################ +################### T E S T 103 #################### +############################################################################ +############################################################################ +# Test case for the case when context becomes inactive during activation and the error returned to PDP is KErrNone. This will be translated to + +KErrCompletion +############################################################################ +[test103] +# DefaultContextparamGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, + +2 + +# ContextConfigGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1 +# TRel99ContextConfig = , , , , +# , , +R99ContextConfig = PRIMARY1, 0, -600, 0, 0, 0, 0, 0 + + +# TFTfilter = 0 1 2 3 4 +# 5 6 7 8 9 10 +# 11 +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 1 2 3 4 +# 5 6 7 8 +# 9 10 11 12 +# +# 13 14 15 16 +# 17 18 +# 19 20 21 22 +# 23 24 +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 + +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 + + + +#TProfileNegR99 = +# +# +# +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 + +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 + +# CommSetup = +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1 + + +############################################################################ +# failure events +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , + +# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6 + +############################################################################ +############################################################################ +################### T E S T 104 #################### +############################################################################ +############################################################################ +# Test case for the case when context becomes inactive during activation and the error returned to PDP is KErrGeneral +############################################################################ +[test104] +# DefaultContextparamGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, + +2 + +# ContextConfigGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1 +# TRel99ContextConfig = , , , , +# , , +R99ContextConfig = PRIMARY1, 0, -602, 0, 0, 0, 0, 0 + + +# TFTfilter = 0 1 2 3 4 +# 5 6 7 8 9 10 +# 11 +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 1 2 3 4 +# 5 6 7 8 +# 9 10 11 12 +# +# 13 14 15 16 +# 17 18 +# 19 20 21 22 +# 23 24 +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 + +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 + + + +#TProfileNegR99 = +# +# +# +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 + +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 + +# CommSetup = +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1 + + +############################################################################ +# failure events +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , + +# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6 + +############################################################################ +############################################################################ +################### T E S T 105 #################### +############################################################################ +############################################################################ +# Test case for the case when context becomes inactive during activation and the error returned to PDP is tsy extended error code. +############################################################################ +[test105] +# DefaultContextparamGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, + +2 + +# ContextConfigGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1 +# TRel99ContextConfig = , , , , +# , , +R99ContextConfig = PRIMARY1, 0, -401, 0, 0, 0, 0, 0 + + +# TFTfilter = 0 1 2 3 4 +# 5 6 7 8 9 10 +# 11 +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 1 2 3 4 +# 5 6 7 8 +# 9 10 11 12 +# +# 13 14 15 16 +# 17 18 +# 19 20 21 22 +# 23 24 +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 + +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 + + + +#TProfileNegR99 = +# +# +# +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 + +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 + +# CommSetup = +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1 + + +############################################################################ +# failure events +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , + +# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6 + +############################################################################ +############################################################################ +################### T E S T 106 #################### +############################################################################ +############################################################################ +# Test case for the case when context becomes inactive during activation and get last error function returns an error. +############################################################################ +[test106] +# DefaultContextparamGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, + +2 + +# ContextConfigGPRS = , , , , , +# ProtocolConfigOption = , , , , +# , , , +SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1 +# TRel99ContextConfig = , , , , +# , , +R99ContextConfig = PRIMARY1, 0, -300, 0, 0, 0, 0, 0 + + +# TFTfilter = 0 1 2 3 4 +# 5 6 7 8 9 10 +# 11 +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 1 2 3 4 +# 5 6 7 8 +# 9 10 11 12 +# +# 13 14 15 16 +# 17 18 +# 19 20 21 22 +# 23 24 +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 + +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 + + + +#TProfileNegR99 = +# +# +# +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 + +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 + +# CommSetup = +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1 + + +############################################################################ +# failure events +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , + +# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6 \ No newline at end of file diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Fri Feb 19 23:59:33 2010 +0200 @@ -481,7 +481,78 @@ END_TESTCASE NET-Spud-NetworkSide-0825 run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script +run_script z:\TestData\scripts\te_esock_test_loadesock.script +// Unusual cases tests. This happens if TSY acting wrong. + +START_TESTCASE NET-Spud-NetworkSide-0826 +//! @SYMTestCaseID NET-Spud-NetworkSide-0826 +//! @SYMTestCaseDesc Sanity check: Primary context activation ends up with inactive context. +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context but return error code = KErrNone. SpudTel should treat this situation accordingly and return KErrCompletion. +//! @SYMTestExpectedResults Primary context activation should return KErrCompletion. +//! @SYMTestPriority Normal +//! @SYMTestStatus Implemented +//! @SYMTestType CIT +RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext +DELAY 3000 +RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck +END_TESTCASE NET-Spud-NetworkSide-0826 + +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script +run_script z:\TestData\scripts\te_esock_test_loadesock.script + +START_TESTCASE NET-Spud-NetworkSide-0827 +//! @SYMTestCaseID NET-Spud-NetworkSide-0827 +//! @SYMTestCaseDesc Sanity check: Primary context activation ends up with inactive context. +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context but return error code = KErrGeneral. SpudTel should treat this situation accordingly and return KErrGeneral. +//! @SYMTestExpectedResults Primary context activation should return KErrGeneral. +//! @SYMTestPriority Normal +//! @SYMTestStatus Implemented +//! @SYMTestType CIT +RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext2 +DELAY 3000 +RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck +END_TESTCASE NET-Spud-NetworkSide-0827 + +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script +run_script z:\TestData\scripts\te_esock_test_loadesock.script + +START_TESTCASE NET-Spud-NetworkSide-0828 +//! @SYMTestCaseID NET-Spud-NetworkSide-0828 +//! @SYMTestCaseDesc Sanity check: Primary context activation ends up with inactive context. +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context but return an extended error code. SpudTel should treat this situation accordingly and return that extended error code. +//! @SYMTestExpectedResults Primary context activation should return -65536. +//! @SYMTestPriority Normal +//! @SYMTestStatus Implemented +//! @SYMTestType CIT +RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext3 +DELAY 3000 +RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck +END_TESTCASE NET-Spud-NetworkSide-0828 + +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script +run_script z:\TestData\scripts\te_esock_test_loadesock.script + +//The following testcase is for covering all the corner of the code for the case when primary context activation ends up with inactive context. + +START_TESTCASE NET-Spud-NetworkSide-0829 +//! @SYMTestCaseID NET-Spud-NetworkSide-0829 +//! @SYMTestCaseDesc Sanity check: Primary context activation ends up with inactive context. +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context. The function GetLastErrorCause, which is used for getting the last error code, will complete with KErrGeneral. +//! @SYMTestExpectedResults Primary context activation should return KErrCompletion. +//! @SYMTestPriority Normal +//! @SYMTestStatus Implemented +//! @SYMTestType CIT +RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext4 +DELAY 3000 +RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck +END_TESTCASE NET-Spud-NetworkSide-0829 + +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script RUN_UTILS MakeReadWrite c:\simtsy\config.txt RUN_UTILS MakeReadWrite c:\config.txt diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h --- a/telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h Fri Feb 19 23:59:33 2010 +0200 @@ -28,7 +28,12 @@ #include #include #include + +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS #include +#else +#include +#endif #include const TInt KSubCon3GPPExtParamsFactoryUid = 0x1020D460; diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserver/etelpacketdata/group/bld.inf --- a/telephonyserver/etelpacketdata/group/bld.inf Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserver/etelpacketdata/group/bld.inf Fri Feb 19 23:59:33 2010 +0200 @@ -22,6 +22,7 @@ PRJ_EXPORTS ../inc/etelpckt.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelpckt.h) ../inc/etelQoS.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelqos.h) +../inc/eteldefaultqos.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(eteldefaultqos.h) ../inc/pcktlist.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pcktlist.h) ../inc/pcktretrieve.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pcktretrieve.h) ../inc/mbmstypes.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mbmstypes.h) diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserver/etelpacketdata/inc/etelQoS.h --- a/telephonyserver/etelpacketdata/inc/etelQoS.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserver/etelpacketdata/inc/etelQoS.h Fri Feb 19 23:59:33 2010 +0200 @@ -17,10 +17,10 @@ // Copyright (c) Symbian Software Ltd. 2002-2009. All rights reserved. // // - +#ifndef __ETELQOS_H__ +#define __ETELQOS_H__ -#if!defined(__ETELQOS_H__) -#define __ETELQOS_H__ +#ifndef __ETELDEFAULTQOS_H__ #include "etelpckt.h" @@ -753,3 +753,4 @@ #endif +#endif \ No newline at end of file diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserver/etelpacketdata/inc/eteldefaultqos.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserver/etelpacketdata/inc/eteldefaultqos.h Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,103 @@ +// 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: +// +#ifndef __ETELDEFAULTQOS_H__ +#define __ETELDEFAULTQOS_H__ + +#ifndef __ETELQOS_H__ + +class RPacketQoS + { + // The enums TTrafficClass, TDeliveryOrder,TErroneousSDUDelivery, TBitErrorRatio, + // TSDUErrorRatio, TTrafficHandlingPriority have been assigned values because + // the same enums are used both in the TQoSR99_R4Requested / Negotiated classes and + // in the TQoSCapsR99_R4 class. The Caps class has to indicate which, for instance, + // traffic classes are supported in a bitfield, so the enums have been defined as + // different bits in a bit field. +public: + enum TTrafficClass + { + ETrafficClassUnspecified = 0x01, //< Traffic class - Unspecified + ETrafficClassConversational = 0x02, //< Traffic class - Conversational + ETrafficClassStreaming = 0x04, //< Traffic class - Streaming + ETrafficClassInteractive = 0x08, //< Traffic class - Interactive + ETrafficClassBackground = 0x10 //< Traffic class - Background + }; + + enum TDeliveryOrder + { + EDeliveryOrderUnspecified = 0x01, //< SDU Delivery order - Unspecified + EDeliveryOrderRequired = 0x02, //< SDU Delivery order - Required to be in sequence + EDeliveryOrderNotRequired = 0x04 //< SDU Delivery order - Not Required to be in sequence + }; + + enum TErroneousSDUDelivery // Erroneous SDU Delivery + { + EErroneousSDUDeliveryUnspecified = 0x01, //< Unspecified + EErroneousSDUNoDetection = 0x02, //< Erroneous SDUs delivered - Error detection not considered. + EErroneousSDUDeliveryRequired = 0x04, //< Erroneous SDUs delivered + error indication - Error detection employed. + EErroneousSDUDeliveryNotRequired = 0x08 //< Erroneous SDUs discarded - Error detection is employed. + }; + + enum TBitErrorRatio // Residual Bit Error Rate + { + EBERUnspecified = 0x01, //< Target residual undetected BER - Unspecified + EBERFivePerHundred = 0x02, //< Target residual BER - 0.05 + EBEROnePerHundred = 0x04, //< Target residual BER - 0.01 + EBERFivePerThousand = 0x08, //< Target residual BER - 0.005 + EBERFourPerThousand = 0x10, //< Target residual BER - 0.004 + EBEROnePerThousand = 0x20, //< Target residual BER - 0.001 + EBEROnePerTenThousand = 0x40, //< Target residual BER - 0.0001 + EBEROnePerHundredThousand = 0x80, //< Target residual BER - 0.00001 + EBEROnePerMillion = 0x100, //< Target residual BER - 0.000001 + EBERSixPerHundredMillion = 0x200 //< Target residual BER - 0.00000006 + }; + + enum TSDUErrorRatio // SDU Error Ratio + { + ESDUErrorRatioUnspecified = 0x01, //< Target value of Erroneous SDUs - Unspecified + ESDUErrorRatioOnePerTen = 0x02, //< Target SDU error ratio - 0.1 + ESDUErrorRatioOnePerHundred = 0x04, //< Target SDU error ratio - 0.01 + ESDUErrorRatioSevenPerThousand = 0x08, //< Target SDU error ratio - 0.007 + ESDUErrorRatioOnePerThousand = 0x10, //< Target SDU error ratio - 0.001 + ESDUErrorRatioOnePerTenThousand = 0x20, //< Target SDU error ratio - 0.0001 + ESDUErrorRatioOnePerHundredThousand = 0x40, //< Target SDU error ratio - 0.00001 + ESDUErrorRatioOnePerMillion = 0x80 //< Target SDU error ratio - 0.000001 + }; + + enum TTrafficHandlingPriority // Traffic handling priority + { + ETrafficPriorityUnspecified = 0x01, //< Unspecified Priority level + ETrafficPriority1 = 0x02, //< Priority level 1 + ETrafficPriority2 = 0x04, //< Priority level 2 + ETrafficPriority3 = 0x08 //< Priority level 3 + }; + /** + Source statistics descriptor - as defined in 3GPP TS 23.107 and TS 24.008. + + @publishedPartner + @released + */ + enum TSourceStatisticsDescriptor + { + /** Unknown source statistics descriptor. */ + ESourceStatisticsDescriptorUnknown = 0x0, + /** Speech source statistics descriptor. */ + ESourceStatisticsDescriptorSpeech = 0x01, + }; + }; + +#endif//#ifndef__ETELQOS_H__ + +#endif//#ifndef__ETELDEFAULTQOS_H__ diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserver/etelserverandcore/group/BLD.INF --- a/telephonyserver/etelserverandcore/group/BLD.INF Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserver/etelserverandcore/group/BLD.INF Fri Feb 19 23:59:33 2010 +0200 @@ -29,10 +29,10 @@ ../INC/ET_PHONE.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.h) ../INC/et_phone_util.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone_util.h) ../INC/ET_PHONE.INL SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.inl) -../INC/ET_TSY.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_tsy.h) +../INC/ET_TSY.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_tsy.h) ../INC/secure/ET_CLSVR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_clsvr.h) ../INC/ET_STRUC.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_struc.h) -../INC/et_struct.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_struct.h) +../INC/et_struct.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_struct.h) ../INC/EXTERROR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(exterror.h) ../INC/ETBUFFER.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etbuffer.h) ../INC/etslotnum.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etslotnum.h) diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/common_tsy/test/component/group/component_test.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,51 @@ +"\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_packetservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetservice_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_packetqos_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetqos_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_networkcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_networkcontrol_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_airtimeduration_individual.script"-"c:\testdata\scripts\te_ctsycomponent_airtimeduration_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_phonepower_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonepower_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_personalisation_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_personalisation_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_apncontrollist_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_apncontrollist_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_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_callemergency_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callemergency_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_callbarring_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callbarring_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_eapauthentication_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_eapauthentication_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\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" +"\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 diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h --- a/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h Fri Feb 19 23:59:33 2010 +0200 @@ -39,7 +39,6 @@ void TestDialNoFdnCheck0001bL(); void TestDialNoFdnCheck0001cL(); void TestDialNoFdnCheck0002L(); - void TestDialNoFdnCheck0003L(); void TestDialNoFdnCheck0004L(); void TestDialNoFdnCheck0005L(); void TestDialNoFdnCheck0006L(); diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script Fri Feb 19 23:59:33 2010 +0200 @@ -24,7 +24,7 @@ //!@SYMTestActions Invokes RMobileCall::DialNoFdnCheck for voice calls //!@SYMTestExpectedResults Pass //!@SYMTestType CT -//RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001L +RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001L END_TESTCASE BA-CTSY-FXD-CDNFC-0001 START_TESTCASE BA-CTSY-FXD-CDNFC-0001c @@ -49,17 +49,6 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0002L END_TESTCASE BA-CTSY-FXD-CDNFC-0002 -START_TESTCASE BA-CTSY-FXD-CDNFC-0003 -//!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0003 -//!@SYMComponent telephony_ctsy -//!@SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck with bad parameter data for voice calls -//!@SYMTestPriority High -//!@SYMTestActions Invokes RMobileCall::DialNoFdnCheck with bad parameter data for voice calls -//!@SYMTestExpectedResults Pass -//!@SYMTestType CT -RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0003L -END_TESTCASE BA-CTSY-FXD-CDNFC-0003 - START_TESTCASE BA-CTSY-FXD-CDNFC-0006b //!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0006b //!@SYMComponent telephony_ctsy diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp --- a/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -36,7 +36,6 @@ ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001bL); ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001cL); ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0002L); - ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0003L); ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0004L); ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0005L); @@ -372,19 +371,18 @@ // TEST to show defect 120102 //------------------------------------------------------------------------- - // get out before it panics - ERR_PRINTF2(_L("$CTSYKnownFailure: defect id = %d"), 120102); - ASSERT_TRUE(EFalse); - iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData); - // call of this API should lead to set CallId = 1, but because of defect 120102 it doesn't occure - CallGetMobileCallInfoL(callId, mobileService, KSomeNumber); + CallGetMobileCallInfoL(callId, mobileService, KSomeNumber); + + completeData.Close(); + TMockLtsyCallData0 mockDataComplete2(callId, mobileService); + mockDataComplete2.SerialiseL(completeData); iMockLTSY.CompleteL(EMobileCallDialNoFdnCheck, KErrNone, completeData); call.DialNoFdnCheck(requestStatus, pckgCallParams, KSomeNumber); User::WaitForRequest(requestStatus); - ERR_PRINTF2(_L("$CTSYKnownFailure: defect id = %d"), 120102); + ASSERT_EQUALS(KErrNone, requestStatus.Int()); AssertMockLtsyStatusL(); @@ -393,7 +391,7 @@ /** -@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001 +@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001b @SYMComponent telephony_ctsy @SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck for voice calls @SYMTestPriority High @@ -623,267 +621,163 @@ void CCTsyFixedDiallingFU::TestDialNoFdnCheck0002L() { -// This test should test cancellation of GetCallParams -// If this API does not have a cancel, the test step should be completely removed. - - OpenEtelServerL(EUseExtendedError); - CleanupStack::PushL(TCleanupItem(Cleanup,this)); - OpenPhoneL(); + OpenEtelServerL(EUseExtendedError); + CleanupStack::PushL(TCleanupItem(Cleanup,this)); + OpenPhoneL(); - RBuf8 expectData; - CleanupClosePushL(expectData); - - RBuf8 completeData; - CleanupClosePushL(completeData); - - //-- For Voice1 ------------------------- - TBuf<256> lineName(KMmTsyVoice1LineName); - - // Open new line - RLine line; - TInt errorCode = line.Open(iPhone, lineName); - ASSERT_EQUALS(KErrNone, errorCode); - CleanupClosePushL(line); - - // some data for opening call - _LIT(KDoubleColon, "::"); - - TBuf<256> name; - name = KMmTsyPhoneName; - name.Append(KDoubleColon); - name.Append(lineName); - name.Append(KDoubleColon); - - TInt callId = 1; - // create new incoming call - TName incomingCallName; - RMobileCall::TMobileCallStatus mobileCallStatus = RMobileCall::EStatusIdle; - RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService; - - TRequestStatus requestStatus; - errorCode = CreateIncomingCallL(line, callId, lineName, incomingCallName, - mobileService, mobileCallStatus); - ASSERT_EQUALS(KErrNone, errorCode); + RBuf8 expectData; + CleanupClosePushL(expectData); + + RBuf8 completeData; + CleanupClosePushL(completeData); + + TInt errorCode = KErrNone; + + //-- For Voice1 ------------------------- + + TBuf<256> lineName(KMmTsyVoice1LineName); + // Open new line + RLine line; + errorCode = line.Open(iPhone, lineName); + ASSERT_EQUALS(KErrNone, errorCode); + CleanupClosePushL(line); + // open call + _LIT(KDoubleColon, "::"); + TBuf<256> name; + name = KMmTsyPhoneName; + name.Append(KDoubleColon); + name.Append(lineName); + name.Append(KDoubleColon); + + RMobileCall call; + errorCode = call.OpenNewCall(line, name); + ASSERT_EQUALS(KErrNone, errorCode); + CleanupClosePushL(call); + + TRequestStatus requestStatus; + _LIT(KSomeNumber, "123456789"); + + RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService; + + TInt expectCallId = 0; // -------- make for this call callId > 0 -------------------------------------- - RMobileCall::TMobileCallInfoV1 callInfo; - - line.NotifyIncomingCall(requestStatus, incomingCallName); + RMobileCall::TMobileCallInfoV8 callInfo; - callInfo.iService = mobileService; - TMockLtsyCallData1 idleCallData(callId, mobileService, callInfo); - idleCallData.SerialiseL(completeData); - - TRequestStatus mockLtsyStatus; - iMockLTSY.NotifyTerminated(mockLtsyStatus); - iMockLTSY.CompleteL(EEtelLineNotifyIncomingCall, KErrNone, completeData); - User::WaitForRequest(mockLtsyStatus); - AssertMockLtsyStatusL(); - ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int()); - - User::WaitForRequest(requestStatus); - AssertMockLtsyStatusL(); - ASSERT_EQUALS(KErrNone, requestStatus.Int()); - - RMobileCall call; - errorCode = call.OpenExistingCall(line, incomingCallName); - ASSERT_EQUALS(KErrNone, errorCode); - CleanupClosePushL(call); - //------------------------------------------------------------------------- - + //------------------------------------------------------------------------- + // Test cancelling of RMobileCall::DialNoFdnCheck //------------------------------------------------------------------------- - // Test cancelling of RCall::GetCallParams - //------------------------------------------------------------------------- - _LIT(KSomeNumber, "123456789"); - // data for ExpextL + + // data for ExpextL RMobileCall::TMobileCallParamsV1 callParams; RMobileCall::TMobileCallParamsV1Pckg pckgCallParams(callParams); - callInfo.iRemoteParty.iDirection = RMobileCall::EMobileTerminated; - callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating; - callInfo.iService = mobileService; - callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber ); - + callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating; + callInfo.iService = mobileService; + callInfo.iStatus = RMobileCall::EStatusUnknown; + callInfo.iCallId = -1; + callInfo.iExitCode =0; + callInfo.iEmergency =0; + callInfo.iForwarded =0; + callInfo.iPrivacy = RMobilePhone::EPrivacyUnspecified; + callInfo.iAlternatingCall = RMobilePhone::EAlternatingModeUnspecified; + callInfo.iTch = RMobileCall::ETchUnknown; + callInfo.iRemoteParty.iCallingName = KNullDesC; + callInfo.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown; + callInfo.iRemoteParty.iRemoteNumber.iTelNumber = KNullDesC; + callInfo.iRemoteParty.iRemoteNumber.iNumberPlan = RMobilePhone::EUnknownNumberingPlan; + callInfo.iRemoteParty.iRemoteNumber.iTypeOfNumber = RMobilePhone::EUnknownNumber; + callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber ); + callInfo.iDialledParty.iNumberPlan = + RMobilePhone::EUnknownNumberingPlan; + callInfo.iDialledParty.iTypeOfNumber = + RMobilePhone::EUnknownNumber; + TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV1 > - mockCallData(callId, mobileService, callParams, callInfo); + mockCallData(expectCallId, mobileService, callParams, callInfo); mockCallData.SerialiseL(expectData); + // Expect the dial + iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData, KErrNone); + // Dial and cancel call.DialNoFdnCheck(requestStatus, pckgCallParams, KSomeNumber); call.CancelAsyncRequest(EMobileCallDialNoFdnCheck); + + // prepare and complete Mobile Call info + + TInt callId = 1; + + _LIT(KNullDesC , ""); - User::WaitForRequest(requestStatus); - - ASSERT_EQUALS(KErrCancel, requestStatus.Int()); - AssertMockLtsyStatusL(); - - CleanupStack::PopAndDestroy(5, this); // expectData, this ... - - } - + RBuf8 data; + CleanupClosePushL(data); -/** -@SYMTestCaseID BA-CTSY-FXD-CDNFC-0003 -@SYMComponent telephony_ctsy -@SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck with bad parameter data for voice calls -@SYMTestPriority High -@SYMTestActions Invokes RMobileCall::DialNoFdnCheck with bad parameter data for voice calls -@SYMTestExpectedResults Pass -@SYMTestType CT -*/ -void CCTsyFixedDiallingFU::TestDialNoFdnCheck0003L() - { - - OpenEtelServerL(EUseExtendedError); - CleanupStack::PushL(TCleanupItem(Cleanup,this)); - OpenPhoneL(); + RMobileCall::TMobileCallInfoV1 callInfo2; + callInfo2.iDialledParty.iTelNumber.Copy(KSomeNumber); + callInfo2.iService = mobileService; + callInfo2.iEmergency = EFalse; + callInfo2.iRemoteParty.iCallingName = KNullDesC; + callInfo2.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown; + callInfo2.iRemoteParty.iRemoteNumber.iTelNumber = KNullDesC; + callInfo2.iRemoteParty.iRemoteNumber.iNumberPlan = RMobilePhone::EUnknownNumberingPlan; + callInfo2.iRemoteParty.iRemoteNumber.iTypeOfNumber = RMobilePhone::EUnknownNumber; + callInfo2.iForwarded = EFalse; + callInfo2.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallRemoteParty; - RBuf8 expectData; - CleanupClosePushL(expectData); - - RBuf8 completeData; - CleanupClosePushL(completeData); - - //-- For Voice1 ------------------------- - TBuf<256> lineName(KMmTsyVoice1LineName); - - // Open new line - RLine line; - TInt errorCode = line.Open(iPhone, lineName); - ASSERT_EQUALS(KErrNone, errorCode); - CleanupClosePushL(line); - - // some data for opening call - _LIT(KDoubleColon, "::"); + TMockLtsyCallData1 callInfoData(callId, mobileService, callInfo2); + callInfoData.SerialiseL(data); + + iMockLTSY.CompleteL(EMobileCallGetMobileCallInfo, KErrNone, data); + + //Pause the MockLTSY so we can program the sequence of Expect - Completes involved + //with cancelling + iMockLTSY.PauseCompletion(); - TBuf<256> name; - name = KMmTsyPhoneName; - name.Append(KDoubleColon); - name.Append(lineName); - name.Append(KDoubleColon); - - TInt callId = 1; - // create new incoming call - TName incomingCallName; - RMobileCall::TMobileCallStatus mobileCallStatus = RMobileCall::EStatusIdle; - RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService; - - TRequestStatus requestStatus; - errorCode = CreateIncomingCallL(line, callId, lineName, incomingCallName, - mobileService, mobileCallStatus); - ASSERT_EQUALS(KErrNone, errorCode); - - // -------- make for this call callId > 0 -------------------------------------- - RMobileCall::TMobileCallInfoV1 callInfo; - - line.NotifyIncomingCall(requestStatus, incomingCallName); + RMobileCall::TMobileCallStatus mobileCallStatus = RMobileCall::EStatusDialling; + TMockLtsyCallData1 mockCallDataStatus(callId, mobileService, mobileCallStatus); + completeData.Close(); + mockCallDataStatus.SerialiseL(completeData); + + //Change state to dialling, this set the call ID + iMockLTSY.CompleteL(EMobileCallNotifyMobileCallStatusChange, KErrNone, completeData); - callInfo.iService = mobileService; - TMockLtsyCallData1 idleCallData(callId, mobileService, callInfo); - idleCallData.SerialiseL(completeData); - - TRequestStatus mockLtsyStatus; - iMockLTSY.NotifyTerminated(mockLtsyStatus); - iMockLTSY.CompleteL(EEtelLineNotifyIncomingCall, KErrNone, completeData); - User::WaitForRequest(mockLtsyStatus); - AssertMockLtsyStatusL(); - ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int()); + + TInt hangUpCause = KErrGsmReleaseByUser; + TBool autoStChangeDisable = ETrue; + TMockLtsyCallData2 mockCallData2(callId, mobileService, + hangUpCause, + autoStChangeDisable); + expectData.Close(); + mockCallData2.SerialiseL(expectData); + // Since the call ID has been set, the CTSY will go ahead with the cancellation + // by hanging up. + iMockLTSY.ExpectL(EEtelCallHangUp, expectData); - User::WaitForRequest(requestStatus); - AssertMockLtsyStatusL(); - ASSERT_EQUALS(KErrNone, requestStatus.Int()); + // Cancelled Dial request. After this CTSY hangs up the call and it goes to idle state. + - RMobileCall call; - errorCode = call.OpenExistingCall(line, incomingCallName); - ASSERT_EQUALS(KErrNone, errorCode); - CleanupClosePushL(call); - //------------------------------------------------------------------------- - - _LIT(KSomeNumber, "123456789"); + RMobileCall::TMobileCallStatus mobileCallStatus2 = RMobileCall::EStatusIdle; + TMockLtsyCallData1 mockCallDataStatus2(callId, mobileService, mobileCallStatus2); + completeData.Close(); + mockCallDataStatus2.SerialiseL(completeData); + + // Complete the hangup + iMockLTSY.CompleteL(EMobileCallNotifyMobileCallStatusChange, KErrGsmReleaseByUser, completeData); + + // Release the MockLTSY so that the above sequence is triggered. + iMockLTSY.ResumeCompletion(); - //------------------------------------------------------------------------- - // Test B: Test passing wrong descriptor size to parameter in - // RCall::GetCallParams - //------------------------------------------------------------------------- - RMobileCall::TMobileCallParamsV1 callParams; - RMobileCall::TMobileCallParamsV1Pckg pckgCallParams(callParams); - - // --- data for ExpectL --- - // set up callParams for case of pckgCallParams zero length - callParams.iSpeakerControl = - RCall::EMonitorSpeakerControlOnUntilCarrier; - callParams.iSpeakerVolume = RCall::EMonitorSpeakerVolumeLow; - callParams.iInterval = 0; - callParams.iWaitForDialTone = RCall::EDialToneWait; - callParams.iIdRestrict = RMobileCall::EIdRestrictDefault; - callParams.iCug.iExplicitInvoke = EFalse; - callParams.iCug.iCugIndex = 0xFFFF; - callParams.iCug.iSuppressPrefCug = EFalse; - callParams.iCug.iSuppressOA = EFalse; - callParams.iAutoRedial = EFalse; - // set up callInfo# + // Check results. + User::WaitForRequest(requestStatus); + AssertMockLtsyStatusL(); + ASSERT_EQUALS(KErrCancel, requestStatus.Int()); + + + CleanupStack::PopAndDestroy(6, this); // expectData, this ... - RMobileCall::TMobileCallInfoV8 callInformation; - callInformation.iRemoteParty.iDirection = RMobileCall::EMobileTerminated; - callInformation.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating; - callInformation.iService = mobileService; - callInformation.iDialledParty.iTelNumber.Copy( KSomeNumber ); - TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV8 > - mockCallData2(callId, mobileService, callParams, callInformation); - mockCallData2.SerialiseL(expectData); - - // --- data for CompleteL --- - TMockLtsyCallData0 mockDataComplete(callId, mobileService); - completeData.Close(); - mockDataComplete.SerialiseL(completeData); - - iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData); - iMockLTSY.CompleteL(EMobileCallDialNoFdnCheck, KErrNone, completeData); - - // set Length of param to 0 - pckgCallParams.SetLength(0); - // call DialNoFdnCheck itself - call.DialNoFdnCheck(requestStatus, pckgCallParams, KSomeNumber); - - User::WaitForRequest(requestStatus); - ASSERT_EQUALS(KErrNone, requestStatus.Int()); - AssertMockLtsyStatusL(); - - //------------------------------------------------------------------------- - // Test A: Test passing wrong version of parameters to - // RCall::GetCallParams use TMobileCallParamsV2 instead of TMobileCallParamsV1 - //------------------------------------------------------------------------- - RMobileCall::TMobileCallParamsV2 callParamsV2; - RMobileCall::TMobileCallParamsV2Pckg pckgCallParamsV2(callParamsV2); - - // data for ExpextL - callInfo.iRemoteParty.iDirection = RMobileCall::EMobileTerminated; - callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating; - callInfo.iService = mobileService; - callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber ); - - TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV1 > - mockCallData(callId, mobileService, callParams, callInfo); - expectData.Close(); - mockCallData.SerialiseL(expectData); - - iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData, KErrGeneral); // use KErrGeneral just only to avoid waiting for timeout - call.DialNoFdnCheck(requestStatus, pckgCallParamsV2, KSomeNumber); - User::WaitForRequest(requestStatus); - - // Possible defect. There is no checking of iExtensionId of geting params in - // TInt CMmVoiceCallTsy::DialNoFdnCheck(const TTsyReqHandle aTsyReqHandle, const TDesC8* aCallParams, TDesC* aTelNumber ) - // and in - // TInt CMmCallGsmWcdmaExt::DialL(RMobilePhone::TMobileService aCallMode, const TDesC8* aCallParams, const TDesC* aTelNumber, TInt aExtensionId ) - ERR_PRINTF2(_L("$CTSYKnownFailure: defect id = %d"), 120105); - ASSERT_EQUALS(KErrArgument, requestStatus.Int()); - AssertMockLtsyStatusL(); - - // Done ! - CleanupStack::PopAndDestroy(5, this); // this... - } diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/common_tsy/test/integration/group/integration_test.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/integration/group/integration_test.pkg Fri Feb 19 23:59:33 2010 +0200 @@ -0,0 +1,1 @@ +"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_dtmf_auto.script"-"c:\testdata\scripts\te_ctsyintegration_dtmf_auto.script" diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/simtsy/inc/CSimPacketContext.h --- a/telephonyserverplugins/simtsy/inc/CSimPacketContext.h Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserverplugins/simtsy/inc/CSimPacketContext.h Fri Feb 19 23:59:33 2010 +0200 @@ -34,6 +34,10 @@ #include const TUint KNotFound=0xfffffff; +const TInt KLimitForErrorCodeForContextGoToInactive=-700; +const TInt KContextGoToInactiveWithNormalErrorCode=-600; +const TInt KContextGoToInactiveWithExtendedErrorCode=-400; +const TInt KContextGoToInactiveWithErrorWhenTryingToGetLastErrorCode = -300; enum TContextEvent //< Enum for the state machine { @@ -454,6 +458,9 @@ virtual void TimerCallBack(TInt aId); TCommSetupItem FindCommSettings(); +private: + TInt iLastError; + TInt iErrorCodeForGetLastErrorCause; }; #endif diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/simtsy/src/CSimPacketContext.cpp --- a/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -99,7 +99,7 @@ iTFTCreated(EFalse), iNumTFTsCreated(-1), iNumFiltersAdded(0), iContextConfigParamsIndex(0), iCommPortLoaned(EFalse),iQoSObjectCount(0), iNotifyContextConfigChangeArray(NULL), iSetConfigData(NULL), iSetConfigCallCount(0), iTFTChangeBool(0), - iNotifyContextStatusChangeIndex(0),iState(RPacketContext::EStatusInactive) + iNotifyContextStatusChangeIndex(0),iState(RPacketContext::EStatusInactive), iLastError(KErrNone), iErrorCodeForGetLastErrorCause(KErrNone) /** * Trivial Constructor. Initialises all the data members @@ -2476,7 +2476,7 @@ return KErrNone; } -TInt CSimPacketContext::GetLastErrorCause(const TTsyReqHandle aTsyReqHandle,TInt* /*aError*/) +TInt CSimPacketContext::GetLastErrorCause(const TTsyReqHandle aTsyReqHandle, TInt* aError) /** * This method is not supported in this TSY * @@ -2486,7 +2486,9 @@ */ { LOGPACKET1("CSimPacketContext::GetLastErrorCause called"); - ReqCompleted(aTsyReqHandle,KErrNotSupported); + *aError = iLastError; + ReqCompleted(aTsyReqHandle,iErrorCodeForGetLastErrorCause); + iErrorCodeForGetLastErrorCause = KErrNone; return KErrNone; } @@ -2837,8 +2839,49 @@ if (found) activateValue = iContextConfigsRel99->At(i).iActivateErrorCode; else - activateValue = iActivateFail; - + activateValue = iActivateFail; + if(activateValue == KContextGoToInactiveWithErrorWhenTryingToGetLastErrorCode) + { + //this will allow context activation move to the next state but with context being inactive + ret=ChangeState(RPacketContext::EStatusInactive); + iCurrentEvent=EContextEventNone; + iLastError = activateValue; + iErrorCodeForGetLastErrorCause=KErrGeneral; + + iContextConfigsRel99->At(i).iActivateErrorCode = iLastError; + ReqCompleted(iActivateRequestHandle, KErrNone); + + break; + } + if(activateValue <= KContextGoToInactiveWithExtendedErrorCode && activateValue > KContextGoToInactiveWithNormalErrorCode) + { + //this will allow context activation move to the next state but with context being inactive + //tsy extended error case + ret=ChangeState(RPacketContext::EStatusInactive); + iCurrentEvent=EContextEventNone; + iLastError = activateValue - KContextGoToInactiveWithExtendedErrorCode; + //move the error code to the higher 16 bit. + iLastError<<=16; + + iContextConfigsRel99->At(i).iActivateErrorCode = iLastError; + ReqCompleted(iActivateRequestHandle, KErrNone); + + break; + } + if(activateValue <= KContextGoToInactiveWithNormalErrorCode && activateValue > KLimitForErrorCodeForContextGoToInactive) + { + //this will allow context activation move to the next state but with context being inactive + //normal error case + ret=ChangeState(RPacketContext::EStatusInactive); + iCurrentEvent=EContextEventNone; + iLastError = activateValue - KContextGoToInactiveWithNormalErrorCode; + + iContextConfigsRel99->At(i).iActivateErrorCode = iLastError; + ReqCompleted(iActivateRequestHandle, KErrNone); + + break; + } + else if(activateValue != KErrNone) { ReqCompleted(iActivateRequestHandle,activateValue); diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/simtsy/src/CSimPhone.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhone.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserverplugins/simtsy/src/CSimPhone.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -222,6 +222,7 @@ iSectionName.Format(KSectionNameFormat,testNumber); if(iConfigFile->Section(iSectionName)==NULL) { + LOGPHONE2("Section for requested test number (%d) not found in the Config File",testNumber); CleanupStack::Pop(); User::Leave(KErrNotFound); } diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyserverplugins/simtsy/test/Te_SimPacket/Te_SimPacket.cpp --- a/telephonyserverplugins/simtsy/test/Te_SimPacket/Te_SimPacket.cpp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyserverplugins/simtsy/test/Te_SimPacket/Te_SimPacket.cpp Fri Feb 19 23:59:33 2010 +0200 @@ -606,8 +606,6 @@ User::WaitForRequest(stat1); TESTL(stat1.Int() == KErrNotSupported); - TESTL(iPacketContext[0].GetLastErrorCause(err) == KErrNotSupported); - iPacketContext[0].Close(); iPacketService.Close(); iPhone.Close(); diff -r 3553901f7fa8 -r 962e6306d9d2 telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp --- a/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp Tue Feb 02 01:41:59 2010 +0200 +++ b/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp Fri Feb 19 23:59:33 2010 +0200 @@ -39,7 +39,7 @@ SOURCE ../src/signalstrengthwatcher.cpp SOURCE ../src/SignalstrengthWatcherImplementationTable.cpp USERINCLUDE ../inc -LIBRARY euser.lib watcher.lib etel.lib etelmm.lib telwatcherbase.lib +LIBRARY euser.lib etel.lib etelmm.lib telwatcherbase.lib DEBUGLIBRARY comsdbgutil.lib