--- a/hwpluginsimulation/mocksy/bwins/distribution.policy Tue May 11 17:18:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/hwpluginsimulation/mocksy/eabi/distribution.policy Tue May 11 17:18:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/hwpluginsimulation/mocksy/group/distribution.policy Tue May 11 17:18:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/hwpluginsimulation/mocksy/inc/distribution.policy Tue May 11 17:18:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/hwpluginsimulation/mocksy/src/distribution.policy Tue May 11 17:18:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/telephonyprotocols/pdplayer/umts/spudtel/inc/meteldriverstrategy.h Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/inc/meteldriverstrategy.h Tue May 25 13:58:08 2010 +0300
@@ -63,6 +63,7 @@
EMbmsSetSession,
EUpdateMbmsSessionList,
EPrepareSessionList,
+ ENotifyStatusChange,
EFinishStep
};
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Tue May 25 13:58:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -454,8 +454,8 @@
}
case EInitialiseContextStep:
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate"));
- aContext.PacketContext().CancelAsyncRequest(EPacketContextActivateCancel);
+ SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextInitialiseContext"));
+ aContext.PacketContext().CancelAsyncRequest(EPacketContextInitialiseContext);
break;
default:
@@ -1095,13 +1095,16 @@
{
case EStartStep:
{
+ SPUDTEL_INFO_LOG(_L("RPacketContext::Activate()"));
aContext.PacketContext().Activate(*aStatus);
aContext.SetStrategyStep (EActivateStep);
break;
}
case EActivateStep:
+ case ENotifyStatusChange:
{
+ SPUDTEL_INFO_LOG(_L("RPacketContext::GetStatus()"));
if (aContext.PacketContext().GetStatus(aContext.ContextStatus()) != KErrNone)
{
aContext.ContextStatus() = RPacketContext::EStatusInactive;
@@ -1112,6 +1115,7 @@
case RPacketContext::EStatusActive:
// Context is now active
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextPacketDataConfigBase());
+ SPUDTEL_INFO_LOG(_L("RPacketContext::GetConfig()"));
aContext.PacketContext().GetConfig (*aStatus, aContext.ContextConfig());
aContext.SetStrategyStep (EGetConfigStep);
break;
@@ -1152,8 +1156,9 @@
default:
// Not active, not inactive. Re-request the status and try again
+ SPUDTEL_INFO_LOG(_L("RPacketContext::NotifyStatusChange()"));
aContext.PacketContext().NotifyStatusChange(*aStatus, aContext.ContextStatus());
- aContext.SetStrategyStep (EActivateStep);
+ aContext.SetStrategyStep (ENotifyStatusChange);
break;
}
break;
@@ -1253,31 +1258,31 @@
{
case EActivateStep:
{
+ SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate"));
aContext.PacketContext().CancelAsyncRequest(EPacketContextActivate);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate"));
break;
}
case EGetConfigStep:
{
- aContext.PacketContext().CancelAsyncRequest(EGetConfigStep);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EGetConfigStep"));
+ SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextGetConfig"));
+ aContext.PacketContext().CancelAsyncRequest(EPacketContextGetConfig);
break;
}
-
- case EInitialiseContextStep:
- {
- aContext.PacketContext().CancelAsyncRequest(EPacketContextInitialiseContext);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextInitialiseContext"));
- break;
- }
-
+
+ case ENotifyStatusChange:
+ {
+ SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextNotifyStatusChange"));
+ aContext.PacketContext().CancelAsyncRequest(EPacketContextNotifyStatusChange);
+ break;
+ }
+
case EGetProfileParamsStep:
{
if(KPrimaryContextId == aContext.Id())
{
+ SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
break;
}
}
@@ -1745,8 +1750,8 @@
case EGetConfigStep:
{
- aContext.MbmsPacketContext().CancelAsyncRequest(EGetConfigStep);
- SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EGetConfigStep"));
+ aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextGetConfig);
+ SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPacketContextGetConfig"));
break;
}
--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/te_UmtsGprsScpr.iby Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/te_UmtsGprsScpr.iby Tue May 25 13:58:08 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -63,6 +63,7 @@
data=EPOCROOT##epoc32\data\z\TestData\Configs\te_simtsy.ini Testdata\configs\te_simtsy.ini
data=EPOCROOT##epoc32\data\z\TestData\Configs\te_umtsgprsscpr_config.txt Testdata\configs\te_umtsgprsscpr_config.txt
data=EPOCROOT##epoc32\data\z\TestData\Configs\te_umtsgprsscpr_config2.txt Testdata\configs\te_umtsgprsscpr_config2.txt
+data=EPOCROOT##epoc32\data\z\TestData\Configs\te_umtsgprsscpr_config_noqostestnif.txt Testdata\configs\te_umtsgprsscpr_config_noqostestnif.txt
data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_UmtsGprsSCPRConfig1Case1.script Testdata\scripts\te_UmtsGprsSCPRConfig1Case1.script
--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_cap_umtsgprsscpr_noqostestnif.script Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_cap_umtsgprsscpr_noqostestnif.script Tue May 25 13:58:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -59,6 +59,8 @@
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
RUN_UTILS DeleteFile c:\simtsy\config.txt
RUN_UTILS DeleteFile c:\config.txt
RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config_noqostestnif.txt c:\simtsy\config.txt
@@ -68,6 +70,8 @@
CED -i z:\testdata\configs\te_umtsgprsscpr_captest.cfg ced.log
RUN_SCRIPT Z:\TestData\Scripts\te_Cap_UmtsGprsScprConfig1Case1.script
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
RUN_UTILS DeleteFile c:\simtsy\config.txt
RUN_UTILS DeleteFile c:\config.txt
RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
@@ -105,6 +109,8 @@
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
RUN_UTILS DeleteFile c:\simtsy\config.txt
RUN_UTILS DeleteFile c:\config.txt
RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config_noqostestnif.txt c:\simtsy\config.txt
@@ -114,6 +120,8 @@
CED -i z:\testdata\configs\te_umtsgprsscpr_captest.cfg ced.log
RUN_SCRIPT Z:\TestData\Scripts\te_Cap_UmtsGprsScprConfig1Case1.script
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
RUN_UTILS DeleteFile c:\simtsy\config.txt
RUN_UTILS DeleteFile c:\config.txt
RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
@@ -152,6 +160,8 @@
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
RUN_UTILS DeleteFile c:\simtsy\config.txt
RUN_UTILS DeleteFile c:\config.txt
RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config_noqostestnif.txt c:\simtsy\config.txt
@@ -161,6 +171,8 @@
CED -i z:\testdata\configs\te_umtsgprsscpr_captest.cfg ced.log
RUN_SCRIPT Z:\TestData\Scripts\te_Cap_UmtsGprsScprConfig1Case1.script
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
RUN_UTILS DeleteFile c:\simtsy\config.txt
RUN_UTILS DeleteFile c:\config.txt
RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
@@ -179,7 +191,7 @@
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
-CED -i z:\testdata\configs\te_umtsgprsscpr_captest.xml ced.log
+CED -i z:\testdata\configs\te_umtsgprsscpr_captest.cfg ced.log
RUN_SCRIPT Z:\TestData\Scripts\te_Cap_UmtsGprsScprConfig1Case2.script
END_TESTCASE NET-UMTS-UmtsGprsSCPR-0206
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini Tue May 25 13:58:08 2010 +0300
@@ -159,7 +159,7 @@
QoSEventReq2Idx = 9
SubConnectionCount1 = 0
SubConnectionCount2 = 3
-PolicySelector = 1
+PolicySelector = 3
ParametersType = UmtsR99QoSAndOnTableRecord
ParametersRecordId = 1
@@ -226,13 +226,13 @@
[PrimaryQoSEventDeleteWithSecondary1330]
SimTsyTestNum = 1302
IapId = 5
-PrimaryIapId1 = 11
+DefaultIapId = 11
SecondaryActivationEvent1 = EQoSEventAddPolicy
SecondaryActivationEvent2 = EQoSEventConfirm
QoSEventReq1Idx = 0
SubConnectionCount1 = 2
SubConnectionCount2 = 3
-PolicySelector = 1
+PolicySelector = 3
ParametersType = UmtsR99QoSAndOnTableRecord
ParametersRecordId = 1
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.xml Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.xml Tue May 25 13:58:08 2010 +0300
@@ -848,6 +848,21 @@
<IapId>2</IapId>
<Priority>1</Priority>
</PolicySelector>
+
+ <PolicySelector operation ="add">
+ <PolicyId>3</PolicyId>
+ <SrcAddress>0.0.0.0</SrcAddress>
+ <SrcMask>255.255.255.255</SrcMask>
+ <DstAddress>192.168.1.1</DstAddress>
+ <DstMask>255.255.255.255</DstMask>
+ <SrcPort>1031</SrcPort>
+ <SrcPortMax>1031</SrcPortMax>
+ <DstPort>3461</DstPort>
+ <DstPortMax>3461</DstPortMax>
+ <ProtocolId>17</ProtocolId>
+ <IapId>11</IapId>
+ <Priority>1</Priority>
+ </PolicySelector>
</PolicySelectorTable>
</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Tue May 25 13:58:08 2010 +0300
@@ -407,7 +407,7 @@
//! @SYMTestPriority Critical
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
-RUN_TEST_STEP 100 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide.ini MultiPrimaryActivationOk1
+RUN_TEST_STEP 200 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide.ini MultiPrimaryActivationOk1
DELAY 3000
RUN_TEST_STEP 100 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
END_TESTCASE NET-Spud-NetworkSide-0821
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/te_pdplayer_ip6.script Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/te_pdplayer_ip6.script Tue May 25 13:58:08 2010 +0300
@@ -132,7 +132,7 @@
//! @SYMTestPriority Critical
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
-RUN_TEST_STEP 60 te_spudnetworkside CSpudPrimaryEvent z:\testdata\configs\te_pdplayer_ip6.ini PrimaryQoSEventDelete1
+RUN_TEST_STEP 100 te_spudnetworkside CSpudPrimaryEvent z:\testdata\configs\te_pdplayer_ip6.ini PrimaryQoSEventDelete1
DELAY 3000
RUN_TEST_STEP 60 te_spudnetworkside CESockCheck z:\testdata\configs\te_pdplayer_ip6.ini ESockCheck
END_TESTCASE CBS-PDPLAYER-IP6-0005
@@ -399,7 +399,7 @@
//! @SYMTestPriority Critical
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
-RUN_TEST_STEP 100 te_spudnetworkside CSpudMultiPrimary z:\testdata\configs\te_pdplayer_ip6.ini MultiPrimaryActivationOk1
+RUN_TEST_STEP 200 te_spudnetworkside CSpudMultiPrimary z:\testdata\configs\te_pdplayer_ip6.ini MultiPrimaryActivationOk1
DELAY 3000
RUN_TEST_STEP 100 te_spudnetworkside CESockCheck z:\testdata\configs\te_pdplayer_ip6.ini ESockCheck
END_TESTCASE CBS-PDPLAYER-IP6-0020
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp Tue May 11 17:18:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp Tue May 25 13:58:08 2010 +0300
@@ -757,7 +757,7 @@
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
WaitForQoSEventL(_L("SecondaryActivationEvent2"),_L("SecondaryActivationEvent2Reason"));
#else
- User::After(KTimeToStartSecondary);
+ User::After(KTimeToStartSecondary*4);
VerifySubconnectionCountL(_L("SubConnectionCount2"), iap);
#endif
}
@@ -1145,7 +1145,7 @@
}
StartPrimaryOnlyL();
-
+ User::After(KTimeToStartSecondary);
TRequestStatus progressReqSt;
iInterface.ProgressNotification(iProgressBuf, progressReqSt, static_cast<TUint>(expProgress));
@@ -1961,9 +1961,18 @@
// start a secondary context with QoS parameters connected to the same address as above
// it will use the iSocket member variable to connect to the address
+
+ TInt defaultIapID = 2;
+ //the default IapID is usually defined in commsdb with value of 2.
+ //this allows us to change the default IapID, as in R4_and_R5 test the default ID is 11.
+ if(!GetIntFromConfig(ConfigSection(), _L("DefaultIapId"), defaultIapID))
+ {
+ defaultIapID = PDPIAP;
+ }
+
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
User::After(10*KTimeToStartSecondary);
- VerifySubconnectionCountL(_L("SubConnectionCount1"), PDPIAP);
+ VerifySubconnectionCountL(_L("SubConnectionCount1"), defaultIapID);
#endif
InitiateSecondaryStartL();
@@ -1976,7 +1985,7 @@
WaitForQoSEventL(_L("SecondaryActivationEvent2"), _L("SecondaryActivationEvent2Reason"));
#else
User::After(KTimeToStartSecondary);
- VerifySubconnectionCountL(_L("SubConnectionCount2"), PDPIAP);
+ VerifySubconnectionCountL(_L("SubConnectionCount2"), defaultIapID);
#endif
RSocket oppositeSecondarySocket;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp Tue May 11 17:18:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp Tue May 25 13:58:08 2010 +0300
@@ -764,7 +764,8 @@
{
// get call status
RCall::TStatus callStatus = mmCall->Status();
- if ( RCall::EStatusConnected == callStatus)
+ // Check if the call state is one that suggests that someone will listen to a DTMF.
+ if (( RCall::EStatusConnected == callStatus ) || ( RCall::EStatusDialling == callStatus )|| ( RCall::EStatusConnecting == callStatus ))
{
// get service type of call
RMobileCall::TMobileCallInfoV1 info;