# HG changeset patch
# User Chetan Kapoor <chetank@symbian.org>
# Date 1283264918 -3600
# Node ID 3df3f73a7802a21ca5c14c85395b105a49dee76d
# Parent  485d259b2da89c5fb6c9283cbdb8535c2eb479a4# Parent  dbae6d7aeb5286d8428f3132b01e20b680f3e351
Merge He 9 Fix

diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/cellularsrv/smsutilities/smsutilities.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/cellularsrv/smsutilities/smsutilities.pl	Tue Aug 31 15:28:38 2010 +0100
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for SMS Utilities BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "smsutilitiestest.zip";
+rmtree "temp";
+mkpath "temp/smsutilitiestest/general/TestFramework";
+mkpath "temp/smsutilitiestest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("smsutilities.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/BCSmsUtilitiesTest.dll",		"temp/smsutilitiestest/winscw_udeb/BCSmsUtilitiesTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/TestFramework/testframework_su.ini",		"temp/smsutilitiestest/general/TestFramework/testframework_su.ini") or die "failed : $!";
+
+system("7z a -tzip smsutilitiestest.zip ./temp/*");
\ No newline at end of file
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/cellularsrv/smsutilities/smsutilities.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/cellularsrv/smsutilities/smsutilities.xml	Tue Aug 31 15:28:38 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<postAction>
+		<type>FileStoreAction</type>
+		<params>
+			<param name="report-type" value="ATS3_REPORT"/>
+		</params>
+    </postAction>
+	<name>SMS Utilities BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
+        </device>
+	</target>
+	<plan id="" name="SMS Utilities BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="SMS Utilities Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+            <set id="" name="CellSrv_SMSGSMUtilities" harness="ATSINTERFACE" enabled="true" passrate="100">
+                <case id="" name="CellSrv_SMSGSMUtilities" harness="ATSINTERFACE" enabled="true" passrate="100">
+                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+                        <command>makedir</command>
+                        <params>
+                            <param dir="c:\spd_logs\xml" /> 
+                        </params>
+                    </step>
+                    <step id="" name="BCSmsUtilitiesTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="BCSmsUtilitiesTest.dll"/>
+							<param dst="c:\sys\bin\BCSmsUtilitiesTest.dll"/>
+							<param component-path="smsutilitiestest" />
+						</params>
+					</step>
+					<step id="" name="TestFramwork_su.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="TestFramework\testframework_su.ini"/>
+							<param dst="c:\TestFramework\testframework_su.ini"/>
+							<param component-path="smsutilitiestest" />
+						</params>
+					</step>
+					<step id="" name="BCSmsUtilitiesTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule BCSmsUtilitiesTest"/>
+                            <param result-file="c:\spd_logs\xml\BCSmsUtilitiesTest.xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="BCSmsUtilitiesTest (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+                </case>
+			</set>			
+		</session>
+	</plan>
+	<files>
+		<file>smsutilitiestest/winscw_udeb/BCSmsUtilitiesTest.dll</file>
+		<file>smsutilitiestest/general/TestFramework/testframework_su.ini</file>
+	</files>
+</test>
\ No newline at end of file
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/connpref/connpref.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connpref/connpref.pl	Tue Aug 31 15:28:38 2010 +0100
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Extended Connection Pref BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "connpreftest.zip";
+rmtree "temp";
+mkpath "temp/connpreftest/general/testframework";
+mkpath "temp/connpreftest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("connpref.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/econnprefbc.dll",					"temp/connpreftest/winscw_udeb/econnprefbc.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_connpref.ini",	"temp/connpreftest/general/testframework/testframework_connpref.ini") or die "failed : $!";
+
+system("7z a -tzip connpreftest.zip ./temp/*");
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/connpref/connpref.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connpref/connpref.xml	Tue Aug 31 15:28:38 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<postAction>
+		<type>FileStoreAction</type>
+		<params>
+			<param name="report-type" value="ATS3_REPORT"/>
+		</params>
+    </postAction>
+	<name>Extended Connection Pref BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
+        </device>
+	</target>
+	<plan id="" name="Extended Connection Pref BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Extended Connection Pref Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="extended_connpref_api" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="extended_connpref_api" harness="ATSINTERFACE" enabled="true" passrate="100">
+                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+                        <command>makedir</command>
+                        <params>
+                            <param dir="c:\spd_logs\xml" /> 
+                        </params>
+                    </step>
+                    <step id="" name="econnprefbc.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="econnprefbc.dll"/>
+							<param dst="c:\sys\bin\econnprefbc.dll"/>
+							<param component-path="connpreftest" />
+						</params>
+					</step>
+					<step id="" name="testframework_connpref.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_connpref.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="connpreftest" />
+						</params>
+					</step>
+					<step id="" name="econnprefbc (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule econnprefbc"/>
+							<param result-file="c:\spd_logs\xml\econnprefbc.xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="econnprefbc (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>connpreftest/winscw_udeb/econnprefbc.dll</file>
+		<file>connpreftest/general/testframework/testframework_connpref.ini</file>
+	</files>
+</test>
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/locationsrv/loctriggering/loctriggering.xml
--- a/common/tools/ats/bctest/locationsrv/loctriggering/loctriggering.xml	Thu Aug 26 12:45:10 2010 +0100
+++ b/common/tools/ats/bctest/locationsrv/loctriggering/loctriggering.xml	Tue Aug 31 15:28:38 2010 +0100
@@ -14,6 +14,7 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
         </device>
 	</target>
 	<plan id="" name="Location Triggering BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/metadatasrv/metadatasrv.xml
--- a/common/tools/ats/bctest/metadatasrv/metadatasrv.xml	Thu Aug 26 12:45:10 2010 +0100
+++ b/common/tools/ats/bctest/metadatasrv/metadatasrv.xml	Tue Aug 31 15:28:38 2010 +0100
@@ -14,6 +14,7 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
         </device>
 	</target>
 	<plan id="" name="Metadata Services BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -69,7 +70,7 @@
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcBCTestContentManagement.cfg"/>
+							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcBCTestContentManagement.cfg -engineini C:\TestFramework\TestFramework.ini"/>
 							<param result-file="c:\spd_logs\xml\testcombiner.xml"/>
                             <param timeout="3600"/>
 						</params>
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/systemsw/cenrepnotifyhandler.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/systemsw/cenrepnotifyhandler.pl	Tue Aug 31 15:28:38 2010 +0100
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Louis Henry Nayegon <louisn@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for (SystemSW) Central Repository Notification Handler tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "cenrepnotifyhandlertest.zip";
+rmtree "temp";
+mkpath "temp/cenrepnotifyhandlertest/winscw_udeb";
+mkpath "temp/cenrepnotifyhandlertest/general/TestFramework";
+mkpath "temp/cenrepnotifyhandlertest/general/10202be9";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("cenrepnotifyhandler.xml",	"temp/test.xml");
+
+
+copy($epoc . "release/winscw/udeb/CenRepNotifyHandlerTest.dll",	"temp/cenrepnotifyhandlertest/winscw_udeb/CenRepNotifyHandlerTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/TestFramework/TestFramework_cenrep.ini",	"temp/cenrepnotifyhandlertest/general/TestFramework/TestFramework_cenrep.ini") or die "failed : $!";
+copy($epoc . "winscw/c/6edcba99.txt",							"temp/cenrepnotifyhandlertest/general/10202be9/6edcba99.txt") or die "failed : $!";
+
+system("7z a -tzip cenrepnotifyhandlertest.zip ./temp/*");
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/systemsw/cenrepnotifyhandler.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/systemsw/cenrepnotifyhandler.xml	Tue Aug 31 15:28:38 2010 +0100
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<postAction>
+		<type>FileStoreAction</type>
+		<params>
+			<param name="report-type" value="ATS3_REPORT"/>
+            <property name="TYPE" value="WINSCW" />
+		</params>
+    </postAction>
+	<name>Central Repository Notification Handler BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Central Repository Notification Handler BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Central Repository Notification Handler Binary Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="Central Repository Notification Handler API" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="central_repository_notification_handler_api" harness="ATSINTERFACE" enabled="true" passrate="100">
+                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+                        <command>makedir</command>
+                        <params>
+                            <param dir="c:\spd_logs\xml" /> 
+                        </params>
+                    </step>
+                    <step id="" name="cenrepnotifyhandlertest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="cenrepnotifyhandlertest.dll"/>
+							<param dst="c:\sys\bin\cenrepnotifyhandlertest.dll"/>
+							<param component-path="cenrepnotifyhandlertest" />
+						</params>
+					</step>
+					<step id="" name="6edcba99.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="10202be9\6edcba99.txt"/>
+							<param dst="z:\private\10202be9\6edcba99.txt"/>
+							<param component-path="cenrepnotifyhandlertest" />
+						</params>
+					</step>
+					
+					<step id="" name="cenrepnotifyhandlertest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule cenrepnotifyhandlertest"/>
+                            <param result-file="c:\spd_logs\xml\cenrepnotifyhandlertest.xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="cenrepnotifyhandlertest (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>cenrepnotifyhandlertest/winscw_udeb/cenrepnotifyhandlertest.dll</file>
+		<file>cenrepnotifyhandlertest/general/testframework/testframework_cenrep.ini</file>
+		<file>cenrepnotifyhandlertest/general/10202be9/6edcba99.txt</file>
+	</files>
+</test>
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/systemsw/systemsw.pl
--- a/common/tools/ats/bctest/systemsw/systemsw.pl	Thu Aug 26 12:45:10 2010 +0100
+++ b/common/tools/ats/bctest/systemsw/systemsw.pl	Tue Aug 31 15:28:38 2010 +0100
@@ -29,7 +29,7 @@
 copy($epoc . "release/winscw/udeb/featuremanagertest.dll",		"temp/systemswtest/winscw_udeb/featuremanagertest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/finditemenginetest.dll",		"temp/systemswtest/winscw_udeb/finditemenginetest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/light.dll",					"temp/systemswtest/winscw_udeb/light.dll") or die "failed : $!";
--copy($epoc . "release/winscw/udeb/networkstatustest.dll",		"temp/systemswtest/winscw_udeb/networkstatustest.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/networkstatustest.dll",		"temp/systemswtest/winscw_udeb/networkstatustest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/phoneparsertest.dll",			"temp/systemswtest/winscw_udeb/phoneparsertest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/platformenvtest.dll",			"temp/systemswtest/winscw_udeb/platformenvtest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/powerstatetest.dll",			"temp/systemswtest/winscw_udeb/powerstatetest.dll") or die "failed : $!";
@@ -39,7 +39,5 @@
 ##copy($epoc . "release/winscw/udeb/vibractrltest.dll",			"temp/systemswtest/winscw_udeb/vibractrltest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/platformvertest.dll",			"temp/systemswtest/winscw_udeb/platformvertest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/accmonapibctests.dll",		"temp/systemswtest/winscw_udeb/accmonapibctests.dll") or die "failed : $!";
-#Added on 26 Aug 2010
-copy($epoc . "release/winscw/udeb/cenrepnotifyhandlertest.dll",	"temp/systemswtest/winscw_udeb/cenrepnotifyhandlertest.dll") or die "failed : $!";
 
 system("7z a -tzip systemswtest.zip ./temp/*");
diff -r 485d259b2da8 -r 3df3f73a7802 common/tools/ats/bctest/systemsw/systemsw.xml
--- a/common/tools/ats/bctest/systemsw/systemsw.xml	Thu Aug 26 12:45:10 2010 +0100
+++ b/common/tools/ats/bctest/systemsw/systemsw.xml	Tue Aug 31 15:28:38 2010 +0100
@@ -406,38 +406,6 @@
 						</params>
 					</step>
 				</case>
-				<case id="" name="Central Repository Notification Handler API" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
-                    <step id="" name="cenrepnotifyhandlertest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="cenrepnotifyhandlertest.dll"/>
-							<param dst="c:\sys\bin\cenrepnotifyhandlertest.dll"/>
-							<param component-path="systemswtest" />
-						</params>
-					</step>
-					<step id="" name="cenrepnotifyhandlertest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule cenrepnotifyhandlertest"/>
-                            <param result-file="c:\spd_logs\xml\cenrepnotifyhandlertest.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="cenrepnotifyhandlertest (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-				</case>
 			</set>
 		</session>
 	</plan>
@@ -454,6 +422,5 @@
 		<file>systemswtest/winscw_udeb/hwresmantest.dll</file>
 		<file>systemswtest/winscw_udeb/platformvertest.dll</file>
 		<file>systemswtest/winscw_udeb/accmonapibctests.dll</file>
-		<file>systemswtest/winscw_udeb/cenrepnotifyhandlertest.dll</file>
 	</files>
 </test>