diff options
Diffstat (limited to 'tests/image.test')
| -rw-r--r-- | tests/image.test | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/tests/image.test b/tests/image.test index c7b6511..e6f166b 100644 --- a/tests/image.test +++ b/tests/image.test @@ -31,7 +31,7 @@ test image-1.3 {Tk_ImageCmd procedure, "create" option} -body { } -returnCodes error -result {wrong # args: should be "image create type ?name? ?-option value ...?"} test image-1.4 {Tk_ImageCmd procedure, "create" option} -body { image c bad_type -} -returnCodes error -result {image type "bad_type" doesn't exist} +} -returnCodes error -result {image type "bad_type" does not exist} test image-1.5 {Tk_ImageCmd procedure, "create" option} -constraints { testImageType } -body { @@ -68,7 +68,7 @@ test image-1.7 {Tk_ImageCmd procedure, "create" option} -constraints { update # On MacOS we need to wait for the test image display procedure to run. while {"timed out" ni $x && [lindex $x end 1] ne "display"} { - vwait x + vwait x } after cancel timer if {[lindex $x end] eq "timed out"} { @@ -177,7 +177,7 @@ test image-2.3 {Tk_ImageCmd procedure, "delete" option} -constraints { image delete myimage gorp img2 } -cleanup { imageCleanup -} -returnCodes error -result {image "gorp" doesn't exist} +} -returnCodes error -result {image "gorp" does not exist} test image-2.4 {Tk_ImageCmd procedure, "delete" option} -constraints { testImageType } -setup { @@ -200,7 +200,7 @@ test image-3.2 {Tk_ImageCmd procedure, "height" option} -body { } -returnCodes error -result {wrong # args: should be "image height name"} test image-3.3 {Tk_ImageCmd procedure, "height" option} -body { image height foo -} -returnCodes error -result {image "foo" doesn't exist} +} -returnCodes error -result {image "foo" does not exist} test image-3.4 {Tk_ImageCmd procedure, "height" option} -constraints { testImageType } -setup { @@ -226,11 +226,11 @@ test image-4.2 {Tk_ImageCmd procedure, "names" option} -constraints { interp create testinterp load {} Tk testinterp interp eval testinterp { - image delete {*}[image names] - image create test myimage - image create test img2 - image create test 24613 - lsort [image names] + image delete {*}[image names] + image create test myimage + image create test img2 + image create test 24613 + lsort [image names] } } -cleanup { interp delete testinterp @@ -241,9 +241,9 @@ test image-4.3 {Tk_ImageCmd procedure, "names" option} -setup { interp create testinterp load {} Tk testinterp interp eval testinterp { - image delete {*}[image names] - eval image delete [image names] [image names] - lsort [image names] + image delete {*}[image names] + eval image delete [image names] [image names] + lsort [image names] } } -cleanup { interp delete testinterp @@ -258,7 +258,7 @@ test image-5.2 {Tk_ImageCmd procedure, "type" option} -body { } -returnCodes error -result {wrong # args: should be "image type name"} test image-5.3 {Tk_ImageCmd procedure, "type" option} -body { image type foo -} -returnCodes error -result {image "foo" doesn't exist} +} -returnCodes error -result {image "foo" does not exist} test image-5.4 {Tk_ImageCmd procedure, "type" option} -constraints { testImageType @@ -281,7 +281,7 @@ test image-5.5 {Tk_ImageCmd procedure, "type" option} -constraints { image type myimage } -cleanup { imageCleanup -} -returnCodes error -result {image "myimage" doesn't exist} +} -returnCodes error -result {image "myimage" does not exist} test image-5.6 {Tk_ImageCmd procedure, "type" option} -constraints { testOldImageType } -setup { @@ -326,7 +326,7 @@ test image-7.2 {Tk_ImageCmd procedure, "width" option} -body { } -returnCodes error -result {wrong # args: should be "image width name"} test image-7.3 {Tk_ImageCmd procedure, "width" option} -body { image width foo -} -returnCodes error -result {image "foo" doesn't exist} +} -returnCodes error -result {image "foo" does not exist} test image-7.4 {Tk_ImageCmd procedure, "width" option} -constraints { testImageType } -setup { @@ -370,10 +370,6 @@ test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup { foo changed 5 6 7 8 30 15 update idletasks update - # On MacOS we need to wait for the test image display procedure to run. - while {"timed out" ni $x && [lindex $x end 1] ne "display"} { - vwait x - } after cancel $timer return $x } -cleanup { @@ -408,7 +404,7 @@ test image-10.1 {Tk_GetImage procedure} -setup { .c create image 100 10 -image bad_name } -cleanup { imageCleanup -} -returnCodes error -result {image "bad_name" doesn't exist} +} -returnCodes error -result {image "bad_name" does not exist} test image-10.2 {Tk_GetImage procedure} -constraints testImageType -setup { destroy .l imageCleanup @@ -420,7 +416,7 @@ test image-10.2 {Tk_GetImage procedure} -constraints testImageType -setup { } -cleanup { destroy .l imageCleanup -} -returnCodes error -result {image "mytest" doesn't exist} +} -returnCodes error -result {image "mytest" does not exist} test image-11.1 {Tk_FreeImage procedure} -constraints testImageType -setup { @@ -581,7 +577,7 @@ test image-13.2 {DeleteImage procedure} -constraints testImageType -setup { lappend x | [imageNames] | [catch {image delete foo} msg] | $msg | [imageNames] | } -cleanup { imageCleanup -} -result {{foo free} {foo free} {foo delete} | {} | 1 | {image "foo" doesn't exist} | {} |} +} -result {{foo free} {foo free} {foo delete} | {} | 1 | {image "foo" does not exist} | {} |} test image-13.3 {Tk_SizeOfImage procedure} -constraints testOldImageType -setup { imageCleanup |