Sorted the issues with vCard tests and made sure they worked.
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.pl Wed Sep 09 16:20:04 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.pl Thu Sep 10 09:52:12 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/";
@@ -99,7 +100,7 @@
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.vcs", "temp/phonebooktest/general/bcardtest2/basic03.vcs");
+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");
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml Wed Sep 09 16:20:04 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml Thu Sep 10 09:52:12 2009 +0100
@@ -871,34 +871,34 @@
<param type="data"/>
<param src="bcardtest2\basic02.src"/>
<param dst="c:\bcardtest2\basic02.src"/>
- <param component-path="bcardtest2" />
+ <param component-path="phonebooktest" />
</params>
</step>
- <step id="" name="basic03.vcs (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <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.vcs"/>
- <param dst="c:\bcardtest2\basic03.vcs"/>
- <param component-path="bcardtest2" />
+ <param src="bcardtest2\basic03.vcf"/>
+ <param dst="c:\bcardtest2\basic03.vcf"/>
+ <param component-path="phonebooktest" />
</params>
</step>
- <step id="" name="basicc01.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <step id="" name="basiccc01.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
<command>install</command>
<params>
<param type="data"/>
- <param src="bcardtest2\basicc01.ccf"/>
- <param dst="c:\bcardtest2\basicc01.ccf"/>
- <param component-path="bcardtest2" />
+ <param src="bcardtest2\basiccc01.ccf"/>
+ <param dst="c:\bcardtest2\basiccc01.ccf"/>
+ <param component-path="phonebooktest" />
</params>
</step>
- <step id="" name="basicc02.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <step id="" name="basiccc02.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
<command>install</command>
<params>
<param type="data"/>
- <param src="bcardtest2\basicc02.ccf"/>
- <param dst="c:\bcardtest2\basicc02.ccf"/>
- <param component-path="bcardtest2" />
+ <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">
@@ -907,7 +907,7 @@
<param type="data"/>
<param src="bcardtest2\basiccompactmaxsize.ccf"/>
<param dst="c:\bcardtest2\basiccompactmaxsize.ccf"/>
- <param component-path="bcardtest2" />
+ <param component-path="phonebooktest" />
</params>
</step>
<step id="" name="basiccompactnobusiness.ccf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
@@ -916,7 +916,7 @@
<param type="data"/>
<param src="bcardtest2\basiccompactnobusiness.ccf"/>
<param dst="c:\bcardtest2\basiccompactnobusiness.ccf"/>
- <param component-path="bcardtest2" />
+ <param component-path="phonebooktest" />
</params>
</step>
<step id="" name="dummy.vcf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
@@ -925,7 +925,7 @@
<param type="data"/>
<param src="bcardtest2\dummy.vcf"/>
<param dst="c:\bcardtest2\dummy.vcf"/>
- <param component-path="bcardtest2" />
+ <param component-path="phonebooktest" />
</params>
</step>
<step id="" name="johnpic.gif (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
@@ -934,7 +934,7 @@
<param type="data"/>
<param src="bcardtest2\johnpic.gif"/>
<param dst="c:\bcardtest2\johnpic.gif"/>
- <param component-path="bcardtest2" />
+ <param component-path="phonebooktest" />
</params>
</step>
<step id="" name="picture2.vcf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
@@ -943,7 +943,7 @@
<param type="data"/>
<param src="bcardtest2\picture2.vcf"/>
<param dst="c:\bcardtest2\picture2.vcf"/>
- <param component-path="bcardtest2" />
+ <param component-path="phonebooktest" />
</params>
</step>
<step id="" name="testframework_pbkvcardimportexport.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
@@ -1065,9 +1065,9 @@
<file>phonebooktest/winscw_udeb/bctestpbkvcardimportexport.dll</file>
<file>phonebooktest/general/bcardtest2/basic02.src</file>
- <file>phonebooktest/general/bcardtest2/basic03.vcs</file>
- <file>phonebooktest/general/bcardtest2/basicc01.ccf</file>
- <file>phonebooktest/general/bcardtest2/basicc02.ccf</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>