diff -r 2965a06983dc -r aadfb18aaac1 lbstest/lbstestproduct/lbshybridmolr/src/ctlbsmolrtracking.cpp --- a/lbstest/lbstestproduct/lbshybridmolr/src/ctlbsmolrtracking.cpp Mon May 03 13:50:32 2010 +0300 +++ b/lbstest/lbstestproduct/lbshybridmolr/src/ctlbsmolrtracking.cpp Fri May 14 17:16:36 2010 +0300 @@ -84,6 +84,9 @@ { // Create the base class objects. CT_LbsHybridMOLRStep::ConstructL(); + iLbsPositioningStatus = CLbsPositioningStatus::NewL(*this); + iPosStatusCount = 0; + iPositioningStatus = CLbsPositioningStatus::ELbsPositioningStatusNotActive; } /** @@ -91,6 +94,7 @@ */ CT_LbsMolrTracking::~CT_LbsMolrTracking() { + delete iLbsPositioningStatus; TRAP_IGNORE(doTestStepPostambleL()); } @@ -232,6 +236,16 @@ TEST(EFalse); } + _LIT(KPositioningIndicator, "PositioningIndicator"); + TInt positioningIndicatorCount; + if(GetIntFromConfig(ConfigSection(), KPositioningIndicator, positioningIndicatorCount)) + { + iPositioningIndicatorCount = positioningIndicatorCount; + } + else + { + iPositioningIndicatorCount = 0; + } // Get the SpecialTestModemode setting ... 0 means not in a LastKnownPosition mode _LIT(KLastKnownPosition, "SpecialTestMode"); @@ -274,6 +288,11 @@ TVerdict CT_LbsMolrTracking::doTestStepPostambleL() { INFO_PRINTF1(_L(">>CT_LbsMolrTracking::doTestStepPostambleL()")); + if(iPositioningIndicatorCount>0) + { + TESTL(iPositioningIndicatorCount==iPosStatusCount); + TESTL(iPositioningStatus == CLbsPositioningStatus::ELbsPositioningStatusNotActive); + } iClients.ResetAndDestroy(); iClientTestManagers.ResetAndDestroy(); @@ -389,7 +408,11 @@ INFO_PRINTF2(_L("Client number %d received a position"), aObjectId); INFO_PRINTF3(_L("Client now has %d of %d positions"), positionsReceived+1, numberOfNPUDs); - + if(iPositioningIndicatorCount>0) + { + TESTL(iPosStatusCount==1); + TESTL(iPositioningStatus == CLbsPositioningStatus::ELbsPositioningStatusActive); + } if (iSpecialTestMode == 2) { @@ -726,3 +749,8 @@ CleanupStack::PopAndDestroy(moduleUpdate); CleanupStack::PopAndDestroy(db); } +void CT_LbsMolrTracking::OnPositioningStatusUpdate(const CLbsPositioningStatus::TLbsPositioningStatus& aPositioningStatus) + { + iPosStatusCount++; + iPositioningStatus = aPositioningStatus; + }