diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchers.script
--- a/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchers.script	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchers.script	Thu May 06 15:10:38 2010 +0100
@@ -1,168 +1,168 @@
-// Copyright (c) 2004-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:
-//
-
-// Before starting, make sure we have no left over processes from previous(crashed) tests
-RUN_PROGRAM 5 systemtest_killprocess TE_
-RUN_PROGRAM 5 systemtest_killprocess phbksyncsvrexe
-RUN_PROGRAM 5 systemtest_killprocess cntsrv
-
-RUN_SCRIPT z:\TestData\Scripts\TE_TelWatchers_setup.script
-
-LOAD_SUITE TE_TelWatchersInt
-LOAD_SUITE TE_TelWatchersUnit
-
-START_TESTCASE TEL-WATCHERS-NA-1001
-//!@SYMTestCaseID TEL-WATCHERS-NA-1001
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Tests call state change with publish and subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Tests call state change with publish and subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 180 TE_TelWatchersUnit TestCallStateChangesWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1001
-
-
-START_TESTCASE TEL-WATCHERS-NA-1002
-//!@SYMTestCaseID TEL-WATCHERS-NA-1002
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Tests battery charger changes with publish and subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Tests battery charger changes with publish and subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 180 TE_TelWatchersUnit TestBatteryChargerChangesWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1002
-
-
-START_TESTCASE TEL-WATCHERS-NA-1003
-//!@SYMTestCaseID TEL-WATCHERS-NA-1003
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Tests Network Availability Changes With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Tests Network Availability Changes With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 180 TE_TelWatchersUnit TestNetworkAvailabilityChangesWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1003
-
-
-START_TESTCASE TEL-WATCHERS-NA-1004
-//!@SYMTestCaseID TEL-WATCHERS-NA-1004
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Simulate CommDB Modem Change With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Simulate CommDB Modem Change With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 180 TE_TelWatchersUnit TestSimulteCommDBModemChangeWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1004
-
-
-START_TESTCASE TEL-WATCHERS-NA-1005
-//!@SYMTestCaseID TEL-WATCHERS-NA-1005
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Tests CommDB Change When Watchers are disabled with Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Tests CommDB Change When Watchers are disabled with Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 180 TE_TelWatchersUnit TestCommDBChangeWhenWatcherDisabledWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1005
-
-
-START_TESTCASE TEL-WATCHERS-NA-1006
-//!@SYMTestCaseID TEL-WATCHERS-NA-1006
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Retrieve Signal Strength With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Retrieve Signal Strength With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 360 TE_TelWatchersInt TestRetrieveSignalStrengthWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1006
-
-
-START_TESTCASE TEL-WATCHERS-NA-1007
-//!@SYMTestCaseID TEL-WATCHERS-NA-1007
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Retrieve Charger Status With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Retrieve Charger Status With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 360 TE_TelWatchersInt TestRetrieveChargerStatusWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1007
-
-
-START_TESTCASE TEL-WATCHERS-NA-1008
-//!@SYMTestCaseID TEL-WATCHERS-NA-1008
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Network Status With Publishand and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Network Status With Publishand and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 360 TE_TelWatchersInt TestNetworkStatusWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1008
-
-
-START_TESTCASE TEL-WATCHERS-NA-1009
-//!@SYMTestCaseID TEL-WATCHERS-NA-1009
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Outgoing Call Status With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Outgoing Call Status With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 360 TE_TelWatchersInt TestOutgoingCallStatusWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1009
-
-
-START_TESTCASE TEL-WATCHERS-NA-1010
-//!@SYMTestCaseID TEL-WATCHERS-NA-1010
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Incoming Call Status With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Incoming Call Status With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 360 TE_TelWatchersInt TestIncomingCallStatusWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1010
-
-
-START_TESTCASE TEL-WATCHERS-NA-1011
-//!@SYMTestCaseID TEL-WATCHERS-NA-1011
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Indicator KErrNotSupported Scenario With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Indicator KErrNotSupported Scenario With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 360 TE_TelWatchersInt TestIndicatorKErrNotSupportedScenarioWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1011
-
-
-START_TESTCASE TEL-WATCHERS-NA-1012
-//!@SYMTestCaseID TEL-WATCHERS-NA-1012
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc Test Indicator KErrEtelModemNotDetected Scenario With Publish and Subscribe
-//!@SYMTestPriority critical
-//!@SYMTestActions Test Indicator KErrEtelModemNotDetected Scenario With Publish and Subscribe
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 360 TE_TelWatchersInt TestIndicatorKErrEtelModemNotDetectedScenarioWithPublishSubscribe
-END_TESTCASE TEL-WATCHERS-NA-1012
-
+// Copyright (c) 2004-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:
+//
+
+// Before starting, make sure we have no left over processes from previous(crashed) tests
+RUN_PROGRAM 5 systemtest_killprocess TE_
+RUN_PROGRAM 5 systemtest_killprocess phbksyncsvrexe
+RUN_PROGRAM 5 systemtest_killprocess cntsrv
+
+RUN_SCRIPT z:\TestData\Scripts\TE_TelWatchers_setup.script
+
+LOAD_SUITE TE_TelWatchersInt
+LOAD_SUITE TE_TelWatchersUnit
+
+START_TESTCASE TEL-WATCHERS-NA-1001
+//!@SYMTestCaseID TEL-WATCHERS-NA-1001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests call state change with publish and subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Tests call state change with publish and subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 180 TE_TelWatchersUnit TestCallStateChangesWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1001
+
+
+START_TESTCASE TEL-WATCHERS-NA-1002
+//!@SYMTestCaseID TEL-WATCHERS-NA-1002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests battery charger changes with publish and subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Tests battery charger changes with publish and subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 180 TE_TelWatchersUnit TestBatteryChargerChangesWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1002
+
+
+START_TESTCASE TEL-WATCHERS-NA-1003
+//!@SYMTestCaseID TEL-WATCHERS-NA-1003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests Network Availability Changes With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Tests Network Availability Changes With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 180 TE_TelWatchersUnit TestNetworkAvailabilityChangesWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1003
+
+
+START_TESTCASE TEL-WATCHERS-NA-1004
+//!@SYMTestCaseID TEL-WATCHERS-NA-1004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Simulate CommDB Modem Change With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Simulate CommDB Modem Change With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 180 TE_TelWatchersUnit TestSimulteCommDBModemChangeWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1004
+
+
+START_TESTCASE TEL-WATCHERS-NA-1005
+//!@SYMTestCaseID TEL-WATCHERS-NA-1005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests CommDB Change When Watchers are disabled with Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Tests CommDB Change When Watchers are disabled with Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 180 TE_TelWatchersUnit TestCommDBChangeWhenWatcherDisabledWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1005
+
+
+START_TESTCASE TEL-WATCHERS-NA-1006
+//!@SYMTestCaseID TEL-WATCHERS-NA-1006
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Retrieve Signal Strength With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Retrieve Signal Strength With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 360 TE_TelWatchersInt TestRetrieveSignalStrengthWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1006
+
+
+START_TESTCASE TEL-WATCHERS-NA-1007
+//!@SYMTestCaseID TEL-WATCHERS-NA-1007
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Retrieve Charger Status With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Retrieve Charger Status With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 360 TE_TelWatchersInt TestRetrieveChargerStatusWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1007
+
+
+START_TESTCASE TEL-WATCHERS-NA-1008
+//!@SYMTestCaseID TEL-WATCHERS-NA-1008
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Network Status With Publishand and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Network Status With Publishand and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 360 TE_TelWatchersInt TestNetworkStatusWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1008
+
+
+START_TESTCASE TEL-WATCHERS-NA-1009
+//!@SYMTestCaseID TEL-WATCHERS-NA-1009
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Outgoing Call Status With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Outgoing Call Status With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 360 TE_TelWatchersInt TestOutgoingCallStatusWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1009
+
+
+START_TESTCASE TEL-WATCHERS-NA-1010
+//!@SYMTestCaseID TEL-WATCHERS-NA-1010
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Incoming Call Status With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Incoming Call Status With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 360 TE_TelWatchersInt TestIncomingCallStatusWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1010
+
+
+START_TESTCASE TEL-WATCHERS-NA-1011
+//!@SYMTestCaseID TEL-WATCHERS-NA-1011
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Indicator KErrNotSupported Scenario With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Indicator KErrNotSupported Scenario With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 360 TE_TelWatchersInt TestIndicatorKErrNotSupportedScenarioWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1011
+
+
+START_TESTCASE TEL-WATCHERS-NA-1012
+//!@SYMTestCaseID TEL-WATCHERS-NA-1012
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Indicator KErrEtelModemNotDetected Scenario With Publish and Subscribe
+//!@SYMTestPriority critical
+//!@SYMTestActions Test Indicator KErrEtelModemNotDetected Scenario With Publish and Subscribe
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 360 TE_TelWatchersInt TestIndicatorKErrEtelModemNotDetectedScenarioWithPublishSubscribe
+END_TESTCASE TEL-WATCHERS-NA-1012
+