--- a/common/tools/ats/smoketest/Group/bld.inf	Tue Nov 10 11:33:04 2009 +0000
+++ b/common/tools/ats/smoketest/Group/bld.inf	Tue Nov 10 13:50:58 2009 +0000
@@ -26,3 +26,4 @@
 #include "../profiles/group/Bld.inf"
 #include "../notepad/group/bld.inf"
 #include "../appinstall/group/Bld.inf"
+#include "../lbs/group/bld.inf"

--- a/common/tools/ats/smoketest/Group/smoketest.pl	Tue Nov 10 11:33:04 2009 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.pl	Tue Nov 10 13:50:58 2009 +0000
@@ -30,6 +30,8 @@
 copy($epoc . "data/z/smoketest/smoketest_timew.script",				"temp/smoketest/general/smoketest_timew.script");
 copy($epoc . "data/z/smoketest/smoketest_email.ini",				"temp/smoketest/general/smoketest_email.ini");
 copy($epoc . "data/z/smoketest/smoketest_email.script",				"temp/smoketest/general/smoketest_email.script");
+copy($epoc . "data/z/smoketest/smoketest_lbs.ini",					"temp/smoketest/general/smoketest_lbs.ini");
+copy($epoc . "data/z/smoketest/smoketest_lbs.script",				"temp/smoketest/general/smoketest_lbs.script");
 copy($epoc . "data/z/smoketest/sms/message1.txt",					"temp/smoketest/sms/general/message1.txt");
 copy($epoc . "data/z/smoketest/MachineName.txt",					"temp/smoketest/general/MachineName.txt");
 copy($epoc . "data/z/smoketest/emailmessage/20KBody.txt",			"temp/smoketest/emailmessage/general/20KBody.txt");
@@ -46,6 +48,12 @@
 copy($epoc . "release/winscw/udeb/t_msgutilityserver.dll",			"temp/smoketest/winscw_udeb/t_msgutilityserver.dll");
 copy($epoc . "release/winscw/udeb/t_msgpopserver.exe",				"temp/smoketest/winscw_udeb/t_msgpopserver.exe");
 copy($epoc . "release/winscw/udeb/t_msgsmtpserver.exe",				"temp/smoketest/winscw_udeb/t_msgsmtpserver.exe");
+copy($epoc . "release/winscw/udeb/lbstestutils.dll",				"temp/smoketest/winscw_udeb/lbstestutils.dll");
+copy($epoc . "release/winscw/udeb/lbstestclient.dll",				"temp/smoketest/winscw_udeb/lbstestclient.dll");
+copy($epoc . "release/winscw/udeb/lbstestchannel.dll",				"temp/smoketest/winscw_udeb/lbstestchannel.dll");
+copy($epoc . "release/winscw/udeb/lbstestserver.exe",				"temp/smoketest/winscw_udeb/lbstestserver.exe");
+copy($epoc . "release/winscw/udeb/ctlbsexeclient.exe",				"temp/smoketest/winscw_udeb/ctlbsexeclient.exe");
+copy($epoc . "release/winscw/udeb/lbsclienttestserver.exe",			"temp/smoketest/winscw_udeb/lbsclienttestserver.exe");
 
 copy($epoc . "release/winscw/udeb/ProfileSmokeTestModule.dll",      "temp/smoketest/winscw_udeb/ProfileSmokeTestModule.dll");
 copy($epoc . "winscw/c/smoketest/ProfileSmokeTestModule.cfg",       "temp/smoketest/general/ProfileSmokeTestModule.cfg");

--- a/common/tools/ats/smoketest/Group/smoketest.xml	Tue Nov 10 11:33:04 2009 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.xml	Tue Nov 10 13:50:58 2009 +0000
@@ -176,6 +176,60 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>						
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="lbstestutils.dll"/>
+							<param dst="c:\sys\bin\lbstestutils.dll"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>	
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="lbstestclient.dll"/>
+							<param dst="c:\sys\bin\lbstestclient.dll"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>	
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="lbstestchannel.dll"/>
+							<param dst="c:\sys\bin\lbstestchannel.dll"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="lbstestserver.exe"/>
+							<param dst="c:\sys\bin\lbstestserver.exe"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ctlbsexeclient.exe"/>
+							<param dst="c:\sys\bin\ctlbsexeclient.exe"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="lbsclienttestserver.exe"/>
+							<param dst="c:\sys\bin\lbsclienttestserver.exe"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>					
 					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
 						<command>execute</command>
 						<params>
@@ -242,6 +296,17 @@
 							<param leave-old-result="true"/>
 						</params>
 					</step>
+					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
+						<command>execute</command>
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\smoketest\smoketest_lbs.script"/>
+							<param result-file="c:\logs\testexecute\smoketest_lbs.htm"/>
+							<param timeout="600"/>
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+					</step>
 				</case>
 			</set>
             <set id="" name="ATSINTERFACE smoke tests" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -363,6 +428,8 @@
 		<file>smoketest/general/smoketest_timew.script</file>
 		<file>smoketest/general/smoketest_email.ini</file>
 		<file>smoketest/general/smoketest_email.script</file>
+		<file>smoketest/general/smoketest_lbs.ini</file>
+		<file>smoketest/general/smoketest_lbs.script</file>
 		<file>smoketest/sms/general/message1.txt</file>
 		<file>smoketest/general/MachineName.txt</file>
 		<file>smoketest/emailmessage/general/20KBody.txt</file>
@@ -379,6 +446,12 @@
 		<file>smoketest/winscw_udeb/t_msgutilityserver.dll</file>
 		<file>smoketest/winscw_udeb/t_msgpopserver.exe</file>
 		<file>smoketest/winscw_udeb/t_msgsmtpserver.exe</file>
+		<file>smoketest/winscw_udeb/lbstestutils.dll</file>
+		<file>smoketest/winscw_udeb/lbstestclient.dll</file>
+		<file>smoketest/winscw_udeb/lbstestchannel.dll</file>
+		<file>smoketest/winscw_udeb/lbstestserver.exe</file>
+		<file>smoketest/winscw_udeb/ctlbsexeclient.exe</file>
+		<file>smoketest/winscw_udeb/lbsclienttestserver.exe</file>
         <file>smoketest/winscw_udeb/ProfileSmokeTestModule.dll</file>
         <file>smoketest/general/ProfileSmokeTestModule.cfg</file>
         <file>smoketest/winscw_udeb/TestNpdApi.dll</file>		

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/group/ctlbscommon.mmp	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,81 @@
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// @file ctlbscommon.mmp
+// 
+//
+
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/test
+SYSTEMINCLUDE	/epoc32/include/lbs
+SYSTEMINCLUDE	/epoc32/include/lbs/test
+
+USERINCLUDE	../inc
+//USERINCLUDE	../../../../locationmgmt/locationcore/LbsLogging/inc
+// Common framework code.
+SOURCEPATH	../src
+SOURCE		ctlbsserver.cpp
+SOURCE		ctlbsshareddata.cpp
+SOURCE		ctlbsstep.cpp
+SOURCE		ctlbsnetsimstep.cpp
+
+// Common test step code.
+SOURCE		ctlbsstepinstallscheduler.cpp
+SOURCE		ctlbsstepcreateverifymoduledata.cpp
+SOURCE		ctlbsstepcreateverifyposinfos.cpp
+SOURCE		ctlbsstepverifymodinfo.cpp
+SOURCE		ctlbsstepverifyposinfos.cpp
+SOURCE		ctlbsstepverifyroughposinfos.cpp
+SOURCE		ctlbsstepverifyloginfo.cpp
+SOURCE		ctlbsstepverifymodstatus.cpp
+SOURCE		ctlbsstepstartlbs.cpp
+SOURCE		ctlbsstepstoplbs.cpp
+SOURCE		ctlbsstepsetautonomousmode.cpp
+SOURCE		ctlbsstepresetdefaultadmin.cpp
+SOURCE		ctlbsdoposupdate.cpp	
+SOURCE		ctlbsstepcreateverifymodinfo.cpp
+SOURCE		ctlbsstepsetprivhandler.cpp
+SOURCE		ctlbsstepsetupprotocolstub.cpp
+SOURCE		ctlbsstepsetuproamselflocate.cpp
+SOURCE		ctlbsstepclearlog.cpp
+SOURCE		ctlbsstepconfighybridmodule.cpp
+SOURCE		ctlbsactiveyield.cpp
+SOURCE		ctlbsstepsetupstandaloneprivacymode.cpp
+SOURCE		ctlbsstepsetupstandaloneprivacyandsimplectlr.cpp
+SOURCE		ctlbsstepsetupstandaloneprivacywithnoctlr.cpp
+SOURCE		ctlbsportedstepbase.cpp
+SOURCE		ctlbsrequester.cpp
+SOURCE		ctlbsposclient.cpp
+SOURCE		ctlbsposclientholder.cpp
+SOURCE		ctlbsclientrequestor.cpp
+SOURCE		ctlbsclientlog.cpp
+SOURCE		ctlbsstepsetbehaviourmodeoriginal.cpp
+SOURCE		ctlbsstepsetptamode.cpp
+SOURCE		ctlbsstepsetatamode.cpp
+SOURCE		ctlbsstepsetptbmode.cpp
+
+// EPOC + Test Execute libraries.
+LIBRARY	euser.lib
+LIBRARY	testexecuteutils.lib 
+LIBRARY	testexecutelogclient.lib 
+
+// For logging
+LIBRARY			logcli.lib
+LIBRARY			logwrap.lib
+LIBRARY			lbsloggerapi.lib
+LIBRARY 		efsrv.lib
+LIBRARY			centralrepository.lib
+LIBRARY 		bafl.lib // BaflUtils
+
+// Lbs Libraries
+LIBRARY eposmodset.lib

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsAssistanceDataLogEvent.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,64 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @publishedPartner
+ @released
+*/
+
+#ifndef LBS_ASSISTANCE_DATA_LOG_EVENT_H
+#define LBS_ASSISTANCE_DATA_LOG_EVENT_H
+
+#include <lbs/lbslogevent.h>
+
+/** log event object for assistance data request */
+
+class CLbsAssistanceDataLogEvent : public CLbsLogEvent
+	{
+public:
+	IMPORT_C static CLbsAssistanceDataLogEvent* NewL(const TUint32 aRequestType, const TUint32 aReceiveType);
+	~CLbsAssistanceDataLogEvent();
+	// for assistance data
+	IMPORT_C void SetRequestAssistanceDataType(const TUint32 aMask);
+	IMPORT_C TUint32 RequestAssistanceDataType() const;
+	IMPORT_C void SetReceiveAssistanceDataType(const TUint32 aMask);
+	IMPORT_C TUint32 ReceiveAssistanceDataType() const;
+
+protected:
+	void DoExternalizeL(RWriteStream& aWriteStream) const;
+	void DoInternalizeL(RReadStream& aReadStream);
+	void DoUpdateL(const CLbsLogEvent& aSourceLogEvent);
+	void DoCopyL(CLbsLogEvent*& aTargetLogEvent) const;
+	TInt DataSize() const;
+private:
+	CLbsAssistanceDataLogEvent();
+	void ConstructL(const TUint32 aRequestType, const TUint32 aReceiveType);
+private:
+	/** requested assistance data type from application */
+	TUint32	iRequestAssistanceDataType;
+	/** received assistance data type from network */
+	TUint32	iReceiveAssistanceDataType;
+
+	}; // class CLbsAssistanceDataLogEvent
+
+
+#endif // LBS_ASSISTANCE_LOG_EVENT_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsExternalLocateLogEvent.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,103 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @publishedPartner
+ @released
+*/
+
+#ifndef LBS_EXTERNAL_LOCATE_LOG_EVENT_H
+#define LBS_EXTERNAL_LOCATE_LOG_EVENT_H
+
+#include <lbs/lbslogevent.h>
+#include <lbs/lbsnetprotocolbase.h>
+
+#include <lbs/lbsloccommon.h> 			// For TLbsExternalRequestInfo
+#include "lbsnetcommon.h"			// For TLbsNetSessionId
+
+/**
+the privacy request parameter structure
+*/
+class TLbsLoggingPrivacyRequestParams
+    {
+public:    
+	TLbsNetSessionId			iSessionId;  
+	TLbsExternalRequestInfo		iRequestInfo;
+	TLbsNetPosRequestPrivacy	iRequestPrivacy;
+    };
+
+/**
+the privacy response parameter structure
+*/
+class TLbsLoggingPrivacyResponseParams
+	{
+public:	
+	TLbsNetSessionId iSessionId;
+	/** verification result to the privacy request */
+	CLbsNetworkProtocolBase::TLbsPrivacyResponse iResult;
+	} ;
+
+/** log event object for external locate request */
+class CLbsExternalLocateLogEvent : public CLbsLogEvent
+	{
+public:
+	IMPORT_C static CLbsExternalLocateLogEvent* NewL(TUid aRequestOriginator,TPositionInfoBase* aRefPosInfo, TPositionInfoBase* aPosInfo);
+	IMPORT_C void SetPrivacyRequestParams(const TLbsLoggingPrivacyRequestParams& aParams);
+	IMPORT_C void SetPrivacyResponseParams(const TLbsLoggingPrivacyResponseParams& aParams);
+	IMPORT_C void SetReferenceLocation(TPositionInfoBase* aPosInfo);
+	~CLbsExternalLocateLogEvent();
+
+	// for external locate
+	IMPORT_C TPositionInfoBase* ReferenceLocation() const;
+	IMPORT_C void SetRequestOriginator(TUid aRequestor);
+	IMPORT_C TUid RequestOriginator() const;
+	IMPORT_C TLbsLoggingPrivacyRequestParams PrivacyRequestParams() const;
+	IMPORT_C TLbsLoggingPrivacyResponseParams PrivacyResponseParams() const;
+
+protected:
+	void DoExternalizeL(RWriteStream& aWriteStream) const;
+	void DoInternalizeL(RReadStream& aReadStream);
+	void DoUpdateL(const CLbsLogEvent& aSourceLogEvent);
+	void DoCopyL(CLbsLogEvent*& aTargetLogEvent) const;
+	TInt DataSize() const;
+private:
+	CLbsExternalLocateLogEvent();
+	void ConstructL(TUid aRequestOriginator, TPositionInfoBase* aRefPosInfo, TPositionInfoBase* aPosInfo);
+	void CopyPrivacyRequestParams(TLbsLoggingPrivacyRequestParams& aTargetPrivacyInfo, 
+						   const TLbsLoggingPrivacyRequestParams& aSourcePrivacyInfo);
+	void CopyPrivacyResponseParams(TLbsLoggingPrivacyResponseParams& aTargetPrivacyInfo, 
+						   const TLbsLoggingPrivacyResponseParams& aSourcePrivacyInfo);
+private:
+	/** Descriptor of the request originator */
+	TUid							iRequestOriginator;
+	/** Privacy request/response info */
+	TLbsLoggingPrivacyRequestParams	iPrivacyReqInfo;
+	/** Indicate whether the MT-LR access is granted or not */
+	TLbsLoggingPrivacyResponseParams			iPrivacyResInfo;
+	/** The calculation method indicates MS-Based or Autonomous GPS is withint TPositionInfoBase */
+	/** The positioning mode used to calculate this location fix. */
+	// TPositionModuleInfo::TTechnologyType iPositionMode;
+	/** The returned reference location information if the request is completed successfully */
+	TPositionInfo* 					iRefPosInfo;
+	}; // class CLbsExternalLocateLogEvent
+
+#endif // LBS_EXTERNAL_LOCATE_LOG_EVENT_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsLogEvent.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,127 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @publishedPartner
+ @released
+*/
+
+#ifndef LBS_LOG_EVENT_H
+#define LBS_LOG_EVENT_H
+
+#include <e32base.h>
+#include <e32err.h>
+#include <logwrap.h>
+#include <logcli.h>
+#include <lbs/lbsloggerdefs.h>
+
+#include <lbspositioninfo.h>
+#include <lbssatellite.h>
+/**
+ class for the privacy request information 
+*/
+class TPrivacyRequestParams;
+
+/**
+ class for the privacy response information 
+*/
+class TPrivacyResponseParams;
+
+enum TLbsRequestOutcome
+/**
+ enum for the request outcomes
+*/
+	{
+	ELbsRequestOutcomeInconclusive =0,
+	ELbsRequestOutcomeSuccess,
+	ELbsRequestOutcomeFail,
+	ELbsRequestOutcomeCancel,
+	};
+    
+class CLbsLogEvent : public CBase
+/**
+ Base class for the classes representing LBS events to be logged. It provides the common 
+ functionality (internalising, externalising, updating this class from another one and creating 
+ a copy of this class).
+ 
+ @prototype
+*/
+	{
+public:
+	IMPORT_C static CLbsLogEvent* NewL(const CLogEvent& aLogEvent);
+	IMPORT_C CLogEvent* ExternalizeL() const;
+	IMPORT_C void SetPositionInfo(TPositionInfoBase* aPosInfo);
+
+	virtual ~CLbsLogEvent();
+	void UpdateL(const CLbsLogEvent& aLogEvent);
+	void UpdateRootEvent(CLogEvent* aTargetEvent);
+	CLbsLogEvent* CopyL() const;
+	
+	// Inline functions
+	IMPORT_C void SetDirection(TBool aDirection);
+	IMPORT_C TBool Direction() const;
+	IMPORT_C TUid EventType() const;
+	IMPORT_C void SetEventType(TUid aId);
+	IMPORT_C void SetRequestOutcome(TLbsRequestOutcome aRequestOutcome);
+	IMPORT_C TLbsRequestOutcome RequestOutcome() const;
+	IMPORT_C TBool IsCostInformationAvailable() const;
+	IMPORT_C void SetCostInformation(TUint aCostInformation);
+	IMPORT_C TUint CostInformation() const;
+	IMPORT_C TPositionInfoBase* PositionInfo() const;
+	
+protected:
+	CLbsLogEvent();
+	void InternalizeL(const CLogEvent& aLogEvent);
+	TPositionInfo* CopyPosInfoToEvent(const TPositionInfoBase* aSrcosInfo);
+	void WritePosInfo(RWriteStream& aWriteStream, const TPositionInfo* aPosInfo) const;
+	void ReadPosInfo(RReadStream& aReadStream, TPositionInfo*& aPosInfo);
+	// for BC consideration, possible handling TAny* data member
+	// called by derived 3rd party classes
+	void BaseConstructL();
+	virtual void DoExternalizeL(RWriteStream& aReadStream) const = 0;
+	virtual void DoInternalizeL(RReadStream& aReadStream) = 0;
+	virtual void DoUpdateL(const CLbsLogEvent& aSourceLogEvent) = 0;
+	virtual void DoCopyL(CLbsLogEvent*& aTargetLogEvent) const = 0;
+	virtual TInt DataSize() const = 0;
+protected:
+	/** The size of the data from a TPositionInfo that is written to disk */
+	const TInt			iPosInfoWriteSize;
+	/** The Location Request Event Type */
+	TUid 				iEventType;
+	/** The returned location information if the request is completed successfully */
+	TPositionInfo*		iPosInfo;
+	/** Data for BC consideration, and inherited by derived CLbsLog classes */
+	TAny*				iReservedData;
+	
+private:
+	/**	MO-LR (True) to R_LOG_DIR_OUT and MT-LR to R_LOG_DIR_IN */
+	TBool				iDirection;
+	/** The outcome of the request */
+	TLbsRequestOutcome 	iRequestOutcome;
+	/** Flag which specifies if the cost information is available or not */
+	TBool 				iCostInformationAvailable;
+	/** The cost information */
+	TUint 				iCostInformation;
+	}; // class CLbsLogEvent
+	
+
+#endif // LBS_LOG_EVENT_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsLogWriterEngine.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,122 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @internalTechnology
+ @released
+*/
+
+#ifndef LBS_LOG_WRITER_ENGINE_H
+#define LBS_LOG_WRITER_ENGINE_H
+
+#include <e32base.h>
+#include <lbslogevent.h>
+
+enum TLbsLogEventType
+/**
+ enum for type of LbsLogging event handled by Lbs Logging Engine	
+*/
+	{
+	ELbsLogNoEvent = 0,
+	ELbsLogAddEvent,
+	ELbsLogUpdateEvent
+	};
+	
+	
+typedef TUint32 TLbsLogWriterEventTypeGroup;
+
+enum TLbsLogWriterEventTypes
+	{
+	ELbsNoEventType = 				0x00000000,
+	ELbsSelfLocateEventType = 		0x00000001,
+	ELbsExternalLocateEventType = 	0x00000002,
+	ELbsTransmitLocationEventType = 0x00000004,
+	ELbsNetworkLocateEventType = 	0x00000008,
+	ELbsAssistanceDataEventType = 	0x00000010
+	};
+	
+class CLbsLogWriterEngine : public CActive
+/**
+ Active class which does the logging of LBS events. When it receives a new event, 
+ if it isn't processing anything it starts logging that event, otherwise it elaves it 
+ on a waiting queue.
+ 
+*/
+	{
+public:
+	static CLbsLogWriterEngine* NewL(TUint aMaxBufferSize);
+	~CLbsLogWriterEngine();
+	
+	TInt AddEventL(CLbsLogEvent& aLogEvent);
+	TInt UpdateEventL(CLbsLogEvent& aLogEvent);
+	// Start to log the event request asyn
+	TInt StartAddingEventType(CLogEventType& aType);
+	
+private:
+	CLbsLogWriterEngine(TUint aMaxBufferSize);
+	void ConstructL();
+
+	// Start to log the event request asyn
+	void StartLoggingEventL(CLbsLogEvent& aLogEvent);
+	void InitialiseLogEventTypeL(CLbsLogEvent& aLogEvent);
+	void AddLogEventToQueueL(CLbsLogEvent& aLogEvent);
+	
+private: // from CActive
+	void RunL();
+	void DoCancel();
+	TInt RunError(TInt aError);
+
+private:
+	/** The maximum numer of events that can be queued */
+	TUint 							iMaxBufferSize;
+	/** Flag indicating if there is an ID available of the last logged event */
+	TBool 							iLastLogIdAvailable;
+	/** The ID of the last logged event */
+	TLogId 							iLastLogId;
+	/** The array with the queued events */
+	RPointerArray<CLbsLogEvent> 	iLogEvents;
+	/** The array with the queued event types */
+	RArray<TLbsLogEventType>		iLogEventTypes;
+	/** Current processing event type */
+	TLbsLogEventType				iLastLogEventType;
+	/** Bitmask listing which event types have already been added */
+	TLbsLogWriterEventTypeGroup		iInitLogEventTypes;
+	/** The event type currently being logged */
+	CLogEventType* 					iEventTypeBeingLogged; 
+	/** Flag indicating if an event type is currently being added */
+	TBool 							iLogEventTypeInit;
+	/** The event that is being logged now */
+	CLogEvent* 						iEventBeingLogged;
+
+	/***/
+	TBool							iLoggingType;
+	/** Handle to the db file file sesstion */
+	RFs 							iFs;
+	/** CLogClient handler */
+	CLogClient* 					iClient;	
+	
+
+	
+__DECLARE_TEST; // Declaration for the invariant
+	}; // class CLbsLogWriterEngine
+
+#endif // LBS_LOG_WRITER_ENGINE_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsLogger.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,75 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+*/
+
+#ifndef LBS_LOGGER_H
+#define LBS_LOGGER_H
+
+#include <lbslogevent.h>
+#include <e32base.h>
+
+class CLbsLogWriterEngine;
+
+class RLbsLogger
+/**
+ Class the provides the APIs for adding and updating LBS events into the LogEng.
+ In order to add (or update) any event, a handle must have been opened for this class 
+ (so OpenL() must have been called, without calling Close() meanwhile on the class).
+ 
+ Internally, the engine, queues the add and update requests until they can be processed. The 
+ queue has a maximum size, so if too many items will get on the queue the AddEventL() method 
+ can return an error.
+
+ When the client finishes sending all the add and update requests, Close() should be 
+ called on the class. This will ensure that the internal engine logs all the events it 
+ queued into the LogEng. When calling Close() it will wait for LogEng to finish 
+ logging all the events.
+ 
+ @internalTechnology
+ @released
+*/
+	{
+public:
+	IMPORT_C RLbsLogger();
+	IMPORT_C ~RLbsLogger();
+	
+	IMPORT_C TInt Open(TUint aMaxBufferSize);
+	IMPORT_C TInt AddEvent(CLbsLogEvent& aLogEvent);
+	IMPORT_C TInt UpdateEvent(CLbsLogEvent& aLogEvent);
+	IMPORT_C TInt Close();
+	// for BC consideration
+	virtual void ExtensionInterfaceL(TUid aInterface, void*& aObject);
+
+private:
+	void CheckLoggingAdminSettings();
+
+private:
+	/** Pointer to the active object which does the logging */
+	CLbsLogWriterEngine* iLogWriterEngine;
+	
+	/** Flag to indicate if logging is currently On or Off, determined from the admin db setting. */
+	TBool iLoggingOn;
+	}; // class RLbsLogger
+
+#endif // LBS_LOGGER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsLoggerDefs.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,40 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @publishedPartner
+ @released
+*/
+
+#ifndef LBS_LOGGER_DEFS_H
+#define LBS_LOGGER_DEFS_H
+
+_LIT(KLbsLoggerPanic, "LBS Logger:");
+_LIT(KLbsLogSelfLocateDes, "Location Requested from On Board Application");
+_LIT(KLbsLogExternalLocateDes, "Location Requested by Remote Party");
+_LIT(KLbsLogX3PLocateDes, "Location Sent to Remote Party");
+_LIT(KLbsLogNetworkLocateDes, "Location Determined by Network");
+_LIT(KLbsLogAssistanceDataDes, "Location Data Obtained from Network");
+_LIT(KLbsLogMOLR, "R_LOG_DIR_OUT_MOLR");
+_LIT(KLbsLogMTLR, "R_LOG_DIR_IN_MTLR");
+
+#endif // LBS_LOGGER_DEFS_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsNetworkLocateLogEvent.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,61 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @publishedPartner
+ @released
+*/
+
+#ifndef LBS_NETWORK_LOCATE_LOG_EVENT_H
+#define LBS_NETWORK_LOCATE_LOG_EVENT_H
+
+#include <lbs/lbslogevent.h>
+
+/** log event object for network locate request */
+
+class CLbsNetworkLocateLogEvent : public CLbsLogEvent
+	{
+public:
+	IMPORT_C static CLbsNetworkLocateLogEvent* NewL(TUid aUid, TPositionInfoBase* aPosInfo);
+	~CLbsNetworkLocateLogEvent();
+	// for self locate
+	IMPORT_C TUid LocalApp() const;
+	IMPORT_C void SetLocalApp(TUid aUid);
+
+protected:
+	void DoExternalizeL(RWriteStream& aWriteStream) const;
+	void DoInternalizeL(RReadStream& aReadStream);
+	void DoUpdateL(const CLbsLogEvent& aSourceLogEvent);
+	void DoCopyL(CLbsLogEvent*& aTargetLogEvent) const;
+	TInt DataSize() const;
+private:
+	CLbsNetworkLocateLogEvent();
+	void ConstructL(TUid aUid, TPositionInfoBase* aPosInfo);
+		
+private:
+	/** The UID of local application request for the location information */
+	TUid 				iLocalApp;
+
+	}; // class CLbsNetworkLocateLogEvent
+
+
+#endif // LBS_NETWORK_LOCATE_LOG_EVENT_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsSelfLocateLogEvent.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,60 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @publishedPartner
+ @released
+*/
+
+#ifndef LBS_SELF_LOCATE_LOG_EVENT_H
+#define LBS_SELF_LOCATE_LOG_EVENT_H
+
+#include <lbs/lbslogevent.h>
+
+/** log event object for self locate request */
+
+class CLbsSelfLocateLogEvent : public CLbsLogEvent
+	{
+public:
+	IMPORT_C static CLbsSelfLocateLogEvent* NewL(TUid aUid, TPositionInfoBase* aPosInfo);
+	~CLbsSelfLocateLogEvent();
+	// for self locate
+	IMPORT_C TUid LocalApp() const;
+	IMPORT_C void SetLocalApp(TUid aUid);
+
+protected:
+	void DoExternalizeL(RWriteStream& aWriteStream) const;
+	void DoInternalizeL(RReadStream& aReadStream);
+	void DoUpdateL(const CLbsLogEvent& aSourceLogEvent);
+	void DoCopyL(CLbsLogEvent*& aTargetLogEvent) const;
+	TInt DataSize() const;
+	
+private:
+	CLbsSelfLocateLogEvent();
+	void ConstructL(TUid aUid, TPositionInfoBase* aPosInfo);
+
+private:
+	/** The UID of local application request for the location information */
+	TUid 				iLocalApp;
+	}; // class CLbsSelfLocateLogEvent
+
+#endif // LBS_SELF_LOCATE_LOG_EVENT_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/LbsTransmitLocationLogEvent.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,63 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file
+ @publishedPartner
+ @released
+*/
+
+#ifndef LBS_TRANSMIT_LOCATION_LOG_EVENT_H
+#define LBS_TRANSMIT_LOCATION_LOG_EVENT_H
+
+#include <lbs/lbslogevent.h>
+
+/** log event object for transmit to 3rd party locate request */
+
+class CLbsTransmitLocationLogEvent : public CLbsLogEvent
+	{
+public:
+	IMPORT_C static CLbsTransmitLocationLogEvent* NewL(TUid aUid, TPositionInfoBase* aPosInfo, TDesC& aDestination);
+	~CLbsTransmitLocationLogEvent();
+	// for X3P
+	IMPORT_C TUid X3PApp() const;
+	IMPORT_C void SetX3PApp(TUid aUid);
+	IMPORT_C void SetDestination(TDesC& aDestination);
+	IMPORT_C TDesC& Destination() const;
+
+protected:
+	void DoExternalizeL(RWriteStream& aWriteStream) const;
+	void DoInternalizeL(RReadStream& aReadStream);
+	void DoUpdateL(const CLbsLogEvent& aSourceLogEvent);
+	void DoCopyL(CLbsLogEvent*& aTargetLogEvent) const;
+	TInt DataSize() const;
+private:
+	CLbsTransmitLocationLogEvent();
+	void ConstructL(TUid aUid, TPositionInfoBase* aPosInfo, TDesC& aDestination);
+	
+private:
+	/** The UID of 3rd party application request for the location information */
+	TUid 					iX3PApp;
+	/** Descriptor of the destination application */
+	TBuf<64>				iDestination;
+	}; // class CLbsTransmitLocationLogEvent
+
+#endif // LBS_TRANSMIT_LOCATION_LOG_EVENT_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/argutils.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,548 @@
+/**
+* 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 the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file argutils.h
+*/
+
+#ifndef __ARG_UTILS_H__
+#define __ARG_UTILS_H__
+
+// LBS includes.
+#include <lbs.h>
+#include <lbscommon.h>
+#include <lbsprivacycontroller.h>
+#include <lbsnetcommon.h>
+//-------------------------------------------------------------------------------------------------
+
+/**
+Static utility functions to populate and instantiate arguments for function calls
+
+@internalComponent
+@test
+*/
+
+const TInt KAlpha2Timeout = 12*1000*1000;
+const TInt KTTimeout = 8*1000*1000;
+const TInt KMOLRFixTime = 240*1000*1000;
+const TInt KMinHorizontalAcc = 50.0;
+const TInt KMinVerticalAcc = 1000.0;
+const TInt KDefaultMaxFixTime = 130*1000*1000;
+
+
+class ArgUtils
+	{
+public:
+	inline static void PopulateLC(RLbsAssistanceDataBuilderSet& aData)
+		{
+		aData.OpenL();
+		CleanupClosePushL(aData);
+		
+		// Access the Gps Reference Time which is the only data we support in this simple provider.
+		RUEPositioningGpsReferenceTimeBuilder* refTimeBuilder = NULL;
+
+		aData.GetDataBuilder(refTimeBuilder);
+		if (refTimeBuilder)
+			{
+			const TUint KAssistanceData_RefTime_Week = 12;
+			const TUint KAssistanceData_RefTime_Tow1MSec = 567;
+			// Fill out the reference time items we support - note the builder set is already open.
+			refTimeBuilder->SetField(TUEPositioningGpsReferenceTime::EGpsWeek, KAssistanceData_RefTime_Week);
+			refTimeBuilder->SetField(TUEPositioningGpsReferenceTime::EGpsTow1Msec, KAssistanceData_RefTime_Tow1MSec);
+
+			// Time stamp the data.
+			TTime timeStamp;
+			timeStamp.UniversalTime();
+
+			refTimeBuilder->SetTimeStamp(timeStamp);
+			}
+		}
+
+	inline static TLbsNetPosRequestPrivacy Privacy()
+		{
+		TLbsNetPosRequestPrivacy privacy;
+		privacy.SetRequestAdvice(TLbsNetPosRequestPrivacy::ERequestAdviceNotify);
+		privacy.SetRequestAction(TLbsNetPosRequestPrivacy::ERequestActionAllow);
+		return privacy;
+		}
+
+	inline static TLbsExternalRequestInfo RequestInfo()
+		{
+		TLbsExternalRequestInfo requestInfo;
+		requestInfo.SetRequesterId(_L8("+441234567891"));
+		requestInfo.SetClientName(_L8("THybridNWClient"));
+		requestInfo.SetClientExternalId(_L8("+441234567891"));	
+		return requestInfo;
+		}
+
+	inline static TPositionInfo PositionInfo()
+		{
+		TCoordinate coordinate(3.14159265359, 2.71828183);
+		TLocality locality(coordinate, 99.99, 99.99);
+		TTime time(101010101);
+		TPosition position(locality, time);
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		return positionInfo;
+		}
+
+	inline static TPositionInfo ReferencePositionInfo()
+		{
+		// General case: This will be less accurate than the GPS Position and the Hybrid Position.
+		TCoordinate coordinate(51.5,-0.096, 2.0);
+		TLocality locality(coordinate, 1000.0, 1000.0);
+
+		// Setting time to current time
+		TTime time;
+		time.UniversalTime();
+		TPosition position(locality, time);
+
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		positionInfo.SetUpdateType(EPositionUpdateGeneral);
+		positionInfo.SetPositionMode(TPositionModuleInfo::ETechnologyNetwork);
+		positionInfo.SetPositionModeReason(EPositionModeReasonNone);
+		return positionInfo;
+		}
+
+
+	inline static TPositionInfo MolrReferencePositionInfo()
+		{
+		// General case: This will be less accurate than the Reference Position and the Hybrid Position.
+		TCoordinate coordinate(3.14159265359, 2.71828183, 10.0);
+		TLocality locality(coordinate, 1000.0, 1000.0);
+
+		// Setting time to current time
+		TTime time;
+		time.UniversalTime();
+		TPosition position(locality, time);
+
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		positionInfo.SetUpdateType(EPositionUpdateGeneral);
+		positionInfo.SetPositionMode(TPositionModuleInfo::ETechnologyNetwork);
+		positionInfo.SetPositionModeReason(EPositionModeReasonNone);
+		return positionInfo;
+		}
+
+
+	inline static TPositionInfo HybridPositionInfo()
+		{
+		// General case: This will be more accurate than ReferencePosition
+		// but less accurate than the GPS position
+		TCoordinate coordinate(51.502,-0.1055, 1.0);
+		TLocality locality(coordinate, 200.0, 200.0);
+
+		// Setting time to current time
+		TTime time;
+		time.UniversalTime();
+		TPosition position(locality, time);
+
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		positionInfo.SetUpdateType(EPositionUpdateGeneral);
+		positionInfo.SetPositionMode(TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+		positionInfo.SetPositionModeReason(EPositionModeReasonNone);
+		return positionInfo;
+		}
+
+
+	inline static TPositionInfo MolrHybridPositionInfo()
+		{
+		// General case: This will be more accurate than ReferencePosition
+		// but less accurate than the GPS position
+		TCoordinate coordinate(3.14159265359, 2.71828183);
+		TLocality locality(coordinate, 200.0, 200.0);
+
+		// Setting time to current time
+		TTime time;
+		time.UniversalTime();
+		TPosition position(locality, time);
+
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		positionInfo.SetUpdateType(EPositionUpdateGeneral);
+		positionInfo.SetPositionMode(TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+		positionInfo.SetPositionModeReason(EPositionModeReasonNone);
+		return positionInfo;
+		}
+
+
+	inline static TPositionInfo NetworkPositionInfo()
+		{
+		// General case: This will be more accurate than ReferencePosition
+		// but less accurate than the GPS position
+		TCoordinate coordinate(51.502,-0.1055, 1.0);
+		TLocality locality(coordinate, 100.0, 100.0);
+
+		// Setting time to current time
+		TTime time;
+		time.UniversalTime();
+		TPosition position(locality, time);
+
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		positionInfo.SetUpdateType(EPositionUpdateGeneral);
+		positionInfo.SetPositionMode(TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+		positionInfo.SetPositionModeReason(EPositionModeReasonNone);
+		return positionInfo;
+		}
+		
+	inline static TPositionInfo AccurateNetworkPositionInfo()
+		{
+		// General case: This will be more accurate than ReferencePosition
+		// but less accurate than the GPS position
+		TCoordinate coordinate(51.502,-0.1055, 1.0);
+		TLocality locality(coordinate, 10.0, 10.0);
+
+		// Setting time to current time
+		TTime time;
+		time.UniversalTime();
+		TPosition position(locality, time);
+
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		positionInfo.SetUpdateType(EPositionUpdateGeneral);
+		positionInfo.SetPositionMode(TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+		positionInfo.SetPositionModeReason(EPositionModeReasonNone);
+		return positionInfo;
+		}
+		
+	inline static TPositionInfo MolrNetworkPositionInfo()
+		{
+		// General case: This will be more accurate than ReferencePosition
+		// but less accurate than the GPS position
+		TCoordinate coordinate(3.14159265359, 2.71828183);
+		TLocality locality(coordinate, 100.0, 100.0);
+
+		// Setting time to current time
+		TTime time;
+		time.UniversalTime();
+		TPosition position(locality, time);
+
+		TPositionInfo positionInfo;
+		positionInfo.SetPosition(position);
+		positionInfo.SetUpdateType(EPositionUpdateGeneral);
+		positionInfo.SetPositionMode(TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+		positionInfo.SetPositionModeReason(EPositionModeReasonNone);
+		return positionInfo;
+		}
+
+
+	inline static TLbsNetPosRequestQuality Quality()
+		{
+		TLbsNetPosRequestQuality quality;
+		quality.SetMaxFixTime(KTTimeout);
+		quality.SetMaxFixAge(0);
+		TRealX nan;
+		nan.SetNaN();
+		quality.SetMinHorizontalAccuracy(nan);
+		quality.SetMinVerticalAccuracy(nan);
+		return quality;
+		}
+
+	inline static TLbsNetPosRequestQuality QualityAlpha2()
+		{
+		TLbsNetPosRequestQuality quality;
+		quality.SetMaxFixTime(KAlpha2Timeout); 
+		quality.SetMaxFixAge(0);
+		TRealX nan;
+		nan.SetNaN();
+		quality.SetMinHorizontalAccuracy(nan);
+		quality.SetMinVerticalAccuracy(nan);
+		return quality;
+		}
+
+	inline static TLbsNetPosRequestMethod RequestMethod()
+		{
+		TLbsNetPosRequestMethod method;
+		TLbsNetPosMethod method1;
+		TLbsNetPosMethod method2;
+		method1.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyTerminal | TPositionModuleInfo::ETechnologyAssisted); 
+		const TLbsNetPosMethod posMethods [] =
+			{
+			method1,method2
+			};
+		method.SetPosMethods(posMethods, 2);
+		return method;
+		}
+
+	inline static TLbsNetPosRequestMethod RequestTerminalBasedMethod()
+		{
+		TLbsNetPosRequestMethod method;
+		TLbsNetPosMethod method1;
+		method1.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyTerminal | TPositionModuleInfo::ETechnologyAssisted);
+
+ 		const TLbsNetPosMethod posMethods [] =
+			{
+			method1
+			};
+		method.SetPosMethods(posMethods, 1);
+		return method;
+		}
+	
+	inline static TLbsNetPosRequestMethod RequestAutonomousMethod()
+		{
+		TLbsNetPosRequestMethod method;
+		TLbsNetPosMethod method1;
+		method1.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyTerminal);
+
+ 		const TLbsNetPosMethod posMethods [] =
+			{
+			method1
+			};
+		method.SetPosMethods(posMethods, 1);
+		return method;
+		}
+			
+	inline static TLbsNetPosRequestMethod RequestHybridMethod()
+		{
+		TLbsNetPosRequestMethod method;
+		TLbsNetPosMethod method1;
+		TLbsNetPosMethod method2;
+		method1.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyTerminal | TPositionModuleInfo::ETechnologyAssisted);
+		method2.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+
+ 		const TLbsNetPosMethod posMethods [] =
+			{
+			method1,method2
+			};
+		method.SetPosMethods(posMethods, 2);
+		return method;
+		}
+	
+			
+	inline static TLbsNetPosRequestMethod RequestTAPMethod()
+		{
+		TLbsNetPosRequestMethod method;
+		TLbsNetPosMethod method1;
+		method1.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+
+ 		const TLbsNetPosMethod posMethods [] =
+			{
+			method1
+			};
+		method.SetPosMethods(posMethods, 1);
+		return method;
+		}
+
+	inline static TLbsNetPosRequestMethod RequestTerminalAssistedAndTerminalBasedMethod()
+		{
+		TLbsNetPosRequestMethod method;
+		TLbsNetPosMethod method1;
+		TLbsNetPosMethod method2;
+		method1.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyNetwork | TPositionModuleInfo::ETechnologyAssisted);
+		method2.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyTerminal | TPositionModuleInfo::ETechnologyAssisted);
+
+ 		const TLbsNetPosMethod posMethods [] =
+			{
+			method1,method2
+			};
+		method.SetPosMethods(posMethods, 2);
+		return method;
+		}
+	
+	inline static TLbsNetPosRequestMethod RequestUnspecifiedMethod()
+		{
+		TLbsNetPosRequestMethod method;
+		TLbsNetPosMethod method1;
+		method1.SetPosMethod(KLbsPositioningMeansGps, TPositionModuleInfo::ETechnologyUnknown);
+
+ 		const TLbsNetPosMethod posMethods [] =
+			{
+			method1
+			};
+		method.SetPosMethods(posMethods, 1);
+		return method;
+		}	
+
+	inline static TInt Alpha2()
+		{
+		return KAlpha2Timeout;
+		}
+
+	inline static TBool CompareQuality(TLbsNetPosRequestOptionsAssistance* aOpts, 
+										TBool aIsclientConnected, 
+										TInt aHorizontalAccuracy, 
+										TInt aVerticalAccuracy, 
+										TInt aMaxFixTime, 
+										TInt aMaxFixAge, 
+										TLbsAssistanceDataItem aDataMask, 
+										TPositionModuleInfo::TTechnologyType aTechnologyType
+										)
+		{
+		TLbsNetPosRequestQuality quality;
+		aOpts->GetRequestQuality(quality);
+		
+		if(aIsclientConnected != aOpts->NewClientConnected())
+			{
+			return EFalse;
+			}
+		
+		if(quality.MinHorizontalAccuracy() != aHorizontalAccuracy)	 
+			{
+			return EFalse;
+			}
+			
+		if(quality.MinVerticalAccuracy()   != aVerticalAccuracy)
+			{
+			return EFalse;
+			}
+			
+		if(quality.MaxFixTime() != aMaxFixTime)
+			{
+			return EFalse;
+			}
+			
+		if(quality.MaxFixAge()  != aMaxFixAge)		
+			{
+			return EFalse;
+			}
+			
+		if(aOpts->DataRequestMask()  != aDataMask) 
+			{
+			return EFalse;
+			}
+		
+		if(aOpts->PosMode() != aTechnologyType)
+			{
+			return EFalse;
+			}
+			
+		return ETrue;
+		}
+		
+		
+	inline static TBool ComparePositionInfoToReference(const TPositionInfo aPosInfoA)
+		{
+		TPositionInfo refPosInfo = ReferencePositionInfo();
+	
+		TPosition posA;
+		TPosition posR;
+		aPosInfoA.GetPosition(posA);
+		refPosInfo.GetPosition(posR);
+		
+		if(posA.HorizontalAccuracy() != posR.HorizontalAccuracy())
+			{
+			return EFalse;	
+			}
+		
+		if(posA.VerticalAccuracy() != posR.VerticalAccuracy())
+			{
+			return EFalse;	
+			}
+
+		if(posA.Latitude() != posR.Latitude())
+			{
+			return EFalse;	
+			}
+
+		if(posA.Longitude() != posR.Longitude())
+			{
+			return EFalse;	
+			}
+
+		if(posA.Altitude() != posR.Altitude())
+			{
+			return EFalse;	
+			}
+
+		return ETrue;
+		}
+
+
+	
+	inline static TBool ComparePositionInfoToMolrRefPos(const TPositionInfo aPosInfoA)
+		{
+		TPositionInfo refPosInfo = MolrReferencePositionInfo();
+	
+		TPosition posA;
+		TPosition posR;
+		aPosInfoA.GetPosition(posA);
+		refPosInfo.GetPosition(posR);
+		
+		if(posA.HorizontalAccuracy() != posR.HorizontalAccuracy())
+			{
+			return EFalse;	
+			}
+		
+		if(posA.VerticalAccuracy() != posR.VerticalAccuracy())
+			{
+			return EFalse;	
+			}
+
+		if(posA.Latitude() != posR.Latitude())
+			{
+			return EFalse;	
+			}
+
+		if(posA.Longitude() != posR.Longitude())
+			{
+			return EFalse;	
+			}
+
+		if(posA.Altitude() != posR.Altitude())
+			{
+			return EFalse;	
+			}
+
+		return ETrue;
+		}
+		
+	inline static TBool ComparePositionInfoToNan(const TPositionInfo aPosInfoA)
+		{
+		TPosition pos;
+		aPosInfoA.GetPosition(pos);
+		
+		if(!Math::IsNaN(pos.HorizontalAccuracy()))
+			{
+			return EFalse;
+			}
+
+		if(!Math::IsNaN(pos.VerticalAccuracy()))
+			{
+			return EFalse;
+			}
+			
+		if(!Math::IsNaN(pos.Latitude()))
+			{
+			return EFalse;
+			}
+			
+		if(!Math::IsNaN(pos.Longitude()))
+			{
+			return EFalse;
+			}
+			
+		if(!Math::IsNaN(pos.Altitude()))	
+			{
+			return EFalse;
+			}
+			
+		return ETrue;
+			
+		}
+		
+	};
+
+//-------------------------------------------------------------------------------------------------
+
+#endif //__ARG_UTILS_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/ctlbsclientlog.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,97 @@
+/*
+* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+#ifndef __CT_LBS_CLIENT_LOG_H__
+#define __CT_LBS_CLIENT_LOG_H__
+
+//  INCLUDES
+#include <e32base.h>
+#include "TestExecuteStepBase.h"
+
+// CONSTANTS
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+
+/**
+*  Implements the CLbsLog interface, and puts log entries in TEF log.
+*/
+class CT_LbsClientLog : public CBase
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        */
+        IMPORT_C static CT_LbsClientLog* NewL(CTestExecuteLogger& aLogger);
+
+        /**
+        * Two-phased constructor.
+        */
+        IMPORT_C static CT_LbsClientLog* NewLC(CTestExecuteLogger& aLogger);
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CT_LbsClientLog();
+
+    public: // New functions
+    
+    	void SetLogger(CTestExecuteLogger& aLogger){ iLogger = aLogger; };
+	    CTestExecuteLogger& Logger() {return iLogger;};
+
+    public: // Functions  from base classes
+
+        /**
+        * Add a line to the log file.
+        * @param aLine The line of text to append.
+        */
+        void Put(const TDesC& aLine);
+
+        /**
+        * Add an error line to the log file.
+        * @param aLine The error line of text to append.
+        */
+        void PutError(const TDesC& aLine);
+        
+    private:
+
+        /**
+        * C++ default constructor.
+        */
+    	CT_LbsClientLog();
+
+        /**
+        * By default EPOC constructor is private.
+        */
+        void ConstructL(CTestExecuteLogger& aLogger);
+
+        // By default, prohibit copy constructor
+        CT_LbsClientLog( const CT_LbsClientLog& );
+        // Prohibit assigment operator
+        CT_LbsClientLog& operator= ( const CT_LbsClientLog& );
+
+    private:  // Data
+        CTestExecuteLogger		iLogger;
+    };
+
+#endif // __CT_LBS_CLIENT_LOG_H__   
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/ctlbsclientrequestor.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,146 @@
+/*
+* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+#ifndef __CT_LBS_CLIENT_REQUESTOR_H__ 
+#define __CT_LBS_CLIENT_REQUESTOR_H__
+
+//  INCLUDES
+#include <e32base.h>
+#include <Lbs.h>
+#include <EPos_CPosModules.h>
+#include <EPos_CPosModuleUpdate.h>
+#include <EPos_CPosModuleIdList.h>
+#include <testexecutelogger.h>
+
+
+// CONSTANTS
+const TInt KNoEvent = 42;
+
+// FORWARD DECLARATIONS
+class MCT_LbsRequestObserver;
+
+// CLASS DECLARATION
+
+/**
+*  ?one_line_short_description.
+*  ?other_description_lines
+*/
+class CT_LbsClientRequestor : public CActive
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        * @return A new instance of this class.
+        */
+        static CT_LbsClientRequestor* NewL(
+            /* IN  */   TUid                aPsyUid,
+			/* IN  */   MCT_LbsRequestObserver*   aObserver,
+			/* IN  */	const TDesC& aClientName,
+		    CTestExecuteLogger&						aLogger
+		    );
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CT_LbsClientRequestor();
+
+    protected:
+
+        /**
+        * C++ default constructor.
+        */
+        CT_LbsClientRequestor(
+			/* IN  */   MCT_LbsRequestObserver*   aObserver,
+						TUid				aPsyUid
+			);
+
+        /**
+        * By default EPOC constructor is private.
+        */
+        void ConstructL(const TDesC& aClientName, CTestExecuteLogger& aLogger);
+
+    public: // New functions
+        
+        const TTime& CompletionTimeUTC() const;
+       
+		TInt CompletionCode() const;
+
+		void ResetCompletionCode();
+
+        /**
+        * Performs a request to iPsy. Notifies iObserver when request is complete
+        */
+        void StartRequestL(TBool aDefaultPsy);
+
+		void RequestModuleStatusEvent();
+
+		TInt ReadModuleStatusEvent();
+
+		void ContinueRequesting();
+
+		void ClosePositioner();
+
+		TBool ReadModuleStatusModulesApi(CPosModules* aDb, TPositionModuleId aModuleId);
+		
+		TInt ReadModuleStatusClientApi(TPositionModuleId aModuleId);
+
+		void CancelModuleStatusEvent();
+
+    public: // Functions from base classes
+
+        void RunL();
+
+        void DoCancel();
+
+    protected: // New functions
+
+        void RequestComplete();
+
+    private:
+
+        // By default, prohibit copy constructor
+        CT_LbsClientRequestor( const CT_LbsClientRequestor& );
+        // Prohibit assigment operator
+        CT_LbsClientRequestor& operator= ( const CT_LbsClientRequestor& );
+        
+    	// Logger interface used for constructing result strings to be fed for the logger instance
+    	inline CTestExecuteLogger& Logger() {return iLogger;};
+
+    private:    // Data
+
+        RPositionServer     iPosServer;
+        RPositioner         iPositioner;
+		TBuf<100>			iName;
+
+		MCT_LbsRequestObserver*   iObserver;
+        TTime               iCompletionTimeUTC;
+        TInt                iCompletionCode;
+        TRequestStatus      iRequestStatus;
+        TPositionInfo       iModuleInfo;
+		TUid				iPsyUid;
+		TPositionModuleStatusEvent istatusEvent;
+		TBool iContinueEventRequesting;
+		
+        CTestExecuteLogger	iLogger;
+    };
+
+#endif      // __CT_LBS_CLIENT_REQUESTOR_H__  
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/ctlbsdoposupdate.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,83 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file ctlbsdoposupd.h
+*/
+#ifndef  __CT_LBS_DOPOS_UPDATE_H__
+#define  __CT_LBS_DOPOS_UPDATE_H__
+
+#include <e32base.h>
+#include <lbs.h>
+
+
+_LIT(KCT_LbsDoPosUpdate, "CT_LbsDoPosUpdate");
+
+
+// Async callbacks
+class MT_LbsDoPosUpdateObserver
+	{
+public:
+	virtual void MT_LbsDoPosUpdateCallback(TRequestStatus& aStatus) = 0;	// do we need the aStatus...
+	};
+	
+	
+class CT_LbsDoPosUpdate: public CActive
+	{
+public:
+	~CT_LbsDoPosUpdate();
+	static CT_LbsDoPosUpdate* NewL(MT_LbsDoPosUpdateObserver* aObserver, TPositionModuleInfo::TTechnologyType aTechnologyType = TPositionModuleInfo::ETechnologyUnknown);
+    static CT_LbsDoPosUpdate* NewL(MT_LbsDoPosUpdateObserver* aObserver, const TPositionCriteriaBase& aCriteria);
+	TInt SetOptions(const TPositionUpdateOptionsBase& aPosOption);
+	void StartL(TPositionInfo& aPosInfo);
+	void CancelRequest();
+	void OpenPositioner(TPositionModuleInfo::TTechnologyType aTechnologyType = TPositionModuleInfo::ETechnologyUnknown);
+	void ClosePositioner(void);
+	void ConnectServer(void);
+	void CloseServer(void);
+	TInt CompleteRequest(TInt aRequestId);
+	
+protected:
+	//	Functions from CActive:
+	virtual void DoCancel();
+	virtual void RunL();
+	virtual TInt RunError(TInt aError);
+	
+private:
+	enum TOpenSubSessionType
+		{
+		EOpenSubSessionByModuleId,  //Open subsession with the location server by module id
+		EOpenSubSessionByCriteria    //Open subsession with the location server by criteria 
+		};
+		
+	CT_LbsDoPosUpdate(MT_LbsDoPosUpdateObserver* aObserver);
+	
+	void CT_LbsDoPosUpdate::ConstructL(TOpenSubSessionType aOpenSubSessionType,TPositionModuleInfo::TTechnologyType aTechnologyType, const TPositionCriteriaBase& aCriteria);
+	
+	// caller
+	MT_LbsDoPosUpdateObserver* iObserver;
+	
+	// Self locate server.
+	RPositionServer iServer;
+	RPositioner iPositioner;
+	};
+
+#endif // __CT_LBS_DOPOS_UPDATE_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/ctlbsdox3p.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,77 @@
+/**
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+/**
+ @file ctlbsdox3p.h
+*/
+
+#ifndef __CT_LBS_DO_X3P_H__
+#define __CT_LBS_DO_X3P_H__
+
+
+#include <e32base.h>
+#include <lbs.h>
+#include <lbsx3p.h>
+
+
+//class CT_LbsX3PDoTransmitPos;
+_LIT(KCT_LbsDoX3P, "CT_LbsDoX3P");
+
+// Async callbacks
+class MT_LbsDoX3PObserver
+	{
+public:
+	virtual void MT_LbsDoX3PCallback(TInt aTransmitId, TRequestStatus& aStatus) = 0;
+	};
+	
+	
+class CT_LbsDoX3P: public CActive
+	{
+public:
+	~CT_LbsDoX3P();
+	static CT_LbsDoX3P* NewL(MT_LbsDoX3PObserver* aObserver, TInt aTransmitId = 0);
+
+	TInt SetOptions(const TLbsTransmitPositionOptions& aTransmitOptions);
+
+	void StartL(const TDesC& aDestinationID, TUint aTransmitPriority, TPositionInfo & aTransmittedPosInfo);
+	
+protected:
+	//	Functions from CActive:
+	virtual void DoCancel();
+	virtual void RunL();
+	virtual TInt RunError(TInt aError);
+	
+private:
+	CT_LbsDoX3P(MT_LbsDoX3PObserver* aObserver, TInt aTransmitId);
+	void CT_LbsDoX3P::ConstructL();
+	
+	// Caller.
+	MT_LbsDoX3PObserver* iObserver;
+	
+	// Transmit server.
+	RLbsTransmitPositionServer iServer;
+	RLbsTransmitPosition iTransmitter;
+
+	// Id to allow multiple X3P to be carried out.
+	TInt iTransmitId;
+	};
+
+#endif // __CT_LBS_DO_X3P_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/ctlbsnetsimstep.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,177 @@
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// @file ctlbsNetsimstep.h
+// This contains the header file for LBS Net Sim Test Step Base
+// 
+//
+
+#ifndef __CT_LBS_NET_SIM_STEP_H__
+#define __CT_LBS_NET_SIM_STEP_H__
+
+// EPOC includes.
+#include <testexecutestepbase.h>
+
+// LBS test includes.
+#include <lbsnetsimtest.h>
+#include <lbsnetsimtestobserver.h>
+
+#include "ctlbstimerutils.h"
+
+
+const TInt KLbsKeepAlivePeriod = 10000;
+
+const TInt KKeepAliveTimerId = 0;
+const TInt KAbortTimerId = 34;
+
+/** Callback flags held as bits in a 32 bit word.
+*/
+typedef TUint32 TLbsCallbackFlags;
+
+const TLbsCallbackFlags KLbsCallback_None															= 0x0000;
+
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_Connect												= 0x0001;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_Disconnect											= 0x0002;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyRegisterLcsMoLr								= 0x0004;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyReleaseLcsMoLr								= 0x0008;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyMeasurementControlLocation					= 0x0010;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyReleaseLcsLocationNotification				= 0x0020;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyFacilityLcsMoLrResult							= 0x0040;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyMeasurementReportLocation						= 0x0080;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyMeasurementReportRequestMoreAssistanceData	= 0x0100;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyMeasurementReportControlFailure 				= 0x0200;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_NotifyError											= 0x0400;
+const TLbsCallbackFlags KLbsCallback_NetSim_Got_ProcessMeasurementControlLocationError				= 0x0800;
+
+// NOTE: Derived test case will assume that they create new flags starting at 0x1000. If you add additional
+// flags here, the derived test cases will have to be updated also.
+
+const TLbsCallbackFlags KLbsCallback_MoLr =
+	KLbsCallback_NetSim_Got_NotifyRegisterLcsMoLr 				| // --> NET
+	KLbsCallback_NetSim_Got_NotifyMeasurementControlLocation	| // <-- NET
+	KLbsCallback_NetSim_Got_NotifyMeasurementReportLocation 	| // --> NET
+	KLbsCallback_NetSim_Got_NotifyFacilityLcsMoLrResult			| // <-- NET
+	KLbsCallback_NetSim_Got_NotifyReleaseLcsMoLr;				  // --> NET
+	
+//const TLbsCallbackFlags KLbsCallback_NetworkBasedLocation =
+//	KLbsCallback_NetSim_Got_NotifyRegisterLcsMoLr 					| // --> NET
+//	KLbsCallback_NetSim_Got_NotifyMeasurementControlLocation		| // <-- NET
+//	KLbsCallback_NetSim_Got_NotifyMeasurementReportControlFailure 	| // --> NET
+
+//	KLbsCallback_NetSim_Got_NotifyReleaseLcsMoLr;				  	  // --> NET	
+
+const TLbsCallbackFlags KLbsCallback_NetworkBasedLocation =
+	KLbsCallback_NetSim_Got_NotifyRegisterLcsMoLr 					| // --> NET
+	KLbsCallback_NetSim_Got_NotifyMeasurementControlLocation		| // <-- NET
+	KLbsCallback_NetSim_Got_NotifyMeasurementReportLocation			| // --> NET
+	KLbsCallback_NetSim_Got_NotifyFacilityLcsMoLrResult				| // <-- NET
+	KLbsCallback_NetSim_Got_NotifyReleaseLcsMoLr;				  	  // --> NET	
+
+const TLbsCallbackFlags KLbsCallback_MtLr =
+		// note: we get no notification of the 
+		KLbsCallback_NetSim_Got_NotifyReleaseLcsLocationNotification |  // response to privacy request
+		KLbsCallback_NetSim_Got_NotifyMeasurementControlLocation |		// location request
+		KLbsCallback_NetSim_Got_NotifyMeasurementReportLocation;
+
+
+class CT_LbsNetSimStep : public CTestStep,
+						 public	MT_LbsTimerUtilsObserver,
+						 public MLbsNetSimTestObserver
+{
+
+public:
+
+	virtual ~CT_LbsNetSimStep();
+
+	virtual TVerdict doTestStepPreambleL();
+	virtual TVerdict doTestStepPostambleL();
+
+
+	// From MLbsNetSimTestObserver.	
+	virtual void Connected();
+	virtual void Disconnected();
+	virtual void NotifyRegisterLcsMoLr(const TDesC& aData);
+	virtual void NotifyReleaseLcsMoLr(TInt aReason);
+	virtual void NotifyMeasurementControlLocation(const TPositionInfo& aPosition, const RLbsAssistanceDataBuilderSet& aData, const TLbsNetPosRequestQuality& aQuality);
+	virtual void NotifyReleaseLcsLocationNotification(const CLbsNetworkProtocolBase::TLbsPrivacyResponse& aResult);
+	virtual void NotifyFacilityLcsMoLrResult(TInt aReason, const TPositionInfo& aPosition);
+	virtual void NotifyMeasurementReportLocation(const TPositionInfo& aPosition);
+	virtual void NotifyMeasurementReportRequestMoreAssistanceData(const TLbsAssistanceDataGroup& aFilter);
+	virtual void NotifyMeasurementReportControlFailure(TInt aReason);
+	virtual void NotifyError(MLbsNetSimTestObserver::EFunction aFunction, int aError);
+	virtual void ProcessMeasurementControlLocationError(TInt aError);
+
+protected:
+
+	CT_LbsNetSimStep();
+	
+	/** If aHaltTimerInterval is set, the test will continue for this period of time after all halt flags have been set
+	 */
+	void ConstructL(TTimeIntervalMicroSeconds32 aHaltTimerInterval = 0);
+	
+	/** Can be used to set the extended timer interval if not known at construct time
+	*/
+	void SetExtendedTimerInterval(TTimeIntervalMicroSeconds32 aHaltTimerInterval);
+
+	void SetCallbackFlag(TLbsCallbackFlags aCallbackFlag);
+	TBool TestCallbackFlags(TLbsCallbackFlags aExpectedFlags);
+
+
+	// From MT_LbsTimerUtilsObserver - keep alive timer to ensure we recvice all callbacks.
+	virtual void HandleTimerL(TInt aTimerId, const TTime& aTargetTime);
+
+	
+	enum  {		EConnecting = 0,	/** Waiting for the Net Sim to connect to the protocol module. */
+				EWaiting,			/** Waiting for all the callbacks to be fired. */
+				EExtendedWaiting,	/** Waiting for extended timer to fire */
+				EAborted,			/** Abort timer has fired before all callbacks fired */
+				EDone,				/** All the correct callbacks have been fired (and extended timer, if any, has fired), the test can end. */
+				ELast};				/** Used to allow extension of enums in derived classes - do not use! */
+
+	/** State machine variable for the test step.
+	*/
+	TInt iState;
+
+
+	/** Used to keep a record off all the callback events.
+	*/
+	TLbsCallbackFlags iCallbackFlags;
+	
+
+	/** Expected callback flags at test end.
+	*/
+	TLbsCallbackFlags iFlagsToHaltOn;
+	
+	/** If this is non-zero, the test will continue for this period of time after all halt flags have been set
+	*/
+	TTimeIntervalMicroSeconds32	iExtendedTimerInterval;
+	
+	/** Network Simulator, to allow MT-LRs and to monitor network messages.
+	*/
+	RLbsNetSimTest iNetSim;
+
+
+	/** Timer used to ensure the test step keeps processing until all the required callbacks
+		have been called. Otherwise we would execute the test step calls and return from the
+		doTestStepL function and miss the callbacks being fired.
+	*/
+	CT_LbsTimerUtils* iKeepAliveTimer;
+	
+	/** Timer used to abort the test step if all callbacks have not fired. Individual test cases can start this time with appropriate time.
+		
+	*/
+	CT_LbsTimerUtils* iAbortTimer;
+	
+};
+
+#endif // __CT_LBS_STEP_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/lbs/common/inc/ctlbsportedstepbase.h	Tue Nov 10 13:50:58 2009 +0000
@@ -0,0 +1,340 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// @file ctlbsportedstepbase.h
+// 
+//
+
+#ifndef __CT_LBS_PORTED_STEP_BASE_H__
+#define __CT_LBS_PORTED_STEP_BASE_H__
+
+//  INCLUDES
+#include <w32std.h>
+#include <LbsPositionInfo.h>
+#include <Lbs.h>
+#include <LbsCommon.h>
+#include <LbsRequestor.h>
+#include <centralrepository.h>
+#include "ctlbsstep.h"
+#include "ctlbsserver.h"
+
+// CONSTANTS
+enum TPosSetupPsyDirective
+    {
+    EPosDisableTheRest = 0
+    };
+
+// UID:s for PSY:s
+const TInt32 KUidExternalGps        = 0x101f7a7d;
+const TInt32 KUidManualInput        = 0x101f7a7e;
+const TInt32 KUidDefault            = 0x101f7a7f;
+const TInt32 KUidStrategy           = 0x101f7a80;
+const TInt32 KUidSimulationPsy      = 0x101f7a81;
+const TInt32 KUidStubPositioner     = 0x01000019;
+const TInt32 KUidDynDbTestPsy       = 0x01000016;
+const TInt32 KUidInstallTestPsy     = 0x01000015;
+const TInt32 KUidTestPsySimulateIsa = 0x01000018;
+const TInt32 KUidTestPsy1           = 0x01000001;
+const TInt32 KUidTestPsy2           = 0x01000002;
+const TInt32 KUidTestPsy3           = 0x01000003;
+const TInt32 KUidTestPsy4           = 0x01000004;
+const TInt32 KUidTestPsy5           = 0x01000005;
+const TInt32 KUidTestPsy6           = 0x01000006;
+const TInt32 KUidTestPsy7           = 0x01000007;
+const TInt32 KUidTestPsy8           = 0x01000008;
+const TInt32 KUidTestPsy9           = 0x01000009;
+const TInt32 KUidTestPsy10          = 0x01000010;
+const TInt32 KUidTestPsy11          = 0x01000011;
+const TInt32 KUidTestPsy12          = 0x01000012;
+const TInt32 KUidTestPsy13          = 0x01000013;
+const TInt32 KUidTestPsy256         = 0x01000017;
+const TInt32 KUidTestPsyTp176       = 0x01000176;
+const TInt32 KUidMultiPsy           = 0x01010176;
+const TInt32 KUidTestStatusPsy      = 0x01000191;
+const TInt32 KUidTestTimerPsy       = 0x01000192;
+const TInt32 KUidExamplePsy         = 0x10001234; // TBD not impl UID
+const TInt32 KUidPanicPsy           = 0x01010210;
+const TInt32 KUidTestPsyPartialUpdate = 0x01000021;
+const TInt32 KUidPsySwitching       = 0x00000000; // TBD fill in when there ever is a switching psy
+const TInt32 KUidTestPsyMaxAge      = 0x01000020;
+const TInt32 KUidTestRangePsy       = 0x01000022;
+const TInt32 KUidTestSingPsy        = 0x01f0ff23;
+const TInt32 KUidTestTrackingPsy    = 0x01f0ff24;
+
+const TInt32 KTestProxyPsy1         = 0x01f0e001;
+const TInt32 KTestProxyPsy2         = 0x01f0e002;
+const TInt32 KTestProxyPsy3         = 0x01f0e003;
+const TInt32 KTestProxyPsy4         = 0x01f0e004;
+
+const TInt32 KInstallPsyTp273         = 0x01f0e005;
+
+const TInt32 KUidTestPsyPartialUpdate2 = 0x01000023;
+const TInt32 KUidSatInfoPsy         =    0x01010177;
+
+const TInt32 KUidBtgPsy         =    0x101FE999;
+const TInt32 KUidIgPsy          =    0x101FE999;
+
+const TInt KEspectedErrorCodePSY1 = KErrNone;
+const TInt KEspectedErrorCodePSY2 = KPositionPartialUpdate;
+const TInt KEspectedErrorCodePSY3 = KErrPositionBufferOverflow;
+const TInt KEspectedErrorCodePSY4 = KErrNone;
+
+// Central repository constants for Default Proxy.
+const TUid KCRUidDefaultProxyConfiguration = { 0x101f7a7f };
+const TUint32 KDefaultProxyLastWorkingGpsPsy = 0x10000001;
+
+
+// CLASS DECLARATION
+class CT_LbsClientLog;
+
+/****************************************************************************
+* The reason to have a new step base is that it is very much possible
+* that the all individual test steps have project related common variables 
+* and members 
+* and this is the place to define these common variable and members.
+* 
+****************************************************************************/
+class CT_LbsPortedStepBase : public CT_LbsStep
+	{
+public:
+	virtual ~CT_LbsPortedStepBase();
+	CT_LbsPortedStepBase(CT_LbsServer& aParent);
+	virtual TVerdict doTestStepPreambleL(); 
+    virtual TVerdict doTestStepL();
+	virtual TVerdict doTestStepPostambleL();
+
+//Please add your class members which will be common to all individual test steps:
+protected:
+	HBufC8*		iReadData;
+	HBufC8*		iWriteData;
+    
+public: // New functions
+    
+    /**
+    * Starts the test
+    */
+    virtual void StartL() = 0;
+    
+public: // Functions from base classes
+    
+    /**
+    * Runs the test in the module
+    * @param aIndex Indicates which internal test to run.
+    */
+    void StartL(TInt aIndex);    
+    
+protected: // New functions
+    
+    /**
+    * Setup privacy and notification override settings
+    * @param aPsyName   the name of the psy
+    * @param aDirective how to setup the PSY:s
+    *                   Enum def in this file.
+    */
+    void SetupPsyL(const TUid aPsyUid,
+                   TPosSetupPsyDirective aDirective = EPosDisableTheRest);
+    
+    /**
+    * Initialises the test.
+    * By default does nothing.
+    */
+    virtual void InitTestL();
+    
+    /**
+    * Cleans up after a test.
+    * Always called, even if the test leaves.
+    * By default does nothing.
+    */
+    virtual void CloseTest();
+    
+    /**
+    * Connect to epos server.
+    */
+    void ConnectL();
+    
+    /**
+    * Open a PSY by name.
+    */
+    TInt OpenPositionerByName(const TUid aPsyUid);
+    
+    /**
+    * Open default PSY.
+    */
+    TInt OpenPositioner();
+    
+    /**
+    * Close PSY by calling "iPositioner.Close()"
+    */
+    void ClosePositioner();
+    
+    /**
+    * Close connection with epos server.
+    */
+    void Disconnect();
+    
+    /**
+    * Perform a request to epos.
+    * Use this methods when requesting from 
+    * both a service and another requestor source, ie a Contact
+    */
+    void PerformRequestL(const TDesC& aService,
+                         const TDesC& aContact, 
+                         CRequestor::_TRequestorType aServiceIdType,
+                         CRequestor::_TRequestorType aContactIdType,
+                     // Set default values
+                     CRequestor::_TRequestorFormat aServiceFormat = CRequestor::EFormatApplication,
+                     CRequestor::_TRequestorFormat aContactFormat = CRequestor::EFormatTelephone
+     );
+    
+    /**
+    * Perform a request to epos. 
+    */
+    void PerformRequestL(const TDesC& aRequestor,
+        CRequestor::_TRequestorType aRequestorType,
+      CRequestor::_TRequestorFormat aRequestorFormat);
+    
+    /**
+    * Perform a synchronous request to epos and return errorcode. 
+    * Position info is returned in OUT parameter
+    */
+    TInt PerformSyncRequest(const TDesC& aServiceName,
+                   /* OUT */TPositionInfoBase* aModuleInfo);
+    
+    /**
+    * Check the result of a request to epos.
+    * Leaves if the error code is not the expected one.
+    * The log file is used to print the result from the request
+    */
+    void CheckRequestResultL(TInt aExpectedErrorCode, TBool aLogFlag = ETrue);
+    
+    /**
+    * Leaves if aCondition is false.
+    * @param aCondition something that should be true
+    */
+    void AssertTrueL(TBool aCondition, const TDesC& aErrorMsg, TInt aErrorCode);
+
+    /**
+     * Leaves if aCondition is false.
+     * @param aCondition something that should be true
+     */
+     void AssertTrueL(TBool aCondition, const TDesC& aErrorMsg);
+    
+    /**
+    * Get the last updated position info from positioner
+    * Uses GetLastKnownPosition() method.
+    * @return position info.
+    */
+    TPositionInfo AllocPositionInfoL();
+    
+    /**
+    * Verifies that a PSY has been loaded by getting its last reported status.
+    * Requires that the PSY report active in its constructor.
+    * @param aUid the PSYs Uid 
+    */ 
+    void VerifyPsyLoadedL(TPositionModuleId aUid); 
+    
+    /**
+    * Verifies that a PSY has been unloaded by getting its last reported status.
+    * Requires that the PSY report inactive in its destructor.
+    * @param aUid the PSYs Uid 
+    */ 
+    void VerifyPsyUnloadedL(TPositionModuleId aUid); 
+    
+    /**
+    * Request a position from the default psy
+    */ 
+    void RequestL(TPositionInfo& aPosInfo, const TInt& aRequestIndex, 
+    		const TInt& aExpectedErrorCode = 999);
+    
+    void LogErrorAndLeaveL(const TDesC& aErrorInfo,
+            const TInt   aReason = KErrGeneral);
+    
+    void SetSimDataFileL(const TDesC& aFileName);
+    
+    void ResetDefaultPSYLastWorkingExtGPSPSYL();
+
+    void VerifyPositionFromL(TPositionInfo& aPosInfo, TPositionModuleId& aModuleId);
+
+    void VerifyPositionL(TPositionInfo& aPosInfo, TReal64 aLat, 
+    		TReal64 aLong, TReal64 aAlt);
+
+    void VerifyRequestTimeLessThanL(TInt aExpectedReqTime);
+    
+    void ConstructL();
+    
+protected:  // Data
+
+    TInt                    iNrOfRequests;
+    TInt 					iRequestTime;
+    
+    TInt                    iModuleId;
+    TUid                    iUidExternalGps;         
+    TUid                    iUidManualInput;
+    TUid                    iUidDefault;
+    TUid                    iUidStrategy;
+    TUid                    iUidSimulationPsy;
+    TUid                    iUidStubPositioner;
+    TUid                    iUidDynDbTestPsy;      
+    TUid                    iUidInstallTestPsy;
+    TUid                    iUidTestPsySimulateIsa;
+    TUid                    iUidTestPsy1;
+    TUid                    iUidTestPsy2;        
+    TUid                    iUidTestPsy3;        
+    TUid                    iUidTestPsy4;        
+    TUid                    iUidTestPsy5;        
+    TUid                    iUidTestPsy6;         
+    TUid                    iUidTestPsy7;         
+    TUid                    iUidTestPsy8;         
+    TUid                    iUidTestPsy9;         
+    TUid                    iUidTestPsy10;         
+    TUid                    iUidTestPsy11;         
+    TUid                    iUidTestPsy12;
+    TUid                    iUidTestPsy13;        
+    TUid                    iUidTestPsy256;
+    TUid                    iUidTestPsyTp176;
+    TUid                    iUidMultiPsy;
+    TUid                    iUidExamplePsy;
+    TUid                    iUidTestStatusPsy;
+    TUid                    iUidTestTimerPsy;
+    TUid                    iUidPsySwitching;
+    TUid                    iUidPanicPsy;
+    TUid                    iUidTestPsyPartialUpdate;
+    TUid                    iUidTestPsyMaxAge;
+    TUid                    iUidTestRangePsy;
+    TUid                    iUidTestSingPsy;
+    TUid                    iUidTestTrackingPsy;
+    TUid                    iUidTestProxyPsy1;
+    TUid                    iUidTestProxyPsy2;        
+    TUid                    iUidTestProxyPsy3;        
+    TUid                    iUidTestProxyPsy4;
+    TUid                    iUidInstallPsyTp273;
+    TUid                    iUidPartialUpdate2;
+    TUid                    iUidSatInfoPsy;
+    TUid                    iUidBtgPsy;
+    TUid                    iUidIgPsy;
+    RPositionServer         iPosServer;
+    RPositioner             iPositioner;
+    
+    CActiveScheduler* 		iScheduler;
+    TBool    				iErrors;
+    RFs                 	iFileServer;
+    
+    CT_LbsClientLog*		iLog;
+    
+private:    // Data
+   
+    TRequestStatus          iStatus;
+    TPositionInfo           iModuleInfo;
+	};
+
+#endif // __CT_LBS_PORTED_STEP_BASE_H__