diff -r 87622fad6b51 -r a796fdeeb33c datasourcemodules/networkpositioningmodule/test/src/te_lbsnetpsysuite.cpp --- a/datasourcemodules/networkpositioningmodule/test/src/te_lbsnetpsysuite.cpp Wed Sep 15 00:02:22 2010 +0300 +++ b/datasourcemodules/networkpositioningmodule/test/src/te_lbsnetpsysuite.cpp Wed Oct 13 16:07:50 2010 +0300 @@ -19,6 +19,9 @@ #include #include +#include "lbssystemcontroller.h" +#include "lbsrootcenrepdefs.h" + #include "te_lbspsyutils.h" #include "te_lbsnetpsysuite.h" #include "te_lbspsyposupdatestep.h" @@ -26,13 +29,11 @@ #include "te_lbspsyposupdateerrstep.h" #include "te_lbspsymodinfostep.h" -#include "te_lbsinifilereader.h" - /** The string name of the test suite */ _LIT(KServerName, "te_lbsnetpsysuite"); /** The UID of the unit test suite*/ -//const TUid KServerUid = {0x10285ACB}; +const TUid KServerUid = {0x10285ACB}; const RLbsPositionUpdateRequests::TChannelIdentifer KChannelIdentifierLS2NetLocManager = { @@ -59,19 +60,24 @@ /** 2nd phase constructor. Calls the base class method passing the name of the suite. -Also initializes the lbsqualityprofile and the internal buses used for position requests and updates + @leave If a error happens, it leaves with one of the system error codes. */ void CTe_LbsNetPsySuite::ConstructL() { //ConstructL of the base class CTestServer::ConstructL(KServerName); - CTe_SystemStarter::DefineLbsPropertiesL(); + + CTe_SystemStarter starter(KServerUid); + + starter.RestartLbs_RootOnlyL(iFirstExe); } CTe_LbsNetPsySuite::~CTe_LbsNetPsySuite() { - TRAP_IGNORE(CTe_SystemStarter::DeleteLbsPropertiesL()); + CTe_SystemStarter starter(KServerUid); + + TRAP_IGNORE(starter.RestartLbs_NormalL(iFirstExe)); } /**