--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp	Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp	Tue Aug 31 16:06:03 2010 +0300
@@ -2200,7 +2200,7 @@
 
     outputlist->Reset() ;
     inputlist->Reset() ;
-    ASyncLocCBF* callBack = NULL;
+    ASyncLocCBF* callBack ;
 
     locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack);
 
@@ -2958,9 +2958,9 @@
 
     _LIT8(KService, "Service.Location");
     _LIT8(KIDataSource,"ILocation");
-    __UHEAP_MARKEND ;
+
     return KErrNone ; //Manual test case 
-    /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
+    CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
 
     // Input and output parameter list
     CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL());
@@ -3041,9 +3041,9 @@
     delete ServiceHandler ;
 
     a.ResetAndDestroy() ;
-    //	delete  OutParmList ;*/
-
-    //return result  ;
+    //	delete  OutParmList ;
+    __UHEAP_MARKEND ;
+    return result  ;
 
     }
 
@@ -3063,7 +3063,7 @@
     iLog->Log(KTLocTest) ;
 
     return KErrNone ; //Manual test case 
-    /*TRequestStatus Status = KRequestPending  ;
+    TRequestStatus Status = KRequestPending  ;
     RThread FunctionThread ;
 
     TInt ret =  FunctionThread.Create(_L("ServiceFailed Thread") , ServiceFailedTest ,KDefaultStackSize , 
@@ -3091,7 +3091,7 @@
                 }
 
 
-            return ret;	*/
+            return ret;	
     }
 
 
@@ -3229,7 +3229,7 @@
         }	
     return KErrNone ;
 
-    //return KErrGeneral; 
+    return KErrGeneral; 
     }
 
 
@@ -3575,7 +3575,7 @@
     iLog->Log(KTLocTest) ;
 
     return KErrNone ; //This is a manul test case
-    /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
+    CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
 
     // Input and output parameter list
     CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL());
@@ -3658,7 +3658,7 @@
 
     _LIT(Kerr , "Time out value not set correctly") ;    
     return KErrNone ;
-   */
+
     }
 
 /**
@@ -6511,7 +6511,7 @@
 
     outputlist->Reset() ;
     inputlist->Reset() ;
-    ASyncLocCBF* callBack = NULL;
+    ASyncLocCBF* callBack ;
 
     locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack);
 
@@ -6795,7 +6795,7 @@
 TInt CTestProvider::GetLocPosBasedWrongVal1(CStifItemParser& /*aItem*/)
     {
     //currently not needed
-   return 0;
+
     }