diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyserverplugins/simtsy/test/Te_SimSS/Te_SimSSTestServer.cpp --- a/telephonyserverplugins/simtsy/test/Te_SimSS/Te_SimSSTestServer.cpp Mon May 03 13:37:20 2010 +0300 +++ b/telephonyserverplugins/simtsy/test/Te_SimSS/Te_SimSSTestServer.cpp Thu May 06 15:10:38 2010 +0100 @@ -1,116 +1,116 @@ -// Copyright (c) 2005-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: -// - -#include "Te_SimSSTestServer.h" -#include "Te_SimSS.h" - -_LIT(KServerName,"Te_SimSS"); - -CSimSSTestServer* CSimSSTestServer::NewL() -/** - * @return - Instance of the test server - * Same code for Secure and non-secure variants - * Called inside the MainL() function to create and start the - * CTestServer derived server. - */ - { - CSimSSTestServer * testServer = new (ELeave) CSimSSTestServer(); - CleanupStack::PushL(testServer); - - testServer->ConstructL(KServerName); - CleanupStack::Pop(testServer); - return testServer; - } - -LOCAL_C void MainL() -/** - * Secure variant - * Much simpler, uses the new Rendezvous() call to sync with the client - */ - { - TInt result = StartC32(); - if (result != KErrNone && result != KErrAlreadyExists) - { - User::Leave(result); - } - - CActiveScheduler* sched=NULL; - sched=new(ELeave) CActiveScheduler; - CActiveScheduler::Install(sched); - - // Create the CTestServer derived server - CSimSSTestServer* testServer = NULL; - TRAPD(err,testServer = CSimSSTestServer::NewL()); - if(!err) - { - // Sync with the client and enter the active scheduler - RProcess::Rendezvous(KErrNone); - sched->Start(); - } - delete testServer; - delete sched; - } - -GLDEF_C TInt E32Main() -/** - * @return - Standard Epoc error code on process exit - * Secure variant only - * Process entry point. Called by client using RProcess API - */ - { - __UHEAP_MARK; - CTrapCleanup* cleanup = CTrapCleanup::New(); - if(cleanup == NULL) - { - return KErrNoMemory; - } - TRAPD(err,MainL()); - delete cleanup; - __UHEAP_MARKEND; - return err; - } - -CTestStep* CSimSSTestServer::CreateTestStep(const TDesC& aStepName) -/** - * @return - A CTestStep derived instance - * Secure and non-secure variants - * Implementation of CTestServer pure virtual - */ - { - CTestStep* testStep = NULL; - - if(aStepName == _L("TestCallBarring")) - { - testStep = new CTestCallBarring(); - } - else if (aStepName == _L("TestCallForwarding")) - { - testStep = new CTestCallForwarding(); - } - else if (aStepName == _L("TestCallWaiting")) - { - testStep = new CTestCallWaiting(); - } - else if (aStepName == _L("TestIdentityService")) - { - testStep = new CTestIdentityService(); - } - - return testStep; - } - - - - +// Copyright (c) 2005-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: +// + +#include "Te_SimSSTestServer.h" +#include "Te_SimSS.h" + +_LIT(KServerName,"Te_SimSS"); + +CSimSSTestServer* CSimSSTestServer::NewL() +/** + * @return - Instance of the test server + * Same code for Secure and non-secure variants + * Called inside the MainL() function to create and start the + * CTestServer derived server. + */ + { + CSimSSTestServer * testServer = new (ELeave) CSimSSTestServer(); + CleanupStack::PushL(testServer); + + testServer->ConstructL(KServerName); + CleanupStack::Pop(testServer); + return testServer; + } + +LOCAL_C void MainL() +/** + * Secure variant + * Much simpler, uses the new Rendezvous() call to sync with the client + */ + { + TInt result = StartC32(); + if (result != KErrNone && result != KErrAlreadyExists) + { + User::Leave(result); + } + + CActiveScheduler* sched=NULL; + sched=new(ELeave) CActiveScheduler; + CActiveScheduler::Install(sched); + + // Create the CTestServer derived server + CSimSSTestServer* testServer = NULL; + TRAPD(err,testServer = CSimSSTestServer::NewL()); + if(!err) + { + // Sync with the client and enter the active scheduler + RProcess::Rendezvous(KErrNone); + sched->Start(); + } + delete testServer; + delete sched; + } + +GLDEF_C TInt E32Main() +/** + * @return - Standard Epoc error code on process exit + * Secure variant only + * Process entry point. Called by client using RProcess API + */ + { + __UHEAP_MARK; + CTrapCleanup* cleanup = CTrapCleanup::New(); + if(cleanup == NULL) + { + return KErrNoMemory; + } + TRAPD(err,MainL()); + delete cleanup; + __UHEAP_MARKEND; + return err; + } + +CTestStep* CSimSSTestServer::CreateTestStep(const TDesC& aStepName) +/** + * @return - A CTestStep derived instance + * Secure and non-secure variants + * Implementation of CTestServer pure virtual + */ + { + CTestStep* testStep = NULL; + + if(aStepName == _L("TestCallBarring")) + { + testStep = new CTestCallBarring(); + } + else if (aStepName == _L("TestCallForwarding")) + { + testStep = new CTestCallForwarding(); + } + else if (aStepName == _L("TestCallWaiting")) + { + testStep = new CTestCallWaiting(); + } + else if (aStepName == _L("TestIdentityService")) + { + testStep = new CTestIdentityService(); + } + + return testStep; + } + + + +