--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_Class0StoreEnabled.cpp	Fri Feb 19 23:59:33 2010 +0200
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_Class0StoreEnabled.cpp	Fri Mar 12 15:49:38 2010 +0200
@@ -24,22 +24,23 @@
 	Each test step initialises it's own name
 */
 	{
-	iSocketServer = &aSocketServer;
+    iSharedSocketServer = &aSocketServer;
+	iPartOfMultiStepTestCase = ETrue;
 	}
 
 
 /**
   Checks wheather the CLASS0 store has in fact been enabled.
-		*/
+ */
 TVerdict CClass0StoreEnabled::doTestStepL()
 	{	
 	TBool isClass0StoreEnabled = EFalse;
 	GetBoolFromConfig(ConfigSection(), _L("isClass0StoreEnabled"), isClass0StoreEnabled);
 		
 	//Open a socket 
-	INFO_PRINTF1(_L("Opening socket..."));
 	RSocket socket;
-	OpenSmsSocketL(*iSocketServer, socket, ESmsAddrRecvAny);
+	OpenSmsSocketL(*iSharedSocketServer, socket, ESmsAddrRecvAny);
+	CleanupClosePushL(socket);
 
 	TRequestStatus status;
 	socket.Ioctl(KIoctlSupportOODClass0SmsMessages, status, NULL, KSolSmsProv);
@@ -48,15 +49,6 @@
 	TEST((isClass0StoreEnabled  &&  status == KErrNone)  ||
 		 (!isClass0StoreEnabled  &&  status == KErrNotSupported));
 	
-	socket.Close();
-	
+	CleanupStack::PopAndDestroy(&socket);
 	return TestStepResult();
 	}
-//-----------------------------------------------------------------------------
-
-
-
-
-
-
-