diff -r 5315654608de -r 08c6ee43b396 idlehomescreen/widgetmanager/tsrc/wmunittest/conf/ui_wmunittest.cfg
--- a/idlehomescreen/widgetmanager/tsrc/wmunittest/conf/ui_wmunittest.cfg	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/widgetmanager/tsrc/wmunittest/conf/ui_wmunittest.cfg	Mon Jan 18 20:10:36 2010 +0200
@@ -607,7 +607,7 @@
 delete test
 [Endtest] 
 
-// Tests malformed icon string
+// Tests malformed icon string formats
 [Test]
 title malformed image formats
 create wmunittest test
@@ -625,19 +625,23 @@
 test ImageConverterWaitResult FAIL
 test ImageConverterConvert "c:/testframework/wmunittest/wmlogo/logo.jpg"
 test ImageConverterWaitResult FAIL
-test ImageConverterConvert "skin (0x10005a26 0x1000 )"
+test ImageConverterConvert "skin[0x10005a26 0x1000]"
+test ImageConverterWaitResult FAIL
+test ImageConverterConvert "skin(0x10005a26)"
 test ImageConverterWaitResult FAIL
-test ImageConverterConvert "mif ( c:\testframework\wmunittest\wmlogo\logo.mif 16384 16385)"
+test ImageConverterConvert "mif(c:\testframework\wmunittest\wmlogo\logo.mif)"
 test ImageConverterWaitResult FAIL
-test ImageConverterConvert "skin( 0x100056c6 0x86 ):mif ( c:\testframework\wmunittest\wmlogo\logo.mif 16384 16385 )"
+test ImageConverterConvert "mif(c:\testframework\wmunittest\wmlogo\logo.mif XXX YYY)"
 test ImageConverterWaitResult FAIL
-test ImageConverterConvert "skin ( 0x101f84b7 0x1000594D ) : mif ( c:\testframework\wmunittest\wmlogo\logo.mif 16384 16385 )"
+test ImageConverterConvert "mif  ( 16384 16385)"
 test ImageConverterWaitResult FAIL
-test ImageConverterConvert " uid(0x10005901 )"
+test ImageConverterConvert "skin( 0x100056c6 0x86 ):mif ( c:\testframework\wmunittest\wmlogo\logo.mif )"
 test ImageConverterWaitResult FAIL
-test ImageConverterConvert "uid (268458241  )"
+test ImageConverterConvert "    uid(0x10005901)"
 test ImageConverterWaitResult FAIL
-test ImageConverterConvert "uid (0x10005901)"
+test ImageConverterConvert "uidaan(0x10005901)"
+test ImageConverterWaitResult FAIL
+test ImageConverterConvert "uid (%%%)"
 test ImageConverterWaitResult FAIL
 test ImageConverterDelete
 test HeapCheck
@@ -645,16 +649,31 @@
 [Endtest] 
 
 
-// Tests image converter with skin syntax
-// this test will never pass on STIF because STIF AppUI does
+// the SKIN test will never pass on STIF because STIF AppUI does
 // not have EAknEnableSkin flag defined in its BaseConstructL
 // therefore commented out.
+
 /*
+// Tests image converter with skin syntax
 [Test]
 title Image converter skin
 create wmunittest test
 test HeapSet
 test ImageConverterCreate
+test ImageConverterConvert "skin(270501603 4145)"
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod ESkinIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter with skin syntax (hex)
+[Test]
+title Image converter skin (hex)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
 test ImageConverterConvert "skin(0x101F86E3 0x100d)"
 test ImageConverterWaitResult OK
 test ImageConverterConversionMethod ESkinIcon
@@ -662,6 +681,20 @@
 test HeapCheck
 delete test
 [Endtest]
+
+// Tests image converter with skin syntax (padded with spaces)
+[Test]
+title Image converter skin (padded)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "skin ( 270501603 4145 ) "
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod ESkinIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
 */
 
 // Tests image converter skin method with null skin item ids
@@ -691,6 +724,34 @@
 delete test
 [Endtest] 
 
+// Tests image converter with skin/mif syntax (hex)
+[Test]
+title Image converter skin/mif (hex)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "skin(0x101F86E3 0x1031):mif(c:\testframework\wmunittest\wmlogo\logo.mif 0x4000 0x4001)"
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod ESkinAndMifIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest] 
+
+// Tests image converter with skin/mif syntax (padded with spaces)
+[Test]
+title Image converter skin/mif (padded)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "skin (  0x101F86E3 0x1031  ) :mif ( c:\testframework\wmunittest\wmlogo\logo.mif   0x4000  0x4001 ) "
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod ESkinAndMifIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest] 
+
 // Tests image converter mif method
 [Test]
 title Image converter mif
@@ -705,6 +766,49 @@
 delete test
 [Endtest]
 
+// Tests image converter mif method, mask missing
+[Test]
+title Image converter mif (no mask)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "mif(c:\testframework\wmunittest\wmlogo\logo.mif 16384)"
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod EMifIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter mif method (hex)
+[Test]
+title Image converter mif (hex)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "mif(c:\testframework\wmunittest\wmlogo\logo.mif 0x4000 0x4001)"
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod EMifIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter mif method (padded with spaces)
+[Test]
+title Image converter mif (padded)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "mif (  c:\testframework\wmunittest\wmlogo\logo.mif  16384  16385  ) "
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod EMifIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+
 // Tests image converter mif method with invalid path
 [Test]
 title Image converter mif (invalid path)
@@ -737,6 +841,20 @@
 create wmunittest test
 test HeapSet
 test ImageConverterCreate
+test ImageConverterConvert "uid(268458241)"
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod EUidIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter uid method (hex)
+[Test]
+title Image converter uid (hex)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
 test ImageConverterConvert "uid(0x10005901)"
 test ImageConverterWaitResult OK
 test ImageConverterConversionMethod EUidIcon
@@ -745,6 +863,20 @@
 delete test
 [Endtest]
 
+// Tests image converter uid method (padded with spaces)
+[Test]
+title Image converter uid (padded)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "uid (  0x10005901  ) "
+test ImageConverterWaitResult OK
+test ImageConverterConversionMethod EUidIcon
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
 // Tests image converter uid method with null uid
 [Test]
 title Image converter uid (null)
@@ -856,15 +988,67 @@
 delete test
 [Endtest]
 
-// Tests image converter cancel
+
+
+// Tests image converter cancel when idle
+[Test]
+title Image converter cancel (idle)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test CancelConvert
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter cancel (mif conversion)
 [Test]
-title Image converter cancel
+title Image converter cancel (mif)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "mif(c:\testframework\wmunittest\wmlogo\logo.mif 16384 16385)"
+test CancelConvert
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter cancel (uid conversion)
+[Test]
+title Image converter cancel (uid)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "uid(268458241)"
+test CancelConvert
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter cancel (svg conversion)
+[Test]
+title Image converter cancel (svg)
 create wmunittest test
 test HeapSet
 test ImageConverterCreate
 test ImageConverterConvert "c:\testframework\wmunittest\wmlogo\logo.svg"
 test CancelConvert
-test ImageConverterWaitResult FAIL
+test ImageConverterDelete
+test HeapCheck
+delete test
+[Endtest]
+
+// Tests image converter cancel (jpg conversion)
+[Test]
+title Image converter cancel (jpg)
+create wmunittest test
+test HeapSet
+test ImageConverterCreate
+test ImageConverterConvert "c:\testframework\wmunittest\wmlogo\logo.jpg"
+test CancelConvert
 test ImageConverterDelete
 test HeapCheck
 delete test