--- a/imagehandling_plat/thumbnailmanager_api/tsrc/conf/ThumbnailManagerTest.cfg	Tue Feb 02 00:23:15 2010 +0200
+++ b/imagehandling_plat/thumbnailmanager_api/tsrc/conf/ThumbnailManagerTest.cfg	Fri Mar 19 09:35:30 2010 +0200
@@ -54,8 +54,6 @@
 // reaches the server, but doesn't have enough time to complete yet
 // (milliseconds)
 KClientServerDelay 150
-KClientServerDelay2 25
-KClientServerDelay3 10
 
 // From TDisplayMode: value for 24-bit display mode
 EColor16M 8
@@ -1858,14 +1856,12 @@
 pause KTenSecondDelay
 
 tn UpdatePathL 99999 \data\ThumbnailManagerTest\updated_path.bmp
-waittestclass tn
 
 pause KTenSecondDelay
 
 tn SetFlagsL EDoNotCreate
 tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg
 tn GetThumbnailL
-allownextresult KErrNotFound
 waittestclass tn
 tn DeleteSourceInstance
 
@@ -1938,7 +1934,7 @@
 tn GetThumbnailL
 tn DeleteSourceInstance
 
-pause KClientServerDelay2
+pause KClientServerDelay
 
 // The server should have the two thumbnail requests queued by now.
 // This should cancel the second one while letting the first one finish.
@@ -1972,22 +1968,25 @@
 tn DeleteThumbnails
 tn DeleteSourceInstance
 
-// First request with 100 priority
+// First request with 0 priority
 tn SetThumbnailSizeL 80 40
 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\WIDE_800x400.gif
-tn GetThumbnailL 0 100
+tn GetThumbnailL 0 0
 tn DeleteSourceInstance
 
+// Short delay to make sure the server starts processing this request
+pause KClientServerDelay
+
 // Second request with negative priority
 tn SetThumbnailSizeL 1 1
 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\TALL_400x800.bmp
-tn GetThumbnailL 0 -50
+tn GetThumbnailL 0 -10
 tn DeleteSourceInstance
 
 // Third request with positive priority
 tn SetThumbnailSizeL 40 30
 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\SVG_640x480.svg
-tn GetThumbnailL 0 50
+tn GetThumbnailL 0 10
 tn DeleteSourceInstance
 
 // First request should complete first, since the server started processing
@@ -1995,7 +1994,8 @@
 waittestclass tn
 tn CheckThumbnailL 80 40 EColor16M
 
-// The third request should finish next
+// The third request should finish next, since it had the highest priority of
+// the other tasks.
 waittestclass tn
 tn CheckThumbnailL 40 30 EColor16M
 
@@ -2044,27 +2044,31 @@
 tn GetThumbnailL 0 0
 tn DeleteSourceInstance
 
+// Short delay to make sure the server starts processing this request
+pause KClientServerDelay
+
 // Second request with negative priority
 tn SetThumbnailSizeL 1 1
 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\TALL_400x800.bmp
-tn GetThumbnailL 0 -50
+tn GetThumbnailL 0 -10
 tn DeleteSourceInstance
 
 // Third request with positive priority
 tn SetThumbnailSizeL 40 30
 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\SVG_640x480.svg
-tn GetThumbnailL 0 50
+tn GetThumbnailL 0 10
 tn DeleteSourceInstance
 
 // Change the priority of the third request to a low value
-tn ChangePreviousPriority -100
+tn ChangePreviousPriority -20
 
 // First request should complete first, since the server started processing
 // it before the other requests were done
 waittestclass tn
 tn CheckThumbnailL 80 40 EColor16M
 
-// The second request should finish next
+// The second request should finish next, since it had the highest priority of
+// the other tasks.
 waittestclass tn
 tn CheckThumbnailL 1 1 EColor16M
 
@@ -2118,14 +2122,15 @@
 
 pause KTenSecondDelay
 
-tn DeleteSourceInstance
-
-tn CreateSourceInstancePathL \data\ThumbnailManagerTest\camera.jpg
 tn SetFlagsL EDoNotCreate
 tn SetThumbnailEnumSizeL EImageGridThumbnailSize
 tn GetThumbnailL
 waittestclass tn
 tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M
+tn SetThumbnailEnumSizeL EImageListThumbnailSize
+tn GetThumbnailL
+waittestclass tn
+tn CheckThumbnailCenrepL EImageListThumbnailSize EColor16M
 tn SetThumbnailEnumSizeL EImageFullScreenThumbnailSize
 tn GetThumbnailL
 waittestclass tn