# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1252572940 -3600
# Node ID ecc86630e337c81efbdeb20fca9cde6b8beef185
# Parent  3bbad6587f1b422dabade9a8dd44a755703b2af1# Parent  1c6fe66ca2d0d26698fcc56465a8a2ef7d2ad71a
merge

diff -r 1c6fe66ca2d0 -r ecc86630e337 common/tools/ats/bctest/contacts/phonebook/phonebook.pl
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.pl	Wed Sep 09 15:32:23 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.pl	Thu Sep 10 09:55:40 2009 +0100
@@ -22,6 +22,7 @@
 unlink "phonebooktest.zip";
 ##rmtree "temp";
 mkpath "temp/phonebooktest/general/testframework";
+mkpath "temp/phonebooktest/general/bcardtest2";
 mkpath "temp/phonebooktest/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
@@ -97,4 +98,18 @@
 copy($epoc . "winscw/c/testframework/tcbctestpbkuiutil.cfg",            "temp/phonebooktest/general/testframework/tcbctestpbkuiutil.cfg");
 copy($epoc . "winscw/c/testframework/ui_bctestpbkuiutil.cfg",           "temp/phonebooktest/general/testframework/ui_bctestpbkuiutil.cfg");
 
+copy($epoc . "release/winscw/udeb/bctestpbkvcardimportexport.dll",              "temp/phonebooktest/winscw_udeb/bctestpbkvcardimportexport.dll");
+copy($epoc . "winscw/c/bcardtest2/basic02.src",                                 "temp/phonebooktest/general/bcardtest2/basic02.src");
+copy($epoc . "winscw/c/bcardtest2/basic03.vcf",                                 "temp/phonebooktest/general/bcardtest2/basic03.vcf");
+copy($epoc . "winscw/c/bcardtest2/basiccc01.ccf",                               "temp/phonebooktest/general/bcardtest2/basiccc01.ccf");
+copy($epoc . "winscw/c/bcardtest2/basiccc02.ccf",                               "temp/phonebooktest/general/bcardtest2/basiccc02.ccf");
+copy($epoc . "winscw/c/bcardtest2/basiccompactmaxsize.ccf",                     "temp/phonebooktest/general/bcardtest2/basiccompactmaxsize.ccf");
+copy($epoc . "winscw/c/bcardtest2/basiccompactnobusiness.ccf",                  "temp/phonebooktest/general/bcardtest2/basiccompactnobusiness.ccf");
+copy($epoc . "winscw/c/bcardtest2/dummy.vcf",                                   "temp/phonebooktest/general/bcardtest2/dummy.vcf");
+copy($epoc . "winscw/c/bcardtest2/johnpic.gif",                                 "temp/phonebooktest/general/bcardtest2/johnpic.gif");
+copy($epoc . "winscw/c/bcardtest2/picture2.vcf",                                "temp/phonebooktest/general/bcardtest2/picture2.vcf");
+copy($epoc . "winscw/c/testframework/testframework_pbkvcardimportexport.ini",   "temp/phonebooktest/general/testframework/testframework_pbkvcardimportexport.ini");
+copy($epoc . "winscw/c/testframework/tcbctestpbkvcardimportexport.cfg",         "temp/phonebooktest/general/testframework/tcbctestpbkvcardimportexport.cfg");
+copy($epoc . "winscw/c/testframework/ui_bctestpbkvcardimportexport.cfg",        "temp/phonebooktest/general/testframework/ui_bctestpbkvcardimportexport.cfg");
+
 system("7z a -tzip phonebooktest.zip ./temp/*");
diff -r 1c6fe66ca2d0 -r ecc86630e337 common/tools/ats/bctest/contacts/phonebook/phonebook.xml
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Wed Sep 09 15:32:23 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Thu Sep 10 09:55:40 2009 +0100
@@ -787,7 +787,7 @@
 					</step>                
                 </case>
             </set>
-            <set id="" name="Phonebook UI Utilities" harness="ATSINTERFACE" enabled="true" passrate="100">
+            <set id="" name="Phonebook UI" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <case id="" name="Phonebook UI Utilities" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -848,6 +848,148 @@
 					</step>                
                 </case>
             </set>
+            <set id="" name="Phonebook VCard" harness="ATSINTERFACE" enabled="true" passrate="100">
+                <case id="" name="Phonebook VCard Import/Export" 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="bctestpbkvcardimportexport.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestpbkvcardimportexport.dll"/>
+							<param dst="c:\sys\bin\bctestpbkvcardimportexport.dll"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="basic02.src (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\basic02.src"/>
+							<param dst="c:\bcardtest2\basic02.src"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="basic03.vcf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\basic03.vcf"/>
+							<param dst="c:\bcardtest2\basic03.vcf"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="basiccc01.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\basiccc01.ccf"/>
+							<param dst="c:\bcardtest2\basiccc01.ccf"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="basiccc02.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\basiccc02.ccf"/>
+							<param dst="c:\bcardtest2\basiccc02.ccf"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="basiccompactmaxsize.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\basiccompactmaxsize.ccf"/>
+							<param dst="c:\bcardtest2\basiccompactmaxsize.ccf"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="basiccompactnobusiness.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\basiccompactnobusiness.ccf"/>
+							<param dst="c:\bcardtest2\basiccompactnobusiness.ccf"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="dummy.vcf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\dummy.vcf"/>
+							<param dst="c:\bcardtest2\dummy.vcf"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="johnpic.gif (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\johnpic.gif"/>
+							<param dst="c:\bcardtest2\johnpic.gif"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="picture2.vcf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="bcardtest2\picture2.vcf"/>
+							<param dst="c:\bcardtest2\picture2.vcf"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="testframework_pbkvcardimportexport.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\testframework_pbkvcardimportexport.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="tcbctestpbkvcardimportexport.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\tcbctestpbkvcardimportexport.cfg"/>
+							<param dst="c:\testframework\tcbctestpbkvcardimportexport.cfg"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="ui_bctestpbkvcardimportexport.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\ui_bctestpbkvcardimportexport.cfg"/>
+							<param dst="c:\testframework\ui_bctestpbkvcardimportexport.cfg"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="bctestpbkvcardimportexport (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkvcardimportexport.cfg"/>
+                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="bctestpbkvcardimportexport (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>
@@ -920,5 +1062,19 @@
 		<file>phonebooktest/general/testframework/testframework_pbkuiutil.ini</file>
         <file>phonebooktest/general/testframework/tcbctestpbkuiutil.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkuiutil.cfg</file>
+        
+		<file>phonebooktest/winscw_udeb/bctestpbkvcardimportexport.dll</file>
+		<file>phonebooktest/general/bcardtest2/basic02.src</file>
+		<file>phonebooktest/general/bcardtest2/basic03.vcf</file>
+		<file>phonebooktest/general/bcardtest2/basiccc01.ccf</file>
+		<file>phonebooktest/general/bcardtest2/basiccc02.ccf</file>
+        <file>phonebooktest/general/bcardtest2/basiccompactmaxsize.ccf</file>
+        <file>phonebooktest/general/bcardtest2/basiccompactnobusiness.ccf</file>
+        <file>phonebooktest/general/bcardtest2/dummy.vcf</file>
+        <file>phonebooktest/general/bcardtest2/johnpic.gif</file>
+        <file>phonebooktest/general/bcardtest2/picture2.vcf</file>
+		<file>phonebooktest/general/testframework/testframework_pbkvcardimportexport.ini</file>
+        <file>phonebooktest/general/testframework/tcbctestpbkvcardimportexport.cfg</file>
+        <file>phonebooktest/general/testframework/ui_bctestpbkvcardimportexport.cfg</file>
 	</files>
 </test>