--- a/secureswitools/swisistools/test/tscrtool/tscrtool.ini	Fri Mar 19 09:33:35 2010 +0200
+++ b/secureswitools/swisistools/test/tscrtool/tscrtool.ini	Fri Apr 16 15:05:20 2010 +0300
@@ -139,14 +139,14 @@
 checkdbexists = %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\unicodescr.db
 result=ENone
 
-# preprovision application xml file does not have an attribute specified.
+# preprovision application xml file does not have an attribute specified for ComponentProperty.
 [sec/swi/scrtool/0023]
-option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_attribute_missing.xml
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_attribute_missing.xml
 result=EParseError
 
 # preprovision for handling conditions.
 [sec/swi/scrtool/0024]
-option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_coverage.xml
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_coverage.xml
 result=ENone
 
 # Usage of -f and -p together: positive test
@@ -159,7 +159,37 @@
 option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_doesnotexist.xml
 result=EFileNotPresent
 
-# Usage of -f and -p together: negative test - use nonexisting update_db XML XML
+# Usage of -f and -p together: negative test - use nonexisting update_db XML
 [sec/swi/scrtool/0027]
 option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_nonexisting.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_symbian.xml
 result=EFileNotPresent
+
+# Usage of -f and -p together: preprovision xml having registration information
+[sec/swi/scrtool/0028]
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_appreginfo.xml
+result=ENone
+
+# Usage of -f and -p together: preprovision xml having null app uid
+[sec/swi/scrtool/0029]
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_nullappuid.xml
+result=ESqlCorrupt
+
+# Usage of -f and -p together: preprovision xml with attribute missing for LocalizableInfo
+[sec/swi/scrtool/0030]
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_appregattribmissing.xml
+result=EParseError
+
+# Usage of -f and -p together: preprovision xml with no application attributes
+[sec/swi/scrtool/0031]
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_noappattrib.xml
+result=EParseError
+
+# Usage of -f and -p together: preprovision xml having null app file field
+[sec/swi/scrtool/0032]
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_nullappfile.xml
+result=ESqlCorrupt
+
+# Usage of -f and -p together: preprovision xml having no caption and icon info
+[sec/swi/scrtool/0033]
+option = -c create.db -f %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\update_db_test.xml -p %EPOCROOT%epoc32\winscw\c\tswi\tscrtool\data\preprovision_nocaptioniconinfo.xml
+result=ENone