diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/grid.test | 10 | ||||
| -rw-r--r-- | tests/imgPhoto.test | 8 | ||||
| -rw-r--r-- | tests/packgrid.test | 16 | ||||
| -rw-r--r-- | tests/unixWm.test | 2 | ||||
| -rw-r--r-- | tests/wm.test | 16 |
5 files changed, 26 insertions, 26 deletions
diff --git a/tests/grid.test b/tests/grid.test index 7651193..22a2214 100644 --- a/tests/grid.test +++ b/tests/grid.test @@ -63,10 +63,10 @@ test grid-1.5 {basic argument checking} -body { } -returnCodes error -result {can't manage ".": it's a top-level window} test grid-1.6 {basic argument checking} -body { grid x -} -returnCodes error -result {can't determine master window} +} -returnCodes error -result {can't determine container window} test grid-1.7 {basic argument checking} -body { grid configure x -} -returnCodes error -result {can't determine master window} +} -returnCodes error -result {can't determine container window} test grid-1.8 {basic argument checking} -body { button .b grid x .b @@ -856,13 +856,13 @@ test grid-11.1 {default widget placement} -body { grid ^ } -cleanup { grid_reset 11.1 -} -returnCodes error -result {can't use '^', cant find master} +} -returnCodes error -result {can't use '^', can't find container window} test grid-11.2 {default widget placement} -body { button .b grid .b ^ } -cleanup { grid_reset 11.2 -} -returnCodes error -result {can't find slave to extend with "^"} +} -returnCodes error -result {can't find content to extend with "^"} test grid-11.3 {default widget placement} -body { button .b grid .b - - .c @@ -917,7 +917,7 @@ test grid-11.9 {default widget placement} -body { grid .f x ^ } -cleanup { grid_reset 11.9 -} -returnCodes error -result {can't find slave to extend with "^"} +} -returnCodes error -result {can't find content to extend with "^"} test grid-11.10 {default widget placement} -body { foreach i {1 2 3} { frame .f$i -width 100 -height 50 -highlightthickness 0 -bg red diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test index 88e4662..35b6ddb 100644 --- a/tests/imgPhoto.test +++ b/tests/imgPhoto.test @@ -32,7 +32,7 @@ # ImgPhotoCmd imgPhoto-4.*, imgPhoto-17.* # GetExtension: no tests # ParseSubcommandOptions: imgPhoto-1.* -# ImgPhotoConfigureMaster: imgPhoto-3.*, imgPhoto-15.* +# ImgPhotoConfigureModel: imgPhoto-3.*, imgPhoto-15.* # toggleComplexAlphaIfNeeded: no tests # ImgPhotoDelete: imgPhoto-8.* # ImgPhotoCmdDeleteProc: imgPhoto-9.* @@ -253,7 +253,7 @@ test imgPhoto-3.3 {ImgPhotoConfigureModel procedure} -constraints { destroy .c image delete photo1 } -result {256 256 {10 10 266 266} {300 10 556 266}} -test imgPhoto-3.4 {ImgPhotoConfigureMaster: -data <ppm>} -constraints { +test imgPhoto-3.4 {ImgPhotoConfigureModel: -data <ppm>} -constraints { hasTeapotPhoto } -setup { image create photo photo1 -file $teapotPhotoFile @@ -264,7 +264,7 @@ test imgPhoto-3.4 {ImgPhotoConfigureMaster: -data <ppm>} -constraints { } -cleanup { imageCleanup } -result {20 20} -test imgPhoto-3.5 {ImgPhotoConfigureMaster: -data <png>} -constraints { +test imgPhoto-3.5 {ImgPhotoConfigureModel: -data <png>} -constraints { hasTeapotPhoto } -setup { image create photo photo1 -file $teapotPhotoFile @@ -275,7 +275,7 @@ test imgPhoto-3.5 {ImgPhotoConfigureMaster: -data <png>} -constraints { } -cleanup { imageCleanup } -result {20 20} -test imgPhoto-3.6 {ImgPhotoConfigureMaster: -data <default>} -constraints { +test imgPhoto-3.6 {ImgPhotoConfigureModel: -data <default>} -constraints { hasTeapotPhoto } -setup { image create photo photo1 -file $teapotPhotoFile diff --git a/tests/packgrid.test b/tests/packgrid.test index 6dfba25..d0ad855 100644 --- a/tests/packgrid.test +++ b/tests/packgrid.test @@ -22,7 +22,7 @@ test packgrid-1.1 {pack and grid in same container window} -setup { } -returnCodes error -cleanup { destroy .p destroy .g -} -result {cannot use geometry manager pack inside . which already has slaves managed by grid} +} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows} test packgrid-1.2 {pack and grid in same container window} -setup { grid propagate . true @@ -36,7 +36,7 @@ test packgrid-1.2 {pack and grid in same container window} -setup { } -returnCodes error -cleanup { destroy .p destroy .g -} -result {cannot use geometry manager grid inside . which already has slaves managed by pack} +} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows} test packgrid-1.3 {pack and grid in same container window} -setup { grid propagate . false @@ -137,7 +137,7 @@ test packgrid-2.1 {pack and grid in same container window, change propagation} - } -returnCodes error -cleanup { destroy .p destroy .g -} -result {cannot use geometry manager grid inside . which already has slaves managed by pack} +} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows} test packgrid-2.2 {pack and grid in same container window, change propagation} -setup { grid propagate . true @@ -153,7 +153,7 @@ test packgrid-2.2 {pack and grid in same container window, change propagation} - destroy .p update destroy .g -} -result {cannot use geometry manager pack inside . which already has slaves managed by grid} +} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows} test packgrid-2.3 {pack and grid in same container window, change propagation} -setup { grid propagate . false @@ -170,7 +170,7 @@ test packgrid-2.3 {pack and grid in same container window, change propagation} - } -returnCodes error -cleanup { destroy .p destroy .g -} -result {cannot use geometry manager pack inside . which already has slaves managed by grid} +} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows} test packgrid-2.4 {pack and grid in same container window, change propagation} -setup { grid propagate . false @@ -186,7 +186,7 @@ test packgrid-2.4 {pack and grid in same container window, change propagation} - } -returnCodes error -cleanup { destroy .p destroy .g -} -result {cannot use geometry manager grid inside . which already has slaves managed by pack} +} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows} test packgrid-3.1 {stealing content} -setup { grid propagate . true @@ -229,7 +229,7 @@ test packgrid-3.3 {stealing content} -setup { } -returnCodes error -cleanup { destroy .p destroy .g -} -result {cannot use geometry manager pack inside . which already has slaves managed by grid} +} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows} test packgrid-3.4 {stealing content} -setup { grid propagate . true @@ -244,7 +244,7 @@ test packgrid-3.4 {stealing content} -setup { } -returnCodes error -cleanup { destroy .p destroy .g -} -result {cannot use geometry manager grid inside . which already has slaves managed by pack} +} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows} test packgrid-4.1 {content stolen after container destruction - bug [aa7679685e]} -setup { frame .f diff --git a/tests/unixWm.test b/tests/unixWm.test index c7b10d0..dbb0ea4 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -850,7 +850,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix { set result [list [catch {wm iconify .t2} msg] $msg] destroy .t2 set result -} {1 {can't iconify .t2: it is an icon for .t}} +} {1 {can't iconify ".t2": it is an icon for ".t"}} test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix { destroy .t2 toplevel .t2 diff --git a/tests/wm.test b/tests/wm.test index 285ea9b..ddc395c 100644 --- a/tests/wm.test +++ b/tests/wm.test @@ -785,7 +785,7 @@ test wm-iconify-2.3 {Misc errors} -body { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 -} -result {can't iconify .t2: it is an icon for .t} +} -result {can't iconify ".t2": it is an icon for ".t"} # test embedded window for Windows test wm-iconify-2.4.1 {Misc errors} -constraints win -setup { destroy .t2 @@ -795,7 +795,7 @@ test wm-iconify-2.4.1 {Misc errors} -constraints win -setup { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 .r.f -} -result {can't iconify .t2: the container does not support the request} +} -result {can't iconify ".t2": the container does not support the request} # test embedded window for other platforms test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup { destroy .t2 @@ -805,7 +805,7 @@ test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 .r.f -} -result {can't iconify .t2: it is an embedded window} +} -result {can't iconify ".t2": it is an embedded window} test wm-iconify-3.1 {iconify behavior} -body { toplevel .t2 @@ -1623,7 +1623,7 @@ test wm-transient-1.5 {usage} -returnCodes error -body { wm transient .icon .dummy } -cleanup { deleteWindows -} -result {can't make ".icon" a transient: it is an icon for .top} +} -result {can't make ".icon" a transient, it is an icon for .top} test wm-transient-1.6 {usage} -returnCodes error -body { toplevel .icon -bg blue toplevel .top @@ -1632,13 +1632,13 @@ test wm-transient-1.6 {usage} -returnCodes error -body { wm transient .dummy .icon } -cleanup { deleteWindows -} -result {can't make ".icon" a container: it is an icon for .top} +} -result {can't make ".icon" a container, it is an icon for .top} test wm-transient-1.7 {usage} -returnCodes error -body { toplevel .top wm transient .top .top } -cleanup { deleteWindows -} -result {setting ".top" as container creates a transient/container cycle} +} -result {can't set ".top" as container, would cause management loop} test wm-transient-1.8 {usage} -returnCodes error -body { toplevel .t1 toplevel .t2 @@ -1648,14 +1648,14 @@ test wm-transient-1.8 {usage} -returnCodes error -body { wm transient .t1 .t3 } -cleanup { deleteWindows -} -result {setting ".t3" as container creates a transient/container cycle} +} -result {can't set ".t3" as container, would cause management loop} test wm-transient-1.9 {usage} -returnCodes error -body { toplevel .top frame .top.f wm transient .top .top.f } -cleanup { deleteWindows -} -result {setting ".top" as container creates a transient/container cycle} +} -result {can't set ".top" as container, would cause management loop} test wm-transient-2.1 {basic get/set of toplevel} -setup { set results [list] |