diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyserverplugins/simtsy/test/Te_Sim/Te_Sim.mmp
--- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_Sim.mmp	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_Sim.mmp	Thu May 06 15:10:38 2010 +0100
@@ -1,95 +1,95 @@
-// 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:
-//
-
-TARGET			te_sim.exe
-CAPABILITY		All -Tcb
-TARGETTYPE		EXE
-UID     		0x1000008d 0x1028191f
-VENDORID		0x70000001
-
-SOURCEPATH		.
-SOURCE			Te_SimTestServer.cpp
-SOURCE			Te_SimTestStepBase.cpp
-
-SOURCE			Te_SimAPNControlList.cpp
-SOURCE			Te_SimAPNControlListStatus.cpp
-SOURCE			Te_SimBatteryChargerTest.cpp
-SOURCE			Te_SimBasicVoiceTest.cpp
-SOURCE			Te_SimCallOOMTest.cpp
-SOURCE			Te_SimCallOpenTest.cpp
-SOURCE			Te_SimDtmfTest.cpp
-SOURCE			Te_SimEmergencyCallTest.cpp
-SOURCE			Te_SimGetSubscriberIdTest.cpp
-SOURCE			Te_SimIncomingDataTest.cpp
-SOURCE			Te_SimIndicatorTest.cpp
-SOURCE			Te_SimMiscTest.cpp
-SOURCE			Te_SimNetworkStatusTest.cpp
-SOURCE			Te_SimNitzTest.cpp
-SOURCE			Te_SimCellInfoTest.cpp
-SOURCE			Te_SimNoConfigFileTest.cpp
-SOURCE			Te_SimOutGoingDataTest.cpp
-SOURCE			Te_SimPacketAdditionalParamsTest.cpp
-SOURCE			Te_SimPacketContextTest.cpp
-SOURCE			Te_SimPacketCorruptedConfigFileTest.cpp
-SOURCE			Te_SimPacketFinalContextTest.cpp
-SOURCE			Te_SimPacketGPRSNotifyConfigChangeTest.cpp
-SOURCE			Te_SimPacketGPRSNotifyConfigCancelTest.cpp
-SOURCE			Te_SimPacketGPRSContextTest.cpp
-SOURCE			Te_SimPacketGPRSQOSTest.cpp
-SOURCE			Te_SimPacketGPRSRel99NotifyProfileChangeTest.cpp
-SOURCE			Te_SimPacketNotify2ThreadTest.cpp
-SOURCE			Te_SimPacketPenultimateContextTest.cpp
-SOURCE			Te_SimPacketNetworkNotifyConfigChangeTest.cpp
-SOURCE		  	Te_SimPacketQoS.cpp
-SOURCE			Te_SimPacketRel5ContextTest.cpp
-SOURCE			Te_SimPacketRel5QOSTest.cpp
-SOURCE			Te_SimPacketRel99ContextTest.cpp
-SOURCE			Te_SimPacketRel99QOSTest.cpp
-SOURCE			Te_SimPacketRel99Rel5QOSTest.cpp
-SOURCE			Te_SimPacketRel99Rel5QOSPubSubNotifTest.cpp
-SOURCE			Te_SimPacketTest.cpp
-SOURCE			Te_SimPhBkErrorOOBTest.cpp
-SOURCE			Te_SimPhBkLockInfoTest.cpp
-SOURCE			Te_SimPhBkPhoneSecurityTest.cpp
-SOURCE			Te_SimPhBkSecurityCapsTest.cpp
-SOURCE			Te_SimPhBkSmartCardTest.cpp
-SOURCE			Te_SimPhBkSmartCardUSimTest.cpp
-SOURCE			Te_SimPhBkStoreICCLockedTest.cpp
-SOURCE			Te_SimPhBkStoreTest.cpp
-SOURCE			Te_SimPhBkStoreUICCLockedTest.cpp
-SOURCE			Te_SimPhBkUSimAppsTest.cpp
-SOURCE			Te_SimPhBkUSimErrorOOBTest.cpp
-SOURCE			Te_SimPhBkUSimStoreTest.cpp
-SOURCE			Te_SimONStoreTest.cpp
-SOURCE			Te_SimSatTest.cpp
-SOURCE			Te_SimSignalStrengthTest.cpp
-SOURCE			Te_SimSmsListTest.cpp
-SOURCE          Te_SimSmsReceiveModesTest.cpp
-SOURCE			Te_SimSmsRxTest.cpp
-SOURCE			Te_SimSmsStoreTest.cpp
-SOURCE			Te_SimSmsTxTest.cpp
-SOURCE			Te_SimVoiceTest.cpp
-SOURCE			Te_SimUSimRel6Test.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE		.
-USERINCLUDE		../../inc
-
-LIBRARY			euser.lib etel.lib etelmm.lib etelpckt.lib
-LIBRARY			efsrv.lib c32.lib etelsat.lib c32root.lib
-LIBRARY			testexecuteutils.lib 
-LIBRARY			testexecutelogclient.lib testconfigfileparser.lib
-SMPSAFE
+// 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:
+//
+
+TARGET			te_sim.exe
+CAPABILITY		All -Tcb
+TARGETTYPE		EXE
+UID     		0x1000008d 0x1028191f
+VENDORID		0x70000001
+
+SOURCEPATH		.
+SOURCE			Te_SimTestServer.cpp
+SOURCE			Te_SimTestStepBase.cpp
+
+SOURCE			Te_SimAPNControlList.cpp
+SOURCE			Te_SimAPNControlListStatus.cpp
+SOURCE			Te_SimBatteryChargerTest.cpp
+SOURCE			Te_SimBasicVoiceTest.cpp
+SOURCE			Te_SimCallOOMTest.cpp
+SOURCE			Te_SimCallOpenTest.cpp
+SOURCE			Te_SimDtmfTest.cpp
+SOURCE			Te_SimEmergencyCallTest.cpp
+SOURCE			Te_SimGetSubscriberIdTest.cpp
+SOURCE			Te_SimIncomingDataTest.cpp
+SOURCE			Te_SimIndicatorTest.cpp
+SOURCE			Te_SimMiscTest.cpp
+SOURCE			Te_SimNetworkStatusTest.cpp
+SOURCE			Te_SimNitzTest.cpp
+SOURCE			Te_SimCellInfoTest.cpp
+SOURCE			Te_SimNoConfigFileTest.cpp
+SOURCE			Te_SimOutGoingDataTest.cpp
+SOURCE			Te_SimPacketAdditionalParamsTest.cpp
+SOURCE			Te_SimPacketContextTest.cpp
+SOURCE			Te_SimPacketCorruptedConfigFileTest.cpp
+SOURCE			Te_SimPacketFinalContextTest.cpp
+SOURCE			Te_SimPacketGPRSNotifyConfigChangeTest.cpp
+SOURCE			Te_SimPacketGPRSNotifyConfigCancelTest.cpp
+SOURCE			Te_SimPacketGPRSContextTest.cpp
+SOURCE			Te_SimPacketGPRSQOSTest.cpp
+SOURCE			Te_SimPacketGPRSRel99NotifyProfileChangeTest.cpp
+SOURCE			Te_SimPacketNotify2ThreadTest.cpp
+SOURCE			Te_SimPacketPenultimateContextTest.cpp
+SOURCE			Te_SimPacketNetworkNotifyConfigChangeTest.cpp
+SOURCE		  	Te_SimPacketQoS.cpp
+SOURCE			Te_SimPacketRel5ContextTest.cpp
+SOURCE			Te_SimPacketRel5QOSTest.cpp
+SOURCE			Te_SimPacketRel99ContextTest.cpp
+SOURCE			Te_SimPacketRel99QOSTest.cpp
+SOURCE			Te_SimPacketRel99Rel5QOSTest.cpp
+SOURCE			Te_SimPacketRel99Rel5QOSPubSubNotifTest.cpp
+SOURCE			Te_SimPacketTest.cpp
+SOURCE			Te_SimPhBkErrorOOBTest.cpp
+SOURCE			Te_SimPhBkLockInfoTest.cpp
+SOURCE			Te_SimPhBkPhoneSecurityTest.cpp
+SOURCE			Te_SimPhBkSecurityCapsTest.cpp
+SOURCE			Te_SimPhBkSmartCardTest.cpp
+SOURCE			Te_SimPhBkSmartCardUSimTest.cpp
+SOURCE			Te_SimPhBkStoreICCLockedTest.cpp
+SOURCE			Te_SimPhBkStoreTest.cpp
+SOURCE			Te_SimPhBkStoreUICCLockedTest.cpp
+SOURCE			Te_SimPhBkUSimAppsTest.cpp
+SOURCE			Te_SimPhBkUSimErrorOOBTest.cpp
+SOURCE			Te_SimPhBkUSimStoreTest.cpp
+SOURCE			Te_SimONStoreTest.cpp
+SOURCE			Te_SimSatTest.cpp
+SOURCE			Te_SimSignalStrengthTest.cpp
+SOURCE			Te_SimSmsListTest.cpp
+SOURCE          Te_SimSmsReceiveModesTest.cpp
+SOURCE			Te_SimSmsRxTest.cpp
+SOURCE			Te_SimSmsStoreTest.cpp
+SOURCE			Te_SimSmsTxTest.cpp
+SOURCE			Te_SimVoiceTest.cpp
+SOURCE			Te_SimUSimRel6Test.cpp
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+USERINCLUDE		.
+USERINCLUDE		../../inc
+
+LIBRARY			euser.lib etel.lib etelmm.lib etelpckt.lib
+LIBRARY			efsrv.lib c32.lib etelsat.lib c32root.lib
+LIBRARY			testexecuteutils.lib 
+LIBRARY			testexecutelogclient.lib testconfigfileparser.lib
+SMPSAFE