diff -r ea43e3e86079 -r a0ee3f735f8b imagehandling_plat/thumbnailmanager_api/tsrc/conf/ThumbnailManagerTest.cfg --- a/imagehandling_plat/thumbnailmanager_api/tsrc/conf/ThumbnailManagerTest.cfg Tue Jun 15 14:30:57 2010 +0100 +++ b/imagehandling_plat/thumbnailmanager_api/tsrc/conf/ThumbnailManagerTest.cfg Thu Jul 22 16:37:07 2010 +0100 @@ -37,23 +37,26 @@ // --------------------------------------------------------------------------- [Define] -KErrNotFound -1 -KErrNotSupported -5 -KErrArgument -6 +KErrNotFound -1 +KErrGeneral -2 +KErrNotSupported -5 +KErrArgument -6 KMaxTInt 2147483647 // Delay between test cases (milliseconds) KTestDelay 1000 -KOneSecondDelay 1000 -KFiveSecondDelay 5000 -KTenSecondDelay 5000 +KOneSecondDelay 1000 +KFiveSecondDelay 5000 +KTenSecondDelay 10000 // A delay to make sure the client-server request to generate a thumbnail // reaches the server, but doesn't have enough time to complete yet // (milliseconds) -KClientServerDelay 150 +KClientServerDelay 150 +KClientServerDelay2 25 +KClientServerDelay3 10 // From TDisplayMode: value for 24-bit display mode EColor16M 8 @@ -81,7 +84,13 @@ EVideoFullScreenThumbnailSize 7 EAudioGridThumbnailSize 8 EAudioListThumbnailSize 9 -EAudioFullScreenThumbnailSize 10 +EAudioFullScreenThumbnailSize 10 +EContactGridThumbnailSize 11 +EContactListThumbnailSize 12 +EContactFullScreenThumbnailSize 13 +EGridThumbnailSize = 14 +EListThumbnailSize = 15 +EFullScreenThumbnailSize = 16 // Custom sizes KCustomSizeX 111 @@ -600,12 +609,128 @@ pause KTestDelay [Endtest] +// --------------------------------------------------------------------------- +// Create MP3 thumbnail with PNG album art +// --------------------------------------------------------------------------- +[Test] +title Create MP3 thumbnail with PNG album art +create ThumbnailManagerTest tn +tn CreateInstanceL +tn SetDisplayModeL EColor16M + +// using path +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\mp3_png.mp3 +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EImageGridThumbnailSize +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EImageFullScreenThumbnailSize +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageFullScreenThumbnailSize EColor16M +tn DeleteThumbnails +tn SetThumbnailEnumSizeL ECustomThumbnailSize +tn SetThumbnailSizeL KCustomSizeX KCustomSizeY +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailL KCustomSizeX KCustomSizeY EColor16M +tn DeleteThumbnails +tn DeleteSourceInstance + +tn DeleteInstance +delete tn +pause KTestDelay +[Endtest] // --------------------------------------------------------------------------- -// Thumbs from buffer +// Create thumbnail preview from JPG with EXIF // --------------------------------------------------------------------------- [Test] -title Thumbs from buffer +title Create thumbnail preview from JPG with EXIF +create ThumbnailManagerTest tn +tn CreateInstanceL +tn SetDisplayModeL EColor16M + +// jpg with exif +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EImageGridThumbnailSize +tn SetQualityPreferenceL EOptimizeForQualityWithPreview +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M +tn DeleteThumbnails +tn DeleteSourceInstance + +// png with exif +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\exif.png +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EImageGridThumbnailSize +tn SetQualityPreferenceL EOptimizeForQualityWithPreview +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M +tn DeleteThumbnails +tn DeleteSourceInstance + +// no exif +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\no_exif.jpg +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EImageGridThumbnailSize +tn SetQualityPreferenceL EOptimizeForQualityWithPreview +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M +tn DeleteThumbnails +tn DeleteSourceInstance + +tn DeleteInstance +delete tn +pause KTestDelay +[Endtest] + +// --------------------------------------------------------------------------- +// Create thumbnail from WMA PNG & empty album arts +// --------------------------------------------------------------------------- +[Test] +title Create thumbnail from WMA PNG & empty album arts +create ThumbnailManagerTest tn +tn CreateInstanceL +tn SetDisplayModeL EColor16M + +// try to create thumbnail from PNG +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\wma_png.wma +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EAudioFullScreenThumbnailSize +tn GetThumbnailL +allownextresult KErrNotFound +waittestclass tn +tn DeleteThumbnails +tn DeleteSourceInstance + +// try to create thumbnail without album art +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\wma_empty.wma +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EAudioFullScreenThumbnailSize +tn GetThumbnailL +allownextresult KErrNotFound +waittestclass tn +tn DeleteThumbnails +tn DeleteSourceInstance + +tn DeleteInstance +delete tn +pause KTestDelay +[Endtest] + + +// --------------------------------------------------------------------------- +// Create thumbs from buffer +// --------------------------------------------------------------------------- +[Test] +title Create thumbs from buffer create ThumbnailManagerTest tn tn CreateInstanceL tn SetDisplayModeL EColor16M @@ -696,6 +821,77 @@ [Endtest] // --------------------------------------------------------------------------- +// Create thumbs from CFbsBitmap +// --------------------------------------------------------------------------- +[Test] +title Create thumbs from CFbsBitmap +create ThumbnailManagerTest tn +tn CreateInstanceL +tn SetDisplayModeL EColor16M + +tn SetFlagsL EDefaultFlags +tn CreateSourceInstanceBitmapL \data\ThumbnailManagerTest\TestMBM.mbm \data\ThumbnailManagerTest\camera.jpg +tn DeleteThumbnails +tn CreateThumbnails +waittestclass tn + +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 EImageFullScreenThumbnailSize +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageFullScreenThumbnailSize EColor16M +tn DeleteThumbnails +tn DeleteSourceInstance + +tn DeleteInstance +delete tn +pause KTestDelay +[Endtest] + + +// --------------------------------------------------------------------------- +// Create image/audio/video thumbs +// --------------------------------------------------------------------------- +[Test] +title Create image/audio/video thumbs +create ThumbnailManagerTest tn +tn CreateInstanceL +tn SetDisplayModeL EColor16M + +// try to create thumbnail from image +tn CreateThumbnailsByUrlL \data\ThumbnailManagerTest\RGB_VGA.jpg +waittestclass tn +tn DeleteThumbnails +tn DeleteSourceInstance + +// try to create thumbnail from music +tn CreateThumbnailsByUrlL \data\ThumbnailManagerTest\mp3_png.mp3 +waittestclass tn +tn DeleteThumbnails +tn DeleteSourceInstance + +// try to create thumbnail from video +tn CreateThumbnailsByUrlL \data\ThumbnailManagerTest\Videoclip.mp4 +waittestclass tn +tn DeleteThumbnails +tn DeleteSourceInstance + +tn DeleteInstance +delete tn +pause KTestDelay +[Endtest] + + +// --------------------------------------------------------------------------- // Create thumbnails for each persistent size // --------------------------------------------------------------------------- [Test] @@ -829,80 +1025,6 @@ pause KTestDelay [Endtest] - -// --------------------------------------------------------------------------- -// Thumbnail from missing or unsupported file -// --------------------------------------------------------------------------- -[Test] -title Thumbnail from missing or unsupported file -create ThumbnailManagerTest tn -tn CreateInstanceL -tn SetThumbnailEnumSizeL ECustomThumbnailSize -tn SetThumbnailSizeL KCustomSizeX KCustomSizeY - -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\does_not_exist.jpg -tn GetThumbnailL -allownextresult KErrNotFound -waittestclass tn -tn DeleteSourceInstance - -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\Unsupported.txt -tn GetThumbnailL -allownextresult KErrNotSupported -waittestclass tn -tn DeleteSourceInstance - -tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\Unsupported.txt -tn GetThumbnailL -allownextresult KErrNotSupported -waittestclass tn -tn DeleteSourceInstance - -tn CreateSourceInstanceBufferL \data\ThumbnailManagerTest\Unsupported.txt plain/text -tn GetThumbnailL -allownextresult KErrNotSupported -waittestclass tn -tn DeleteSourceInstance - -tn DeleteInstance -delete tn -pause KTestDelay -[Endtest] - -// --------------------------------------------------------------------------- -// Thumbnail from corrupt file -// --------------------------------------------------------------------------- -[Test] -title Thumbnail from corrupt file -create ThumbnailManagerTest tn -tn CreateInstanceL -tn SetThumbnailEnumSizeL ECustomThumbnailSize -tn SetThumbnailSizeL KCustomSizeX KCustomSizeY - -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\not_jpg.jpg -tn GetThumbnailL -allownextresult KErrNotFound -waittestclass tn -tn DeleteSourceInstance - -tn CreateSourceInstanceBufferL \data\ThumbnailManagerTest\not_jpg.jpg image/jpeg -tn GetThumbnailL -allownextresult KErrNotFound -waittestclass tn -tn DeleteSourceInstance - -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\not_3gp.3gp -tn GetThumbnailL -allownextresult KErrNotSupported -waittestclass tn -tn DeleteSourceInstance - -tn DeleteInstance -delete tn -pause KTestDelay -[Endtest] - - // --------------------------------------------------------------------------- // Custom size thumbs // --------------------------------------------------------------------------- @@ -1592,35 +1714,79 @@ // --------------------------------------------------------------------------- -// Get thumbnail by id +// Thumbnail from missing or unsupported file // --------------------------------------------------------------------------- [Test] -title Get thumbnail by id +title Thumbnail from missing or unsupported file create ThumbnailManagerTest tn tn CreateInstanceL -tn SetDisplayModeL EColor16M +tn SetThumbnailEnumSizeL ECustomThumbnailSize +tn SetThumbnailSizeL KCustomSizeX KCustomSizeY -tn SetThumbnailEnumSizeL EImageGridThumbnailSize -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg 99999 -tn DeleteThumbnails -tn CreateThumbnails +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\does_not_exist.jpg +tn GetThumbnailL +allownextresult KErrNotFound waittestclass tn +tn DeleteSourceInstance -pause KTenSecondDelay - -tn SetFlagsL EDoNotCreate -tn GetThumbnailByIdL 99999 +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\Unsupported.txt +tn GetThumbnailL +allownextresult KErrNotSupported waittestclass tn -tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M -tn DeleteThumbnails +tn DeleteSourceInstance +tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\Unsupported.txt +tn GetThumbnailL +allownextresult KErrNotSupported +waittestclass tn tn DeleteSourceInstance + +tn CreateSourceInstanceBufferL \data\ThumbnailManagerTest\Unsupported.txt plain/text +tn GetThumbnailL +allownextresult KErrNotSupported +waittestclass tn +tn DeleteSourceInstance + tn DeleteInstance delete tn pause KTestDelay [Endtest] // --------------------------------------------------------------------------- +// Thumbnail from corrupt file +// --------------------------------------------------------------------------- +[Test] +title Thumbnail from corrupt file +create ThumbnailManagerTest tn +tn CreateInstanceL +tn SetThumbnailEnumSizeL ECustomThumbnailSize +tn SetThumbnailSizeL KCustomSizeX KCustomSizeY + +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\not_jpg.jpg +tn GetThumbnailL +allownextresult KErrNotFound +waittestclass tn +tn DeleteSourceInstance + +tn CreateSourceInstanceBufferL \data\ThumbnailManagerTest\not_jpg.jpg image/jpeg +tn GetThumbnailL +allownextresult KErrNotFound +waittestclass tn +tn DeleteSourceInstance + +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\not_3gp.3gp +tn GetThumbnailL +allownextresult KErrNotSupported +waittestclass tn +tn DeleteSourceInstance + +tn DeleteInstance +delete tn +pause KTestDelay +[Endtest] + + +// --------------------------------------------------------------------------- // Set thumbnail from buffer // --------------------------------------------------------------------------- [Test] @@ -1678,72 +1844,47 @@ [Endtest] // --------------------------------------------------------------------------- -// Import thumbnail +// Set thumbnail from path // --------------------------------------------------------------------------- [Test] -title Import thumbnail +title Set thumbnail from path create ThumbnailManagerTest tn tn CreateInstanceL tn SetDisplayModeL EColor16M +// normal uri tn SetFlagsL EDefaultFlags -tn SetThumbnailEnumSizeL EImageGridThumbnailSize -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg -tn DeleteThumbnails -tn ImportThumbnailL \data\ThumbnailManagerTest\imported.jpg +tn CreateSourceInstancePathTargetL \data\ThumbnailManagerTest\RGB_VGA.jpg \data\ThumbnailManagerTest\target.jpg image/jpeg 0 0 +tn SetThumbnailL + waittestclass tn + tn DeleteSourceInstance - +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\target.jpg +tn SetThumbnailEnumSizeL EImageGridThumbnailSize tn SetFlagsL EDoNotCreate -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\imported.jpg tn GetThumbnailL + waittestclass tn tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M tn DeleteThumbnails tn DeleteSourceInstance +// virtual uri tn SetFlagsL EDefaultFlags -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_400x300.bmp -tn DeleteThumbnails -tn ImportThumbnailL \data\ThumbnailManagerTest\imported.bmp -waittestclass tn -tn DeleteSourceInstance +tn CreateSourceInstancePathTargetL \data\ThumbnailManagerTest\RGB_VGA.jpg \data\ThumbnailManagerTest\target.vcf contact/x-vcard 0 1 +tn SetThumbnailL -tn SetFlagsL EDoNotCreate -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\imported.bmp -tn GetThumbnailL waittestclass tn -tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M -tn DeleteThumbnails -tn DeleteSourceInstance -tn SetFlagsL EDefaultFlags -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\WIDE_800x400.gif -tn DeleteThumbnails -tn ImportThumbnailL \data\ThumbnailManagerTest\imported.gif -waittestclass tn tn DeleteSourceInstance - +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\target.vcf +tn SetThumbnailEnumSizeL EContactGridThumbnailSize tn SetFlagsL EDoNotCreate -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\imported.gif tn GetThumbnailL -waittestclass tn -tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M -tn DeleteThumbnails -tn DeleteSourceInstance -tn SetFlagsL EDefaultFlags -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\video.3gp -tn DeleteThumbnails -tn ImportThumbnailL \data\ThumbnailManagerTest\imported.3gp waittestclass tn -tn DeleteSourceInstance - -tn SetFlagsL EDoNotCreate -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\imported.3gp -tn GetThumbnailL -waittestclass tn -tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M +tn CheckThumbnailCenrepL EContactGridThumbnailSize EColor16M tn DeleteThumbnails tn DeleteSourceInstance @@ -1801,77 +1942,105 @@ pause KTestDelay [Endtest] + // --------------------------------------------------------------------------- -// Delete thumbnails by id +// Run multiple tests // --------------------------------------------------------------------------- [Test] -title Delete thumbnails by id +title Run misc multiple tests create ThumbnailManagerTest tn tn CreateInstanceL tn SetDisplayModeL EColor16M -tn SetThumbnailEnumSizeL EImageGridThumbnailSize -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg 99999 +// using path +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg tn DeleteThumbnails -tn CreateThumbnails -waittestclass tn - -pause KTenSecondDelay - -tn SetFlagsL EDoNotCreate -tn GetThumbnailByIdL 99999 +tn SetThumbnailEnumSizeL EImageGridThumbnailSize +tn GetThumbnailL waittestclass tn tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EImageFullScreenThumbnailSize +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageFullScreenThumbnailSize EColor16M +tn DeleteThumbnails +tn SetThumbnailEnumSizeL ECustomThumbnailSize +tn SetThumbnailSizeL KCustomSizeX KCustomSizeY +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailL KCustomSizeX KCustomSizeY EColor16M +tn DeleteThumbnails +tn DeleteSourceInstance -tn DeleteThumbnailsByIdL 99999 -pause KOneSecondDelay +// mp3 using handle +tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\mp3.mp3 +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EAudioGridThumbnailSize +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EAudioGridThumbnailSize EColor16M +tn DeleteThumbnails +tn SetThumbnailEnumSizeL EAudioFullScreenThumbnailSize +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EAudioFullScreenThumbnailSize EColor16M +tn DeleteThumbnails +tn SetThumbnailEnumSizeL ECustomThumbnailSize +tn SetThumbnailSizeL KCustomSizeX KCustomSizeY +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailL KCustomSizeX KCustomSizeY EColor16M +tn DeleteThumbnails +tn DeleteSourceInstance -tn GetThumbnailByIdL 99999 +// corrupted file +tn SetThumbnailEnumSizeL ECustomThumbnailSize +tn SetThumbnailSizeL KCustomSizeX KCustomSizeY +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\not_jpg.jpg +tn GetThumbnailL +allownextresult KErrNotFound +waittestclass tn +tn DeleteSourceInstance +tn CreateSourceInstanceBufferL \data\ThumbnailManagerTest\not_jpg.jpg image/jpeg +tn GetThumbnailL +allownextresult KErrNotFound +waittestclass tn +tn DeleteSourceInstance +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\not_3gp.3gp +tn GetThumbnailL +allownextresult KErrNotSupported +waittestclass tn +tn DeleteSourceInstance + +// delete one thumbnail +tn SetThumbnailEnumSizeL EImageGridThumbnailSize +tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg +tn DeleteThumbnails +tn GetThumbnailL +waittestclass tn +tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M +tn DeleteThumbnails +pause KTenSecondDelay +tn SetFlagsL EDoNotCreate +tn GetThumbnailL allownextresult KErrNotFound waittestclass tn -tn DeleteSourceInstance -tn DeleteInstance -delete tn -pause KTestDelay -[Endtest] - - -// --------------------------------------------------------------------------- -// Update path -// --------------------------------------------------------------------------- -[Test] -title Update path -create ThumbnailManagerTest tn -tn CreateInstanceL -tn SetDisplayModeL EColor16M - -tn SetThumbnailEnumSizeL EImageGridThumbnailSize -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg 99999 -tn DeleteThumbnails +// delete all persistent thumbnails created +tn SetFlagsL EDefaultFlags tn CreateThumbnails waittestclass tn -tn DeleteSourceInstance - pause KTenSecondDelay - -tn UpdatePathL 99999 \data\ThumbnailManagerTest\updated_path.bmp - +tn DeleteThumbnails pause KTenSecondDelay - tn SetFlagsL EDoNotCreate -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\RGB_VGA.jpg tn GetThumbnailL +allownextresult KErrNotFound waittestclass tn +tn DeleteThumbnails tn DeleteSourceInstance -tn CreateSourceInstancePathL \data\ThumbnailManagerTest\updated_path.bmp 99999 -tn GetThumbnailByIdL 99999 -waittestclass tn -tn CheckThumbnailCenrepL EImageGridThumbnailSize EColor16M -tn DeleteSourceInstance -tn DeleteThumbnailsByIdL 99999 - tn DeleteInstance delete tn pause KTestDelay @@ -1934,7 +2103,7 @@ tn GetThumbnailL tn DeleteSourceInstance -pause KClientServerDelay +pause KClientServerDelay2 // The server should have the two thumbnail requests queued by now. // This should cancel the second one while letting the first one finish. @@ -1968,25 +2137,22 @@ tn DeleteThumbnails tn DeleteSourceInstance -// First request with 0 priority +// First request with 100 priority tn SetThumbnailSizeL 80 40 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\WIDE_800x400.gif -tn GetThumbnailL 0 0 +tn GetThumbnailL 0 100 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 -10 +tn GetThumbnailL 0 -100 tn DeleteSourceInstance // Third request with positive priority tn SetThumbnailSizeL 40 30 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\SVG_640x480.svg -tn GetThumbnailL 0 10 +tn GetThumbnailL 0 0 tn DeleteSourceInstance // First request should complete first, since the server started processing @@ -1994,8 +2160,7 @@ waittestclass tn tn CheckThumbnailL 80 40 EColor16M -// The third request should finish next, since it had the highest priority of -// the other tasks. +// The third request should finish next waittestclass tn tn CheckThumbnailL 40 30 EColor16M @@ -2044,31 +2209,27 @@ 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 -10 +tn GetThumbnailL 0 -50 tn DeleteSourceInstance // Third request with positive priority tn SetThumbnailSizeL 40 30 tn CreateSourceInstanceHandleL \data\ThumbnailManagerTest\SVG_640x480.svg -tn GetThumbnailL 0 10 +tn GetThumbnailL 0 50 tn DeleteSourceInstance // Change the priority of the third request to a low value -tn ChangePreviousPriority -20 +tn ChangePreviousPriority -100 // 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, since it had the highest priority of -// the other tasks. +// The second request should finish next waittestclass tn tn CheckThumbnailL 1 1 EColor16M @@ -2105,40 +2266,3 @@ pause KTestDelay [Endtest] -// --------------------------------------------------------------------------- -// Create thumbnails using CFbsBitmap -// --------------------------------------------------------------------------- -[Test] -title Create thumbnails using CFbsBitmap -create ThumbnailManagerTest tn -tn CreateInstanceL -tn SetDisplayModeL EColor16M - -tn SetFlagsL EDefaultFlags -tn CreateSourceInstanceBitmapL \data\ThumbnailManagerTest\TestMBM.mbm \data\ThumbnailManagerTest\camera.jpg -tn DeleteThumbnails -tn CreateThumbnails -waittestclass tn - -pause KTenSecondDelay - -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 -tn CheckThumbnailCenrepL EImageFullScreenThumbnailSize EColor16M -tn DeleteThumbnails -tn DeleteSourceInstance - -tn DeleteInstance -delete tn -pause KTestDelay -[Endtest]