--- a/lbstest/lbstestproduct/LbsROMspecificSuites/src/ctpositionerteststep.cpp	Thu Aug 19 11:17:26 2010 +0300
+++ b/lbstest/lbstestproduct/LbsROMspecificSuites/src/ctpositionerteststep.cpp	Tue Aug 31 16:38:06 2010 +0300
@@ -72,6 +72,7 @@
 		TInt testIndex = KErrNotFound;
 		if(!GetIntFromConfig(ConfigSection(),KTestCaseIdInt,testIndex))
 			{
+            INFO_PRINTF1(_L("Error: could not get testindex from ini file"));
 			User::Leave(KErrNotFound);
 			}
 		_LIT(KTestName, "Call test by index");
@@ -121,23 +122,24 @@
 	TFullName name;
 	err = findServer.Next(name);
 
-	if ((err==KErrNone)||(err==KErrAlreadyExists))
-		{
-		_LIT(KFailLog, "Location monitor process started by root - so test case failed");
-		ERR_PRINTF1(KFailLog);
-		SetTestStepResult(EFail);
-		}
-	else
-		{
-	
-		_LIT(KPassInfoLog, "Location Monitor NOT started by the root process");
-		INFO_PRINTF1(KPassInfoLog);
-		
-		RPositionServer server;
-		User::LeaveIfError(server.Connect());
-		CleanupClosePushL(server);
+    if ((err==KErrNone)||(err==KErrAlreadyExists))
+        {
+        _LIT(KFailLog, "Location monitor process started by root - so test case failed");
+        ERR_PRINTF1(KFailLog);
+        SetTestStepResult(EFail);
+        }
+    else
+        {
+    
+        _LIT(KPassInfoLog, "Location Monitor NOT started by the root process");
+        INFO_PRINTF1(KPassInfoLog);
+        
+        RPositionServer server;
+        TInt retval = server.Connect();
+        INFO_PRINTF2(_L("RPositionServer.Connect() returned with value %d, should return 0"),retval);
+        CleanupClosePushL(server);
 
-		User::After(100000);
+        User::After(100*1000);
 
         _LIT(KTest, "Session with epos location server opened successfully");
         INFO_PRINTF1(KTest);
@@ -145,16 +147,17 @@
 		RPositioner positioner;
 		TInt err = positioner.Open(server);
 
-		if(KErrNone != err)
-			{
-			ERR_PRINTF1(KFailedOpenPositioner);
-			SetTestStepResult(EFail);
-			CleanupStack::PopAndDestroy(&server);
-			return TestStepResult();
-			}
-		
-		CleanupClosePushL(positioner);
-		_LIT(KTest2, "SubSession with epos location server opened successfully");
+        if(KErrNone != err)
+            {
+            INFO_PRINTF2(_L("positioner.Open(server) returned value %d, should be 0"), err);
+            ERR_PRINTF1(KFailedOpenPositioner);
+            SetTestStepResult(EFail);
+            CleanupStack::PopAndDestroy(&server);
+            return TestStepResult();
+            }
+        
+        CleanupClosePushL(positioner);
+        _LIT(KTest2, "SubSession with epos location server opened successfully");
         INFO_PRINTF1(KTest2);
 		
 		// Validate that the location monitor gets started up when
@@ -228,7 +231,14 @@
 		INFO_PRINTF1(KPassInfoLog);
 		
 			RPositionServer server;
-			User::LeaveIfError(server.Connect());
+			TInt retval = server.Connect();
+			if(err != KErrNone)
+			    {
+                SetTestStepResult(EFail);
+                INFO_PRINTF2(_L("RPositionServer.Connect() returned with value %d, should return 0"),retval);
+                CleanupStack::PopAndDestroy(&server);
+                return TestStepResult();
+			    }
 			CleanupClosePushL(server);
 
             _LIT(KTest, "Session with epos location server opened successfully");