diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyserverplugins/common_tsy/test/component/src/cctsyucasembms005.cpp
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsyucasembms005.cpp	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsyucasembms005.cpp	Thu May 06 15:10:38 2010 +0100
@@ -1,246 +1,246 @@
-// 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:
-//
-
-/**
- @file The TEFUnit integration test suite for MBMS Context support in the Common TSY.
-*/
-
-#include "cctsyucasembms005.h"
-#include "cctsyactiveretriever.h"
-#include <etel.h>
-#include <etelmm.h>
-#include <et_clsvr.h>
-#include <ctsy/mmtsy_names.h>
-#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
-#include "tmockltsydata.h"
-#include <ctsy/serviceapi/gsmerror.h>
-
-#include <pcktcs.h>
-#include <pcktlist.h>
-#include "pcktretrieve.h"
-#include "CMmCommonStaticUtility.h"
-#include <ctsy/serviceapi/mmtsy_defaults.h>
-
-CTestSuite* CCTsyUCaseMbms005::CreateSuiteL(const TDesC& aName) 
-	{
-	SUB_SUITE;  
-    ADD_TEST_STEP_ISO_CPP(CCTsyUCaseMbms005, CCtsyIntegrationTestMbms0001L );
-    ADD_TEST_STEP_ISO_CPP(CCTsyUCaseMbms005, CCtsyIntegrationTestMbms0002L );
-	END_SUITE;
-	}
-
-//
-// Actual test cases
-//
-
-/**
- * @SYMTestCaseID BA-CTSY-INT-MB-0009
- * @SYMFssID BA/CTSY/PKTS-0009
- * @SYMTestCaseDesc Support getting current MBMS network availability when GMM ATTACHED.
- * @SYMTestPriority High
- * @SYMTestActions RPacketService:: GetMbmsNetworkServiceStatus
- * @SYMTestExpectedResults Pass - MBMS network availability status is returned correctly.  Status can be Supported, Not Supported.or Unknown..
- * @SYMTestType CIT
- * @SYMTestCaseDependencies live/manual
- *
- * Reason for test: Verify that MBMS network availability status is returned correctly.
- *
- * @return - none
- */
-void CCTsyUCaseMbms005::CCtsyIntegrationTestMbms0001L()
-    {
-        
-	//
-	// SET UP
-	//
-	        
-    OpenEtelServerL( EUseExtendedError );
-	CleanupStack::PushL( TCleanupItem( Cleanup, this ) );
-	OpenPhoneL();	
-
-	RBuf8 data;
-	CleanupClosePushL(data);
-
-	RBuf8 data2;
-	CleanupClosePushL(data2);
-			
-	RPacketService packetService;
-    OpenPacketServiceL( packetService );
-    CleanupClosePushL( packetService );
-    
-  	// Open new context                
-	TInfoName contextId;
-    RPacketMbmsContext packetMbmsContext;
-    packetMbmsContext.OpenNewContext( packetService, contextId );
-    CleanupClosePushL( packetMbmsContext );
-    
-    // Ensure packet service status is RPacketService::EStatusAttached. 
-    TRequestStatus mockLtsyStatus;	
-	RPacketService::TStatus sendStatus = RPacketService::EStatusAttached;
-	TBool isResumed = EFalse;
-	TMockLtsyData2 <RPacketService::TStatus, TBool > ltsyData(sendStatus, isResumed);
-	ltsyData.SerialiseL(data);
-		
-	TRequestStatus requestStatus2;
-	RPacketService::TStatus contextStatus;
-	packetService.NotifyStatusChange(requestStatus2, contextStatus);
-	
-	iMockLTSY.NotifyTerminated(mockLtsyStatus);	
-	iMockLTSY.CompleteL(EPacketNotifyStatusChange, KErrNone, data); //
-	
-	User::WaitForRequest(mockLtsyStatus);
-	User::WaitForRequest(requestStatus2);
-	AssertMockLtsyStatusL();
-	ASSERT_EQUALS(KErrNone, requestStatus2.Int());
-	ASSERT_EQUALS(sendStatus, contextStatus);    
-
-	//
-	// SET UP END
-	//    
-            
-	//
-	// TEST START
-	//
-	
-	
-	TRequestStatus requestStatus;
-    TBool aAttemptAttach = ETrue;
-    TMbmsNetworkServiceStatus regStatus;
- 
-	TMockLtsyData1<TBool> ltsyData2(aAttemptAttach);
-	ltsyData2.SerialiseL(data);
-	iMockLTSY.ExpectL(EPacketGetMbmsNetworkServiceStatus, data);	
-
-    TMbmsNetworkServiceStatus regStatusComplete = EMbmsSupported;
-    TMockLtsyData1<TMbmsNetworkServiceStatus> ltsyData3(regStatusComplete);
-	ltsyData3.SerialiseL(data2);
-	
-	// The Client requests MBMS service status via RPacketService:: GetMbmsNetworkServiceStatus with aAttemptAttach = FALSE.
-	packetService.GetMbmsNetworkServiceStatus(requestStatus, aAttemptAttach, regStatus);
-	 	
-    iMockLTSY.CompleteL(EPacketGetMbmsNetworkServiceStatus, KErrNone, data2);
-		      
-	// Ensure that PacketService::GetMbmsNetworkServiceStatus returns EMbmsSupported
-    User::WaitForRequest(requestStatus);
-	AssertMockLtsyStatusL();
-	ASSERT_EQUALS( KErrNone, requestStatus.Int() );   
-	ASSERT_TRUE(regStatusComplete == regStatus);
-		
-	//
-	// TEST END
-	//	
-	
-	AssertMockLtsyStatusL();
-	CleanupStack::PopAndDestroy( 5, this ); // packetMbmsContext, packetService, data, data2, this 
-    }
-    
- /**
- * @SYMTestCaseID BA-CTSY-INT-MB-0010
- * @SYMFssID BA/CTSY/PKTS-0010
- * @SYMTestCaseDesc Support getting current MBMS network availability when GMM ATTACHED.
- * @SYMTestPriority High
- * @SYMTestActions 
- * @SYMTestExpectedResults Pass - MBMS network availability status is returned correctly.  Status can be Supported, Not Supported.or Unknown..
- * @SYMTestType CIT
- * @SYMTestCaseDependencies live/manual
- *
- * Reason for test: Verify that MBMS network availability status is returned correctly.
- *
- * @return - none
- */
-void CCTsyUCaseMbms005::CCtsyIntegrationTestMbms0002L()
-     {
-        
-	//
-	// SET UP
-	//
-	        
-    OpenEtelServerL( EUseExtendedError );
-	CleanupStack::PushL( TCleanupItem( Cleanup, this ) );
-	OpenPhoneL();	
-
-	RBuf8 data;
-	CleanupClosePushL(data);
-
-	RBuf8 data2;
-	CleanupClosePushL(data2);
-			
-	RPacketService packetService;
-    OpenPacketServiceL( packetService );
-    CleanupClosePushL( packetService );
-  
-    // Open new context             
-	TInfoName contextId;
-    RPacketMbmsContext packetMbmsContext;
-    packetMbmsContext.OpenNewContext( packetService, contextId );
-    CleanupClosePushL( packetMbmsContext );
-    
-    // Ensure packet service status is RPacketService::EStatusAttached. 
-    TRequestStatus mockLtsyStatus;	
-	RPacketService::TStatus sendStatus = RPacketService::EStatusAttached;
-	TBool isResumed = EFalse;
-	TMockLtsyData2 <RPacketService::TStatus, TBool > ltsyData3(sendStatus, isResumed);
-	ltsyData3.SerialiseL(data);
-		
-	TRequestStatus requestStatus2;
-	RPacketService::TStatus contextStatus;
-	packetService.NotifyStatusChange(requestStatus2, contextStatus);
-	
-	iMockLTSY.NotifyTerminated(mockLtsyStatus);	
-	iMockLTSY.CompleteL(EPacketNotifyStatusChange, KErrNone, data); //
-	
-	User::WaitForRequest(mockLtsyStatus);
-	User::WaitForRequest(requestStatus2);
-	AssertMockLtsyStatusL();
-	ASSERT_EQUALS(KErrNone, requestStatus2.Int());
-	ASSERT_EQUALS(sendStatus, contextStatus);    
-
-	//
-	// SET UP END
-	//    
-            
-	//
-	// TEST START
-	//
-	
-	
-	TRequestStatus requestStatus;
-    TBool aAttemptAttach = ETrue;
-    TMbmsNetworkServiceStatus regStatus;
-
-    TMockLtsyData1<TBool> ltsyData(aAttemptAttach);
-	ltsyData.SerialiseL(data);
-	iMockLTSY.ExpectL(EPacketGetMbmsNetworkServiceStatus, data);	
-    TMbmsNetworkServiceStatus regStatusComplete = EMbmsSupported;
-    TMockLtsyData1<TMbmsNetworkServiceStatus> ltsyData2(regStatusComplete);
-	ltsyData2.SerialiseL(data2);
-    iMockLTSY.CompleteL(EPacketGetMbmsNetworkServiceStatus, KErrNotSupported); 
-    
-    // The Client requests MBMS service status via RPacketService:: GetMbmsNetworkServiceStatus with aAttemptAttach = FALSE. 	
-	packetService.GetMbmsNetworkServiceStatus(requestStatus, aAttemptAttach, regStatus);
-	 	       
-	// Ensure that PacketService::GetMbmsNetworkServiceStatus returns error		 	       
-    User::WaitForRequest(requestStatus);
-	AssertMockLtsyStatusL();
-	ASSERT_EQUALS( KErrNotSupported, requestStatus.Int() );   
-		
-	//
-	// TEST END
-	//	
-	
-	AssertMockLtsyStatusL();
-	CleanupStack::PopAndDestroy( 5, this ); // packetMbmsContext, packetService, data, data2, this 
-      }
-    
+// 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:
+//
+
+/**
+ @file The TEFUnit integration test suite for MBMS Context support in the Common TSY.
+*/
+
+#include "cctsyucasembms005.h"
+#include "cctsyactiveretriever.h"
+#include <etel.h>
+#include <etelmm.h>
+#include <et_clsvr.h>
+#include <ctsy/mmtsy_names.h>
+#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
+#include "tmockltsydata.h"
+#include <ctsy/serviceapi/gsmerror.h>
+
+#include <pcktcs.h>
+#include <pcktlist.h>
+#include "pcktretrieve.h"
+#include "CMmCommonStaticUtility.h"
+#include <ctsy/serviceapi/mmtsy_defaults.h>
+
+CTestSuite* CCTsyUCaseMbms005::CreateSuiteL(const TDesC& aName) 
+	{
+	SUB_SUITE;  
+    ADD_TEST_STEP_ISO_CPP(CCTsyUCaseMbms005, CCtsyIntegrationTestMbms0001L );
+    ADD_TEST_STEP_ISO_CPP(CCTsyUCaseMbms005, CCtsyIntegrationTestMbms0002L );
+	END_SUITE;
+	}
+
+//
+// Actual test cases
+//
+
+/**
+ * @SYMTestCaseID BA-CTSY-INT-MB-0009
+ * @SYMFssID BA/CTSY/PKTS-0009
+ * @SYMTestCaseDesc Support getting current MBMS network availability when GMM ATTACHED.
+ * @SYMTestPriority High
+ * @SYMTestActions RPacketService:: GetMbmsNetworkServiceStatus
+ * @SYMTestExpectedResults Pass - MBMS network availability status is returned correctly.  Status can be Supported, Not Supported.or Unknown..
+ * @SYMTestType CIT
+ * @SYMTestCaseDependencies live/manual
+ *
+ * Reason for test: Verify that MBMS network availability status is returned correctly.
+ *
+ * @return - none
+ */
+void CCTsyUCaseMbms005::CCtsyIntegrationTestMbms0001L()
+    {
+        
+	//
+	// SET UP
+	//
+	        
+    OpenEtelServerL( EUseExtendedError );
+	CleanupStack::PushL( TCleanupItem( Cleanup, this ) );
+	OpenPhoneL();	
+
+	RBuf8 data;
+	CleanupClosePushL(data);
+
+	RBuf8 data2;
+	CleanupClosePushL(data2);
+			
+	RPacketService packetService;
+    OpenPacketServiceL( packetService );
+    CleanupClosePushL( packetService );
+    
+  	// Open new context                
+	TInfoName contextId;
+    RPacketMbmsContext packetMbmsContext;
+    packetMbmsContext.OpenNewContext( packetService, contextId );
+    CleanupClosePushL( packetMbmsContext );
+    
+    // Ensure packet service status is RPacketService::EStatusAttached. 
+    TRequestStatus mockLtsyStatus;	
+	RPacketService::TStatus sendStatus = RPacketService::EStatusAttached;
+	TBool isResumed = EFalse;
+	TMockLtsyData2 <RPacketService::TStatus, TBool > ltsyData(sendStatus, isResumed);
+	ltsyData.SerialiseL(data);
+		
+	TRequestStatus requestStatus2;
+	RPacketService::TStatus contextStatus;
+	packetService.NotifyStatusChange(requestStatus2, contextStatus);
+	
+	iMockLTSY.NotifyTerminated(mockLtsyStatus);	
+	iMockLTSY.CompleteL(EPacketNotifyStatusChange, KErrNone, data); //
+	
+	User::WaitForRequest(mockLtsyStatus);
+	User::WaitForRequest(requestStatus2);
+	AssertMockLtsyStatusL();
+	ASSERT_EQUALS(KErrNone, requestStatus2.Int());
+	ASSERT_EQUALS(sendStatus, contextStatus);    
+
+	//
+	// SET UP END
+	//    
+            
+	//
+	// TEST START
+	//
+	
+	
+	TRequestStatus requestStatus;
+    TBool aAttemptAttach = ETrue;
+    TMbmsNetworkServiceStatus regStatus;
+ 
+	TMockLtsyData1<TBool> ltsyData2(aAttemptAttach);
+	ltsyData2.SerialiseL(data);
+	iMockLTSY.ExpectL(EPacketGetMbmsNetworkServiceStatus, data);	
+
+    TMbmsNetworkServiceStatus regStatusComplete = EMbmsSupported;
+    TMockLtsyData1<TMbmsNetworkServiceStatus> ltsyData3(regStatusComplete);
+	ltsyData3.SerialiseL(data2);
+	
+	// The Client requests MBMS service status via RPacketService:: GetMbmsNetworkServiceStatus with aAttemptAttach = FALSE.
+	packetService.GetMbmsNetworkServiceStatus(requestStatus, aAttemptAttach, regStatus);
+	 	
+    iMockLTSY.CompleteL(EPacketGetMbmsNetworkServiceStatus, KErrNone, data2);
+		      
+	// Ensure that PacketService::GetMbmsNetworkServiceStatus returns EMbmsSupported
+    User::WaitForRequest(requestStatus);
+	AssertMockLtsyStatusL();
+	ASSERT_EQUALS( KErrNone, requestStatus.Int() );   
+	ASSERT_TRUE(regStatusComplete == regStatus);
+		
+	//
+	// TEST END
+	//	
+	
+	AssertMockLtsyStatusL();
+	CleanupStack::PopAndDestroy( 5, this ); // packetMbmsContext, packetService, data, data2, this 
+    }
+    
+ /**
+ * @SYMTestCaseID BA-CTSY-INT-MB-0010
+ * @SYMFssID BA/CTSY/PKTS-0010
+ * @SYMTestCaseDesc Support getting current MBMS network availability when GMM ATTACHED.
+ * @SYMTestPriority High
+ * @SYMTestActions 
+ * @SYMTestExpectedResults Pass - MBMS network availability status is returned correctly.  Status can be Supported, Not Supported.or Unknown..
+ * @SYMTestType CIT
+ * @SYMTestCaseDependencies live/manual
+ *
+ * Reason for test: Verify that MBMS network availability status is returned correctly.
+ *
+ * @return - none
+ */
+void CCTsyUCaseMbms005::CCtsyIntegrationTestMbms0002L()
+     {
+        
+	//
+	// SET UP
+	//
+	        
+    OpenEtelServerL( EUseExtendedError );
+	CleanupStack::PushL( TCleanupItem( Cleanup, this ) );
+	OpenPhoneL();	
+
+	RBuf8 data;
+	CleanupClosePushL(data);
+
+	RBuf8 data2;
+	CleanupClosePushL(data2);
+			
+	RPacketService packetService;
+    OpenPacketServiceL( packetService );
+    CleanupClosePushL( packetService );
+  
+    // Open new context             
+	TInfoName contextId;
+    RPacketMbmsContext packetMbmsContext;
+    packetMbmsContext.OpenNewContext( packetService, contextId );
+    CleanupClosePushL( packetMbmsContext );
+    
+    // Ensure packet service status is RPacketService::EStatusAttached. 
+    TRequestStatus mockLtsyStatus;	
+	RPacketService::TStatus sendStatus = RPacketService::EStatusAttached;
+	TBool isResumed = EFalse;
+	TMockLtsyData2 <RPacketService::TStatus, TBool > ltsyData3(sendStatus, isResumed);
+	ltsyData3.SerialiseL(data);
+		
+	TRequestStatus requestStatus2;
+	RPacketService::TStatus contextStatus;
+	packetService.NotifyStatusChange(requestStatus2, contextStatus);
+	
+	iMockLTSY.NotifyTerminated(mockLtsyStatus);	
+	iMockLTSY.CompleteL(EPacketNotifyStatusChange, KErrNone, data); //
+	
+	User::WaitForRequest(mockLtsyStatus);
+	User::WaitForRequest(requestStatus2);
+	AssertMockLtsyStatusL();
+	ASSERT_EQUALS(KErrNone, requestStatus2.Int());
+	ASSERT_EQUALS(sendStatus, contextStatus);    
+
+	//
+	// SET UP END
+	//    
+            
+	//
+	// TEST START
+	//
+	
+	
+	TRequestStatus requestStatus;
+    TBool aAttemptAttach = ETrue;
+    TMbmsNetworkServiceStatus regStatus;
+
+    TMockLtsyData1<TBool> ltsyData(aAttemptAttach);
+	ltsyData.SerialiseL(data);
+	iMockLTSY.ExpectL(EPacketGetMbmsNetworkServiceStatus, data);	
+    TMbmsNetworkServiceStatus regStatusComplete = EMbmsSupported;
+    TMockLtsyData1<TMbmsNetworkServiceStatus> ltsyData2(regStatusComplete);
+	ltsyData2.SerialiseL(data2);
+    iMockLTSY.CompleteL(EPacketGetMbmsNetworkServiceStatus, KErrNotSupported); 
+    
+    // The Client requests MBMS service status via RPacketService:: GetMbmsNetworkServiceStatus with aAttemptAttach = FALSE. 	
+	packetService.GetMbmsNetworkServiceStatus(requestStatus, aAttemptAttach, regStatus);
+	 	       
+	// Ensure that PacketService::GetMbmsNetworkServiceStatus returns error		 	       
+    User::WaitForRequest(requestStatus);
+	AssertMockLtsyStatusL();
+	ASSERT_EQUALS( KErrNotSupported, requestStatus.Int() );   
+		
+	//
+	// TEST END
+	//	
+	
+	AssertMockLtsyStatusL();
+	CleanupStack::PopAndDestroy( 5, this ); // packetMbmsContext, packetService, data, data2, this 
+      }
+