diff -r 000000000000 -r 9cfd9a3ee49c networkprotocolmodules/suplprotocolmodule/SuplProtocol/test/src/molr21Step.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/suplprotocolmodule/SuplProtocol/test/src/molr21Step.cpp	Tue Feb 02 01:50:39 2010 +0200
@@ -0,0 +1,276 @@
+// 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 "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:
+// Example CTestStep derived implementation
+// 
+//
+
+/**
+ @file molr21Step.cpp
+ @internalTechnology
+*/
+#include "molr21Step.h"
+#include "te_suplprotocolsuitedefs.h"
+
+/**
+ Destructor
+ */
+Cmolr21Step::~Cmolr21Step()
+
+	{
+	}
+
+/**
+ Constructor
+ */
+Cmolr21Step::Cmolr21Step()
+	{
+	SetTestStepName(Kmolr21Step);
+	}
+
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+TVerdict Cmolr21Step::doTestStepPreambleL()
+	{
+	// Call base class method for pre test actions	
+	CTe_suplprotocolSuiteStepBase::doTestStepPreambleL();
+	 
+	TLbsNetProtocolModuleParams param(*iGatewayObserver);
+	iModule = CSuplGatewayInterface::NewL(reinterpret_cast<TAny*>(&param));
+	 
+	return TestStepResult();
+	}
+
+
+/** Perform CMoLrStep1 test step.
+This test verifies that the SUPL Protocol Module correctly handles 
+an MO-LR Self Locate Terminal Based sequence. Assistance data is
+partially delivered whith an RRLP assistance data message and then complemented
+with more assistance data received in an RRLP Measure Position Request.
+
+This test also ensures that Reference Location is one of the assistance data
+types requested by LBS after SUPL RESPONSE. The test verifies that a reference
+location is delivered to LBS if it is received from the network in the 
+Reference Location assistance data type.
+
+@return TVerdict test result code
+*/
+TVerdict Cmolr21Step::doTestStepL()
+	{
+ 	
+	INFO_PRINTF1(_L("\t********************************************************************"));
+	INFO_PRINTF1(_L("\tMOLR basic procedure - RRLP Assistance Data + RRLP Request/Response"));
+	INFO_PRINTF1(_L("\t********************************************************************"));
+	INFO_PRINTF1(_L("- START -"));
+	// Initiate MO-LR
+	TLbsNetSessionId sessionId1(TUid::Uid(0x87654321), 0x1111);
+	TLbsNetPosRequestOptionsAssistance options1;
+	options1.SetNewClientConnected(ETrue);
+	TLbsNetPosRequestQuality quality1;
+	options1.SetRequestQuality(quality1);
+	TLbsAsistanceDataGroup dataRequestMask1 = EAssistanceDataBadSatList;
+	TLbsAsistanceDataGroup dataRequestMask2 = EAssistanceDataReferenceLocation;
+	// Request both sets of assitance data. They'll be delivered in different
+	// SUPL POS messages later on in the test.
+	TLbsAsistanceDataGroup dataRequestMask = dataRequestMask1|dataRequestMask2;
+	options1.SetDataRequestMask(dataRequestMask); 
+	INFO_PRINTF1(_L("\tLBS -> RequestSelfLocation"));
+	iModule->RequestSelfLocation(sessionId1, options1);
+
+	// Check Connection Manager receives a request for connecting
+	if (EFail == CheckNetworkCallbackL(CSuplNetworkTestObserver::EConnectReq))
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t ConnectionRequest -> NET"));
+
+
+	// Simulate the connection is up (inject that event)
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t Connected <- NET"));
+    iNetworkObserver->InjectConnectedIndication(iNetworkObserver->SessionId());
+	
+	// Check Connection Manager receives a request to send a SUPL START
+	if (EFail == CheckNetworkCallbackL(CSuplNetworkTestObserver::ESuplStartSendReq))
+	{
+	SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL START -> NET"));
+	
+	// Inject a SUPL RESPONSE
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL RESPONSE <- NET"));
+	CSuplMessageBase* resp = BuildSuplResponseL(TPositionModuleInfo::ETechnologyTerminal | TPositionModuleInfo::ETechnologyAssisted);
+	iNetworkObserver->InjectSuplMessage(iNetworkObserver->SessionId(), resp);
+	
+
+	// Check gateway receives Location Request
+	INFO_PRINTF1(_L("\tLBS <- ProcessLocationRequest()"));
+	if (EFail == CheckGatewayCallbackL(
+				CSuplGatewayObserver::EProcessLocationRequest) ||
+		MLbsNetworkProtocolObserver::EServiceSelfLocation != iGatewayObserver->LocType())
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+		
+	// LBS Requests assistance data
+	INFO_PRINTF1(_L("\tLBS -> RequestAssistanceData ()"));
+	TLbsNetSessionIdArray dummyIdArray;		
+	iModule->RequestAssistanceData(dataRequestMask, dummyIdArray);
+	
+	// Check Connection Manager receives a request to send a SUPL POS INIT
+	// with the assistance data mask requested by the gateway
+	if (EFail == CheckNetworkCallbackL(CSuplNetworkTestObserver::ESendSuplPosInitSendReq))
+	{
+	SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL POS INIT -> NET"));
+
+	// Inject a SUPL POS (RRLP ASSIST DATA) with some of the Assistance data requested
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL POS - RRLP Assitance Data <- NET"));
+	CSuplMessageBase* suplPos = BuildSuplPosAssitDataL(dataRequestMask2, ETrue); // ETrue = more assistance data underway
+	iNetworkObserver->InjectSuplMessage(iNetworkObserver->SessionId(), suplPos);	
+
+	// Check the Connection Manager receives a request to send a SUPL POS (ack to assistance data)
+	if (EFail == CheckNetworkCallbackL(CSuplNetworkTestObserver::ESendSuplPosSendReq))
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL POS - RRLP Assistance Data Ack -> NET"));
+
+	// Inject a SUPL POS (RRLP MEASURE POSITION REQUEST) wich carries
+	// assistance data
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL POS - RRLP Measure Position Request <- NET"));
+	suplPos = BuildSuplPosRequestL(TPositionModuleInfo::ETechnologyTerminal | TPositionModuleInfo::ETechnologyAssisted, dataRequestMask1);
+	iNetworkObserver->InjectSuplMessage(iNetworkObserver->SessionId(), suplPos);	
+
+
+	// Check gateway receives the assistance data types contained in both SUPL POS messages
+	// received earlier.
+	if (EFail == CheckGatewayCallbackL(CSuplGatewayObserver::EProcessAssistanceData) ||
+		(dataRequestMask & iGatewayObserver->AssistanceDataSetMask() != dataRequestMask) )
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	
+	// Ref Loc has been requested. Make sure it's been notified	(the callback mechanism does
+	// not work well because EProcessAssistanceData overwrites EProcessLocationUpdate as they
+	// happen in the same RunL of the SUPL Protocol). Instead, a flag has to be checked after
+	// having received EProcessAssistanceData above
+	if (!iGatewayObserver->IsRefLocNotified())
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();			
+		}
+	
+	// Reference Location is reported before Assistance Data...if we got this far,
+	// both ref loc and assist data have been notified:
+	INFO_PRINTF1(_L("\tLBS <- ProcessLocationUpdate(Reference Location)"));
+	INFO_PRINTF1(_L("\tLBS <- ProcessAssistanceData()"));
+
+	
+	// Check gateway receives a location request (due to the RRLP Measure Position Request)
+	//
+	INFO_PRINTF1(_L("\tLBS <- ProcessLocationRequest()"));
+	if (EFail == CheckGatewayCallbackL(
+				CSuplGatewayObserver::EProcessLocationRequest) ||
+		MLbsNetworkProtocolObserver::EServiceSelfLocation != iGatewayObserver->LocType())
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	
+	// Fake the empty assistance data request normally produced by
+	// the GPS module after it gets the Location Request above
+	// (should just be disregarded by the protocol module)
+	INFO_PRINTF1(_L("\tLBS -> RequestAssistanceData (empty)"));
+	iModule->RequestAssistanceData(0, dummyIdArray);
+	
+	
+	// Fake LBS sending results (position) to SPM
+	INFO_PRINTF1(_L("\tLBS -> RespondLocationRequest"));
+	TReal64 latitude = 10;
+	TReal64 longitude = 0;
+	TReal32 HorAccuracy = 10;
+	TPositionInfo mobilePosInfo;
+	TTime utcTime;
+	utcTime.UniversalTime();
+	TCoordinate coor(latitude,longitude);
+	TPosition mobilePos(TLocality(coor,HorAccuracy),utcTime);
+	mobilePosInfo.SetPosition(mobilePos);
+	iModule->RespondLocationRequest(sessionId1,KErrNone,mobilePosInfo);
+
+	
+	// Check the Connection Manager receives a request to send a SUPL POS (RRLP MEASURE POSITION RESPONSE)
+	//
+	if (EFail == CheckNetworkCallbackL(CSuplNetworkTestObserver::ESendSuplPosSendReq))
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL POS - RRLP Measure Position Response -> NET"));
+
+	// Inject a SUPL END (without position)
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t SUPL END <- NET"));
+	CSuplMessageBase* suplEnd = BuildSuplEndL(EFalse); // EFalse means no position
+	iNetworkObserver->InjectSuplMessage(iNetworkObserver->SessionId(), suplEnd);
+	
+	// Check gateway session completed
+	if (EFail == CheckGatewayCallbackL(
+				CSuplGatewayObserver::EProcessSessionComplete))
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	INFO_PRINTF1(_L("\tLBS <- ProcessSessionComplete"));
+
+	// Check Connection Manager receives a disconnection request
+	if (EFail == CheckNetworkCallbackL(CSuplNetworkTestObserver::EDisconnectReq))
+		{
+		SetTestStepResult(EFail);
+		return TestStepResult();
+		}
+	INFO_PRINTF1(_L("\t\t\t\t\t\t\t\t DisconnectRequest -> NET"));
+	
+	// Check if more observer activity takes place
+	if (iGatewayObserver->IsMoreObserverActivity() ||
+	iNetworkObserver->IsMoreObserverActivity())
+	{
+	SetTestStepResult(EFail);
+	return TestStepResult();
+	}
+	INFO_PRINTF1(_L("- END -"));
+	
+	SetTestStepResult(EPass);
+	return TestStepResult();	
+}
+
+
+/**
+ * @return - TVerdict code
+ * Override of base class virtual
+ */
+TVerdict Cmolr21Step::doTestStepPostambleL()
+	{
+	delete iModule;
+
+	// Call base class method for post test actions	
+	CTe_suplprotocolSuiteStepBase::doTestStepPostambleL();
+	return TestStepResult();
+	}