# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276070286 -10800 # Node ID b836c4d4fce7e058d400c9ef57a2840fa344e967 # Parent cca59d85ca3134da0171fab565f5aee336e55fd0 Revision: 201023 Kit: 2010123 diff -r cca59d85ca31 -r b836c4d4fce7 telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2_noguqos.script --- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2_noguqos.script Tue May 25 13:58:08 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2_noguqos.script Wed Jun 09 10:58:06 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" @@ -20,6 +20,24 @@ PRINT Run all Configuration 2 Test Cases + +// Ensure that the default config is present if no cleverer one has been put there already +RUN_SCRIPT z:\testdata\scripts\exec_esock_default_to_config_1.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_umtsgprsscpr_config.txt c:\simtsy\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\TE_UmtsGprsScprLoopbackCSY.ini c:\loopback.ini RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script CED -i z:\testdata\configs\te_UmtsGprsScpr.xml ced.log diff -r cca59d85ca31 -r b836c4d4fce7 telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3.script --- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3.script Tue May 25 13:58:08 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3.script Wed Jun 09 10:58:06 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" @@ -20,9 +20,41 @@ PRINT Run all Configuration 3 Test Cases + +// Ensure that the default config is present if no cleverer one has been put there already +RUN_SCRIPT z:\testdata\scripts\exec_esock_default_to_config_1.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_umtsgprsscpr_config.txt c:\simtsy\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\TE_UmtsGprsScprLoopbackCSY.ini c:\loopback.ini +RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script + CED -i z:\testdata\configs\te_UmtsGprsScprNoSpud.xml ced.log +// remove ip.qos.esk and qospolicies.ini from environment, so QoS FW and GuQoS is not loaded +RUN_UTILS MkDir C:\te_UmtsGprSscpr_temp\ +RUN_UTILS CopyFile C:\private\101f7989\ESock\qospolicies.ini C:\te_UmtsGprSscpr_temp\qospolicies.ini +RUN_UTILS CopyFile C:\private\101f7989\ESock\ip.qos.esk C:\te_UmtsGprSscpr_temp\ip.qos.esk +RUN_UTILS MakeReadWrite c:\private\101F7989\esock\qospolicies.ini +RUN_UTILS MakeReadWrite c:\private\101F7989\esock\ip.qos.esk +RUN_UTILS MakeReadWrite c:\qospolicies.ini +RUN_UTILS DeleteFile C:\private\101f7989\ESock\qospolicies.ini +RUN_UTILS DeleteFile C:\private\101f7989\ESock\ip.qos.esk +RUN_UTILS DeleteFile C:\qospolicies.ini + + + START_TESTCASE NET-UMTS-UmtsGprsSCPR-0801 //! @SYMTestCaseID NET-UMTS-UmtsGprsSCPR-0801 //! @SYMTestCaseDesc Set qos on Primary without the presense of SPUD diff -r cca59d85ca31 -r b836c4d4fce7 telephonyprotocols/pdplayer/umts/test/te_spud/inc/InputRequestListener.h --- a/telephonyprotocols/pdplayer/umts/test/te_spud/inc/InputRequestListener.h Tue May 25 13:58:08 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spud/inc/InputRequestListener.h Wed Jun 09 10:58:06 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" @@ -162,7 +162,7 @@ }; public: -static CInputRequestListener* NewL(TBool aUseTestPdpFsmInterface, TInt aUmtsRelease); +static CInputRequestListener* NewL(TBool aUseTestPdpFsmInterface, TThreadId aParentThreadId, TInt aUmtsRelease); virtual ~CInputRequestListener(); void Activate(); void RunL(); @@ -173,7 +173,7 @@ private: CInputRequestListener(TBool aUseTestPdpFsmInterface, TInt aUmtsRelease); - void ConstructL(); + void ConstructL(TThreadId aParentThreadId); void CreateEtelDriverL(); void CreatePdpFsmL(); @@ -256,7 +256,6 @@ { public: CInputRequestListener* iListener; - TThreadId iThreadId; }; /** The start-up method for the thread running the active objects */ diff -r cca59d85ca31 -r b836c4d4fce7 telephonyprotocols/pdplayer/umts/test/te_spud/src/ActiveSchedulerThread.cpp --- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/ActiveSchedulerThread.cpp Tue May 25 13:58:08 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/ActiveSchedulerThread.cpp Wed Jun 09 10:58:06 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" @@ -29,14 +29,12 @@ /** Creates and starts the active scheduler, and initializes the units under test */ -void ActiveSchedulerMainL(CInputRequestListener* aListener, TThreadId aParentThreadId) +void ActiveSchedulerMainL(CInputRequestListener* aListener) { CActiveScheduler *sched = new(ELeave) CActiveScheduler; CleanupStack::PushL(sched); CActiveScheduler::Install(sched); - aListener->iParentThread.Open(aParentThreadId); - __UHEAP_MARK; CActiveScheduler::Add(aListener); @@ -63,9 +61,8 @@ CleanupStack::PopAndDestroy(sched); // inform the main test thread that this thread is finished and that there are no memory leaks - TRequestStatus *destuctedStatus = &aListener->iThreadDestructed; - aListener->iParentThread.RequestComplete(destuctedStatus, KErrNone); - aListener->iParentThread.Close(); + TRequestStatus *destructedStatus = &aListener->iThreadDestructed; + aListener->iParentThread.RequestComplete(destructedStatus, KErrNone); } /** @@ -80,7 +77,7 @@ } TActiveSchedulerThreadParams *params = (TActiveSchedulerThreadParams*)aActiveSchedulerParams; - TRAPD(err, ActiveSchedulerMainL(params->iListener, params->iThreadId)); + TRAPD(err, ActiveSchedulerMainL(params->iListener)); delete cleanup; diff -r cca59d85ca31 -r b836c4d4fce7 telephonyprotocols/pdplayer/umts/test/te_spud/src/InputRequestListener.cpp --- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/InputRequestListener.cpp Tue May 25 13:58:08 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/InputRequestListener.cpp Wed Jun 09 10:58:06 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" @@ -31,11 +31,11 @@ #include "cpdpfsmfactory.h" #include "DefaultContextParameters.h" -CInputRequestListener* CInputRequestListener::NewL(TBool aUseTestPdpInterface, TInt aUmtsRelease) +CInputRequestListener* CInputRequestListener::NewL(TBool aUseTestPdpInterface, TThreadId aParentThreadId, TInt aUmtsRelease) { CInputRequestListener *me = new(ELeave) CInputRequestListener(aUseTestPdpInterface, aUmtsRelease); CleanupStack::PushL(me); - me->ConstructL(); + me->ConstructL(aParentThreadId); CleanupStack::Pop(me); return me; } @@ -62,8 +62,10 @@ iUmtsRelease = aUmtsRelease; } -void CInputRequestListener::ConstructL() - { } +void CInputRequestListener::ConstructL(TThreadId aParentThreadId) + { + User::LeaveIfError(iParentThread.Open(aParentThreadId)); + } CInputRequestListener::~CInputRequestListener() { @@ -90,6 +92,7 @@ } iEventHandlers.ResetAndDestroy(); + iParentThread.Close(); } void CInputRequestListener::DoCancel() diff -r cca59d85ca31 -r b836c4d4fce7 telephonyprotocols/pdplayer/umts/test/te_spud/src/SpudUnitTestStepBase.cpp --- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/SpudUnitTestStepBase.cpp Tue May 25 13:58:08 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/SpudUnitTestStepBase.cpp Wed Jun 09 10:58:06 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" @@ -66,20 +66,19 @@ { case KSimTsyTestNumberR5OrR99R4: #ifdef SYMBIAN_NETWORKING_UMTSR5 - iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, TPacketDataConfigBase::KConfigRel5); + iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, RThread().Id(), TPacketDataConfigBase::KConfigRel5); #else - iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, TPacketDataConfigBase::KConfigRel99Rel4); + iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, RThread().Id(), TPacketDataConfigBase::KConfigRel99Rel4); #endif break; default: - iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, TPacketDataConfigBase::KConfigGPRS); + iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, RThread().Id(), TPacketDataConfigBase::KConfigGPRS); break; } // creating and start the thread that will run the active scheduler containing SPUD or SPUDTEL TActiveSchedulerThreadParams params; - params.iListener = iListener; - params.iThreadId = RThread().Id(); + params.iListener = iListener; _LIT(activeSchedulerThreadName, "ActiveSchedulerThread_"); TBuf<255> buf(activeSchedulerThreadName); buf.AppendNum(iTestNumber); @@ -103,10 +102,8 @@ TRequestStatus *status = &iListener->iStatus; iActiveSchedulerThread.RequestComplete(status, KErrCancel); - // wait until the thread has cleaned up then kill it - // if the iThreadDestructed is never completed, this is probably the result of the UHEAP_MARKEND macro failing - User::WaitForRequest(iListener->iThreadDestructed); - iActiveSchedulerThread.Kill(KErrNone); + // wait until the thread has cleaned up (don't kill the thread, it will die by itself) + User::WaitForRequest(iListener->iThreadDestructed); iActiveSchedulerThread.Close(); delete iListener; diff -r cca59d85ca31 -r b836c4d4fce7 telephonyserverplugins/common_tsy/commontsy/inc/mmutility/MmTsy_timeoutdefs.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/MmTsy_timeoutdefs.h Tue May 25 13:58:08 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/MmTsy_timeoutdefs.h Wed Jun 09 10:58:06 2010 +0300 @@ -106,7 +106,7 @@ const TUint8 KMmCallAnswerTimeOut = 50; const TUint8 KMmCallAnswerCallBackTimeOut = 180; const TUint8 KMmCallHangUpTimeOut = 60; - const TUint8 KMmCallHoldTimeOut = 30; + const TUint8 KMmCallHoldTimeOut = 5; // Increase timeout to 30 seconds in future. const TUint8 KMmCallResumeTimeOut = 3; const TUint8 KMmCallSwapTimeOut = 3; const TUint8 KMmCallDeflectCallTimeOut = 10;