diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyserverplugins/simtsy/test/Te_Sim/Te_SimPhBkSmartCardUSimTest.cpp
--- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimPhBkSmartCardUSimTest.cpp	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimPhBkSmartCardUSimTest.cpp	Thu May 06 15:10:38 2010 +0100
@@ -1,133 +1,133 @@
-// Copyright (c) 2005-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:
-//
-
-#include "Te_SimPhBkSmartCardUSimTest.h"
-
-#include "../../inc/utils.h"
-
-CSimPhBkSmartCardUSimTest::CSimPhBkSmartCardUSimTest() 
-	{ 
-	SetTestStepName(_L("SmartCardUSimTest"));
-	}
-
-TVerdict CSimPhBkSmartCardUSimTest::doTestStepL()
-	{
-	INFO_PRINTF1(_L("BeginPhBkSmartCardUSimTest"));
-
- 	CreateConfigFileL(_L("c:\\config3.txt"));
- 	SetTestNumberL(11);
-
-	RMobilePhone::TAID activeAID;
-	TInt count;
-	TRequestStatus aReqStatus,stat0,stat1;
-
-	TInt ret = iPhone.Open(iTelServer,KPhoneName); 
-	INFO_PRINTF2(_L("Result: %d"),ret);
-	TESTL(ret == KErrNone); 
-	INFO_PRINTF1(_L("Opened phone object"));
-
-	INFO_PRINTF1(_L("EnumerateUSimApplications test"));
-
-	iPhone.EnumerateUSimApplications(aReqStatus, count, activeAID);
-	User::WaitForRequest(aReqStatus);
-	TESTL(activeAID.Compare(_L8("App2"))==0);
-	TESTL(count == 3);
-	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.1"));
-
-	//Test GetUSimApplicationInfo
-	RMobilePhone::TUSimApplicationInfoV2 usimAppInfo;
-	RMobilePhone::TUSimApplicationInfoV2Pckg usimAppInfoPckg(usimAppInfo);
-
-	TInt index=0;
-
-	INFO_PRINTF1(_L("GetUSimApplicationInfo test"));
-
-	iPhone.GetUSimApplicationInfo(aReqStatus, index, usimAppInfoPckg);
-	User::WaitForRequest(aReqStatus);
-	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.2"));
-	TESTL(usimAppInfo.iAID.Compare(_L8("App2")) == KErrNone);
-	TESTL(usimAppInfo.iLabel.Compare(_L8("PhoneApp2")) == KErrNone);
-
-	index=5;
-	iPhone.GetUSimApplicationInfo(aReqStatus, index, usimAppInfoPckg);
-	User::WaitForRequest(aReqStatus);
-	CHECKPOINT_EXL(aReqStatus==KErrNotFound, CHP_APPS_CASE("P.3"));
-	TESTL(usimAppInfo.iAID.Compare(_L8("App2")) == KErrNone);
-	TESTL(usimAppInfo.iLabel.Compare(_L8("PhoneApp2")) == KErrNone);
-
-	INFO_PRINTF1(_L("NotifyUSimApplicationsInfoChange test"));
-	count = 0;	// Set count to some value different to that of the number of Apps.
-	iPhone.NotifyUSimApplicationsInfoChange(aReqStatus, count, activeAID);
-	User::WaitForRequest(aReqStatus);
-	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.4"));
-	TESTL(activeAID.Compare(_L8("")) == 0);
-	TESTL(count == 3);
-	
-	count = 0;	// Set count to some value different to that of the number of Apps.
-	iPhone.NotifyUSimApplicationsInfoChange(aReqStatus, count, activeAID);
-	User::WaitForRequest(aReqStatus);
-	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.5"));
-	TESTL(activeAID.Compare(_L8("App1")) == 0);
-	TESTL(count == 3);
-	
-	iPhone.EnumerateUSimApplications(aReqStatus, count, activeAID);
-	User::WaitForRequest(aReqStatus);
-	TESTL(aReqStatus.Int() == KErrNone);
-	TESTL(activeAID.Compare(_L8("App1"))==0);
-	TESTL(count == 3);
-
-	RMobilePhone::TUSimSelectionMode selectionMode;
-	INFO_PRINTF1(_L("GetUSimAppsSelectionMode test"));
-	ret = iPhone.GetUSimAppsSelectionMode(selectionMode); 
-	CHECKPOINTL(ret, KErrNone, CHP_APPS_CASE("P.6"));
-
-	TESTL(selectionMode == RMobilePhone::EUSimSelectionAutomatic);
-	
-	INFO_PRINTF1(_L("NotifyUSimAppsSelectionModeChange test"));
-	iPhone.NotifyUSimAppsSelectionModeChange(aReqStatus, selectionMode);
-	INFO_PRINTF1(_L("SetUSimAppsSelectionMode test"));
-	ret=iPhone.SetUSimAppsSelectionMode(RMobilePhone::EUSimSelectionManual);
-	CHECKPOINTL(ret, KErrNone, CHP_APPS_CASE("P.7"));
-	User::WaitForRequest(aReqStatus);
-	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.8"));
-	TESTL(selectionMode == RMobilePhone::EUSimSelectionManual);
-
-	iPhone.SetUSimApplicationStatus(aReqStatus, _L8("App2"), RMobilePhone::EUSimActivate);
-	User::WaitForRequest(aReqStatus);
-	
-	RMobilePhone::TSmartCardApplicationEvent event;
-	RMobilePhone::TAID smartCardAppID;
-	iPhone.NotifySmartCardApplicationInfoChange(stat1, smartCardAppID, event);
-	
-	iPhone.NotifyUSimApplicationsInfoChange(aReqStatus, count, activeAID);
-	iPhone.SetUSimApplicationStatus(stat0, _L8("App2"), RMobilePhone::EUSimTerminate);
-	User::WaitForRequest(stat0);
-	User::WaitForRequest(stat1);
-	User::WaitForRequest(aReqStatus);
-
-	CHECKPOINTL(stat0, KErrNone, CHP_APPS_CASE("P.9"));
-	CHECKPOINTL(stat1, KErrNone, CHP_APPS_CASE("P.10"));
-	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.11"));
-
-	iPhone.SetUSimApplicationStatus(stat0, _L8("App5"), RMobilePhone::EUSimTerminate);
-	User::WaitForRequest(stat0);
-	CHECKPOINTL(stat0, KErrNotFound, CHP_APPS_CASE("P.12"));
-	
-	iPhone.Close();
-	ASSERT(RThread().RequestCount()==0);
-
-	return TestStepResult();
-	}
-
+// Copyright (c) 2005-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:
+//
+
+#include "Te_SimPhBkSmartCardUSimTest.h"
+
+#include "../../inc/utils.h"
+
+CSimPhBkSmartCardUSimTest::CSimPhBkSmartCardUSimTest() 
+	{ 
+	SetTestStepName(_L("SmartCardUSimTest"));
+	}
+
+TVerdict CSimPhBkSmartCardUSimTest::doTestStepL()
+	{
+	INFO_PRINTF1(_L("BeginPhBkSmartCardUSimTest"));
+
+ 	CreateConfigFileL(_L("c:\\config3.txt"));
+ 	SetTestNumberL(11);
+
+	RMobilePhone::TAID activeAID;
+	TInt count;
+	TRequestStatus aReqStatus,stat0,stat1;
+
+	TInt ret = iPhone.Open(iTelServer,KPhoneName); 
+	INFO_PRINTF2(_L("Result: %d"),ret);
+	TESTL(ret == KErrNone); 
+	INFO_PRINTF1(_L("Opened phone object"));
+
+	INFO_PRINTF1(_L("EnumerateUSimApplications test"));
+
+	iPhone.EnumerateUSimApplications(aReqStatus, count, activeAID);
+	User::WaitForRequest(aReqStatus);
+	TESTL(activeAID.Compare(_L8("App2"))==0);
+	TESTL(count == 3);
+	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.1"));
+
+	//Test GetUSimApplicationInfo
+	RMobilePhone::TUSimApplicationInfoV2 usimAppInfo;
+	RMobilePhone::TUSimApplicationInfoV2Pckg usimAppInfoPckg(usimAppInfo);
+
+	TInt index=0;
+
+	INFO_PRINTF1(_L("GetUSimApplicationInfo test"));
+
+	iPhone.GetUSimApplicationInfo(aReqStatus, index, usimAppInfoPckg);
+	User::WaitForRequest(aReqStatus);
+	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.2"));
+	TESTL(usimAppInfo.iAID.Compare(_L8("App2")) == KErrNone);
+	TESTL(usimAppInfo.iLabel.Compare(_L8("PhoneApp2")) == KErrNone);
+
+	index=5;
+	iPhone.GetUSimApplicationInfo(aReqStatus, index, usimAppInfoPckg);
+	User::WaitForRequest(aReqStatus);
+	CHECKPOINT_EXL(aReqStatus==KErrNotFound, CHP_APPS_CASE("P.3"));
+	TESTL(usimAppInfo.iAID.Compare(_L8("App2")) == KErrNone);
+	TESTL(usimAppInfo.iLabel.Compare(_L8("PhoneApp2")) == KErrNone);
+
+	INFO_PRINTF1(_L("NotifyUSimApplicationsInfoChange test"));
+	count = 0;	// Set count to some value different to that of the number of Apps.
+	iPhone.NotifyUSimApplicationsInfoChange(aReqStatus, count, activeAID);
+	User::WaitForRequest(aReqStatus);
+	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.4"));
+	TESTL(activeAID.Compare(_L8("")) == 0);
+	TESTL(count == 3);
+	
+	count = 0;	// Set count to some value different to that of the number of Apps.
+	iPhone.NotifyUSimApplicationsInfoChange(aReqStatus, count, activeAID);
+	User::WaitForRequest(aReqStatus);
+	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.5"));
+	TESTL(activeAID.Compare(_L8("App1")) == 0);
+	TESTL(count == 3);
+	
+	iPhone.EnumerateUSimApplications(aReqStatus, count, activeAID);
+	User::WaitForRequest(aReqStatus);
+	TESTL(aReqStatus.Int() == KErrNone);
+	TESTL(activeAID.Compare(_L8("App1"))==0);
+	TESTL(count == 3);
+
+	RMobilePhone::TUSimSelectionMode selectionMode;
+	INFO_PRINTF1(_L("GetUSimAppsSelectionMode test"));
+	ret = iPhone.GetUSimAppsSelectionMode(selectionMode); 
+	CHECKPOINTL(ret, KErrNone, CHP_APPS_CASE("P.6"));
+
+	TESTL(selectionMode == RMobilePhone::EUSimSelectionAutomatic);
+	
+	INFO_PRINTF1(_L("NotifyUSimAppsSelectionModeChange test"));
+	iPhone.NotifyUSimAppsSelectionModeChange(aReqStatus, selectionMode);
+	INFO_PRINTF1(_L("SetUSimAppsSelectionMode test"));
+	ret=iPhone.SetUSimAppsSelectionMode(RMobilePhone::EUSimSelectionManual);
+	CHECKPOINTL(ret, KErrNone, CHP_APPS_CASE("P.7"));
+	User::WaitForRequest(aReqStatus);
+	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.8"));
+	TESTL(selectionMode == RMobilePhone::EUSimSelectionManual);
+
+	iPhone.SetUSimApplicationStatus(aReqStatus, _L8("App2"), RMobilePhone::EUSimActivate);
+	User::WaitForRequest(aReqStatus);
+	
+	RMobilePhone::TSmartCardApplicationEvent event;
+	RMobilePhone::TAID smartCardAppID;
+	iPhone.NotifySmartCardApplicationInfoChange(stat1, smartCardAppID, event);
+	
+	iPhone.NotifyUSimApplicationsInfoChange(aReqStatus, count, activeAID);
+	iPhone.SetUSimApplicationStatus(stat0, _L8("App2"), RMobilePhone::EUSimTerminate);
+	User::WaitForRequest(stat0);
+	User::WaitForRequest(stat1);
+	User::WaitForRequest(aReqStatus);
+
+	CHECKPOINTL(stat0, KErrNone, CHP_APPS_CASE("P.9"));
+	CHECKPOINTL(stat1, KErrNone, CHP_APPS_CASE("P.10"));
+	CHECKPOINTL(aReqStatus, KErrNone, CHP_APPS_CASE("P.11"));
+
+	iPhone.SetUSimApplicationStatus(stat0, _L8("App5"), RMobilePhone::EUSimTerminate);
+	User::WaitForRequest(stat0);
+	CHECKPOINTL(stat0, KErrNotFound, CHP_APPS_CASE("P.12"));
+	
+	iPhone.Close();
+	ASSERT(RThread().RequestCount()==0);
+
+	return TestStepResult();
+	}
+