Update to tcltest2

1 files changed, 825 insertions, 681 deletions

diff --git a/tests/grid.test b/tests/grid.test
index a8b72cc..e058ec3 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -5,17 +5,20 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: grid.test,v 1.32 2008/07/23 23:24:25 nijtmans Exp $
+# RCS: @(#) $Id: grid.test,v 1.33 2008/08/16 23:52:34 aniap Exp $
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
+namespace import -force tcltest::test
+
 
 # helper routine to return "." to a sane state after a test
 # The variable GRID_VERBOSE can be used to "look" at the result
 # of one or all of the tests
 
 proc grid_reset {{test ?} {top .}} {
+#puts "AAA$test"
     global GRID_VERBOSE
     if {[info exists GRID_VERBOSE]} {
 	if {$GRID_VERBOSE=="" || $GRID_VERBOSE==$test} {
@@ -41,87 +44,78 @@ proc grid_reset {{test ?} {top .}} {
 grid_reset 0.0
 wm geometry . {}
 
-test grid-1.1 {basic argument checking} {
-	list [catch grid msg] $msg
-} {1 {wrong # args: should be "grid option arg ?arg ...?"}}
-
-test grid-1.2 {basic argument checking} {
-	list [catch {grid foo bar} msg] $msg
-} {1 {bad option "foo": must be anchor, bbox, columnconfigure, configure, forget, info, location, propagate, remove, rowconfigure, size, or slaves}}
-
-test grid-1.3 {basic argument checking} {
+test grid-1.1 {basic argument checking} -body {
+	grid
+} -returnCodes error -result {wrong # args: should be "grid option arg ?arg ...?"}
+test grid-1.2 {basic argument checking} -body {
+	grid foo bar
+} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
+test grid-1.3 {basic argument checking} -body {
 	button .b
-	list [catch {grid .b -row 0 -column} msg] $msg
-} {1 {extra option or option with no value}}
-grid_reset 1.3
+	grid .b -row 0 -column
+} -cleanup {
+    grid_reset 1.3
+} -returnCodes error -result {extra option or option with no value}
 
-test grid-1.4 {basic argument checking} {
+test grid-1.4 {basic argument checking} -body {
 	button .b
-	list [catch {grid configure .b - foo} msg] $msg
-} {1 {unexpected parameter, "foo", in configure list. Should be window name or option}}
-grid_reset 1.4
-
-test grid-1.5 {basic argument checking} {
-	list [catch {grid .} msg] $msg
-} {1 {can't manage ".": it's a top-level window}}
-
-test grid-1.6 {basic argument checking} {
-	list [catch {grid x} msg] $msg
-} {1 {can't determine master window}}
-
-test grid-1.7 {basic argument checking} {
-	list [catch {grid configure x} msg] $msg
-} {1 {can't determine master window}}
-
-test grid-1.8 {basic argument checking} {
+	grid configure .b - foo
+} -cleanup {
+    grid_reset 1.4
+} -returnCodes error -result {unexpected parameter, "foo", in configure list. Should be window name or option}
+test grid-1.5 {basic argument checking} -body {
+	grid .
+} -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}
+test grid-1.7 {basic argument checking} -body {
+	grid configure x
+} -returnCodes error -result {can't determine master window}
+test grid-1.8 {basic argument checking} -body {
 	button .b
-	list [catch {grid x .b} msg] $msg
-} {0 {}}
-grid_reset 1.8
+	grid x .b
+} -cleanup {
+    grid_reset 1.8
+} -returnCodes ok -result {}
 
-test grid-1.9 {basic argument checking} {
+test grid-1.9 {basic argument checking} -body {
 	button .b
-	list [catch {grid configure x .b} msg] $msg
-} {0 {}}
-grid_reset 1.9
+	grid configure x .b
+} -cleanup {
+    grid_reset 1.9
+} -returnCodes ok -result {}
 
-test grid-2.1 {bbox} {
-	list [catch {grid bbox .} msg] $msg
-} {0 {0 0 0 0}}
 
-test grid-2.2 {bbox} {
+test grid-2.1 {bbox} -body {
+	grid bbox .
+} -result {0 0 0 0}
+test grid-2.2 {bbox} -body {
 	button .b
 	grid .b
 	destroy .b
 	update
-	list [catch {grid bbox .} msg] $msg
-} {0 {0 0 0 0}}
-
-test grid-2.3 {bbox: argument checking} {
-	list [catch {grid bbox . 0 0 5} msg] $msg
-} {1 {wrong # args: should be "grid bbox master ?column row ?column row??"}}
-
-test grid-2.4 {bbox} {
-	list [catch {grid bbox .bad 0 0} msg] $msg
-} {1 {bad window path name ".bad"}}
-
-test grid-2.5 {bbox} {
-	list [catch {grid bbox . x 0} msg] $msg
-} {1 {expected integer but got "x"}}
-
-test grid-2.6 {bbox} {
-	list [catch {grid bbox . 0 x} msg] $msg
-} {1 {expected integer but got "x"}}
-
-test grid-2.7 {bbox} {
-	list [catch {grid bbox . 0 0 x 0} msg] $msg
-} {1 {expected integer but got "x"}}
-
-test grid-2.8 {bbox} {
-	list [catch {grid bbox . 0 0 0 x} msg] $msg
-} {1 {expected integer but got "x"}}
-
-test grid-2.9 {bbox} {
+	grid bbox .
+} -result {0 0 0 0}
+test grid-2.3 {bbox: argument checking} -body {
+	grid bbox . 0 0 5
+} -returnCodes error -result {wrong # args: should be "grid bbox master ?column row ?column row??"}
+test grid-2.4 {bbox} -body {
+	grid bbox .bad 0 0
+} -returnCodes error -result {bad window path name ".bad"}
+test grid-2.5 {bbox} -body {
+	grid bbox . x 0
+} -returnCodes error -result {expected integer but got "x"}
+test grid-2.6 {bbox} -body {
+	grid bbox . 0 x
+} -returnCodes error -result {expected integer but got "x"}
+test grid-2.7 {bbox} -body {
+	grid bbox . 0 0 x 0
+} -returnCodes error -result {expected integer but got "x"}
+test grid-2.8 {bbox} -body {
+	grid bbox . 0 0 0 x
+} -returnCodes error -result {expected integer but got "x"}
+test grid-2.9 {bbox} -body {
     frame .1 -width 75 -height 75 -bg red
     frame .2 -width 90 -height 90 -bg red
     grid .1 -row 0 -column 0
@@ -133,10 +127,11 @@ test grid-2.9 {bbox} {
     lappend a [grid bbox . 0 0 1 1]
     lappend a [grid bbox . 1 1]
     set a
-} {{0 0 165 165} {0 0 75 75} {0 0 165 165} {75 75 90 90}}
-grid_reset 2.9
+} -cleanup {
+    grid_reset 2.9
+} -result {{0 0 165 165} {0 0 75 75} {0 0 165 165} {75 75 90 90}}
 
-test grid-2.10 {bbox} {
+test grid-2.10 {bbox} -body {
     frame .1 -width 75 -height 75 -bg red
     frame .2 -width 90 -height 90 -bg red
     grid .1 -row 0 -column 0
@@ -147,97 +142,109 @@ test grid-2.10 {bbox} {
     lappend a [grid bbox . -2 -2 -1 -1]
     lappend a [grid bbox . 10 10 12 12]
     set a
-} {{0 0 165 165} {0 0 0 0} {165 165 0 0}}
-grid_reset 2.10
+} -cleanup {
+    grid_reset 2.10
+} -result {{0 0 165 165} {0 0 0 0} {165 165 0 0}}
 
-test grid-3.1 {configure: basic argument checking} {
-    list [catch {grid configure foo} msg] $msg
-} {1 {bad argument "foo": must be name of window}}
 
-test grid-3.2 {configure: basic argument checking} {
+test grid-3.1 {configure: basic argument checking} -body {
+    grid configure foo
+} -returnCodes error -result {bad argument "foo": must be name of window}
+test grid-3.2 {configure: basic argument checking} -body {
     button .b
     grid configure .b
     grid slaves .
-} {.b}
-grid_reset 3.2
+} -cleanup {
+    grid_reset 3.2
+} -result {.b}
 
-test grid-3.3 {configure: basic argument checking} {
+test grid-3.3 {configure: basic argument checking} -body {
     button .b
-    list [catch {grid .b -row -1} msg] $msg
-} {1 {bad row value "-1": must be a non-negative integer}}
-grid_reset 3.3
+    grid .b -row -1
+} -cleanup {
+    grid_reset 3.3
+} -returnCodes error -result {bad row value "-1": must be a non-negative integer}
 
-test grid-3.4 {configure: basic argument checking} {
+test grid-3.4 {configure: basic argument checking} -body {
     button .b
-    list [catch {grid .b -column -1} msg] $msg
-} {1 {bad column value "-1": must be a non-negative integer}}
-grid_reset 3.4
+    grid .b -column -1
+} -cleanup {
+    grid_reset 3.4
+} -returnCodes error -result {bad column value "-1": must be a non-negative integer}
 
-test grid-3.5 {configure: basic argument checking} {
+test grid-3.5 {configure: basic argument checking} -body {
     button .b
-    list [catch {grid .b -rowspan 0} msg] $msg
-} {1 {bad rowspan value "0": must be a positive integer}}
-grid_reset 3.5
+    grid .b -rowspan 0
+} -cleanup {
+    grid_reset 3.5
+} -returnCodes error -result {bad rowspan value "0": must be a positive integer}
 
-test grid-3.6 {configure: basic argument checking} {
+test grid-3.6 {configure: basic argument checking} -body {
     button .b
-    list [catch {grid .b -columnspan 0} msg] $msg
-} {1 {bad columnspan value "0": must be a positive integer}}
-grid_reset 3.6
+    grid .b -columnspan 0
+} -cleanup {
+    grid_reset 3.6
+} -returnCodes error -result {bad columnspan value "0": must be a positive integer}
 
-test grid-3.7 {configure: basic argument checking} {
+test grid-3.7 {configure: basic argument checking} -body {
     frame .f
     button .f.b
-    list [catch {grid .f .f.b} msg] $msg
-} {1 {can't put .f.b inside .}}
-grid_reset 3.7
+    grid .f .f.b
+} -cleanup {
+    grid_reset 3.7
+} -returnCodes error -result {can't put .f.b inside .}
 
-test grid-3.8 {configure: basic argument checking} {
+test grid-3.8 {configure: basic argument checking} -body {
     button .b
     grid configure x .b
     grid slaves .
-} {.b}
-grid_reset 3.8
+} -cleanup {
+    grid_reset 3.8
+} -result {.b}
 
-test grid-3.9 {configure: basic argument checking} {
+test grid-3.9 {configure: basic argument checking} -body {
     button .b
-    list [catch {grid configure y .b} msg] $msg
-} {1 {invalid window shortcut, "y" should be '-', 'x', or '^'}}
-grid_reset 3.9
+    grid configure y .b
+} -cleanup {
+    grid_reset 3.9
+} -returnCodes error -result {invalid window shortcut, "y" should be '-', 'x', or '^'}
 
-test grid-4.1 {forget: basic argument checking} {
-    list [catch {grid forget foo} msg] $msg
-} {1 {bad window path name "foo"}}
 
-test grid-4.2 {forget} {
+test grid-4.1 {forget: basic argument checking} -body {
+    grid forget foo
+} -returnCodes error -result {bad window path name "foo"}
+test grid-4.2 {forget} -body {
     button .c
     grid [button .b]
     set a [grid slaves .]
     grid forget .b .c
     lappend a [grid slaves .]
     set a
-} {.b {}}
-grid_reset 4.2
+} -cleanup {
+    grid_reset 4.2
+} -result {.b {}}
 
-test grid-4.3 {forget} {
+test grid-4.3 {forget} -body {
     button .c
     grid .c -row 2 -column 2 -rowspan 2 -columnspan 2 -padx 3 -pady 4 -sticky ns
     grid forget .c
     grid .c -row 0 -column 0
     grid info .c
-} {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
-grid_reset 4.3
+} -cleanup {
+    grid_reset 4.3
+} -result {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
 
-test grid-4.3.1 {forget} {
+test grid-4.4 {forget} -body {
     button .c
     grid .c -row 2 -column 2 -rowspan 2 -columnspan 2 -padx {3 5} -pady {4 7} -sticky ns
     grid forget .c
     grid .c -row 0 -column 0
     grid info .c
-} {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
-grid_reset 4.3.1
+} -cleanup {
+    grid_reset 4.3.1
+} -result {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
 
-test grid-4.4 {forget, calling Tk_UnmaintainGeometry} {
+test grid-4.5 {forget, calling Tk_UnmaintainGeometry} -body {
     frame .f -bd 2 -relief raised
     place .f -x 10 -y 20 -width 200 -height 100
     frame .f2 -width 50 -height 30 -bg red
@@ -248,59 +255,61 @@ test grid-4.4 {forget, calling Tk_UnmaintainGeometry} {
     place .f -x 30
     update
     lappend x [winfo ismapped .f2]
-} {1 0}
-grid_reset 4.4
+} -cleanup {
+    grid_reset 4.4
+} -result {1 0}
 
-test grid-5.1 {info: basic argument checking} {
-	list [catch {grid info a b} msg] $msg
-} {1 {wrong # args: should be "grid info window"}}
 
-test grid-5.2 {info} {
+test grid-5.1 {info: basic argument checking} -body {
+	grid info a b
+} -returnCodes error -result {wrong # args: should be "grid info window"}
+test grid-5.2 {info} -body {
     frame .1 -width 75 -height 75 -bg red
     grid .1 -row 0 -column 0
     update
-    list [catch {grid info .x} msg] $msg
-} {1 {bad window path name ".x"}}
-grid_reset 5.2
+    grid info .x
+} -cleanup {
+    grid_reset 5.2
+} -returnCodes error -result {bad window path name ".x"}
 
-test grid-5.3 {info} {
+test grid-5.3 {info} -body {
     frame .1 -width 75 -height 75 -bg red
     grid .1 -row 0 -column 0
     update
-    list [catch {grid info .1} msg] $msg
-} {0 {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}}
-grid_reset 5.3
+    grid info .1
+} -cleanup {
+    grid_reset 5.3
+} -result {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
 
-test grid-5.4 {info} {
+test grid-5.4 {info} -body {
     frame .1 -width 75 -height 75 -bg red
     update
-    list [catch {grid info .1} msg] $msg
-} {0 {}}
-grid_reset 5.4
-
-test grid-6.1 {location: basic argument checking} {
-	list [catch "grid location ." msg] $msg
-} {1 {wrong # args: should be "grid location master x y"}}
-
-test grid-6.2 {location: basic argument checking} {
-	list [catch "grid location .bad 0 0" msg] $msg
-} {1 {bad window path name ".bad"}}
-
-test grid-6.3 {location: basic argument checking} {
-	list [catch "grid location . x y" msg] $msg
-} {1 {bad screen distance "x"}}
-
-test grid-6.4 {location: basic argument checking} {
-	list [catch "grid location . 1c y" msg] $msg
-} {1 {bad screen distance "y"}}
-
-test grid-6.5 {location: basic argument checking} {
+    grid info .1
+} -cleanup {
+    grid_reset 5.4
+} -returnCodes ok -result {}
+
+
+test grid-6.1 {location: basic argument checking} -body {
+	grid location .
+} -returnCodes error -result {wrong # args: should be "grid location master x y"}
+test grid-6.2 {location: basic argument checking} -body {
+	grid location .bad 0 0
+} -returnCodes error -result {bad window path name ".bad"}
+test grid-6.3 {location: basic argument checking} -body {
+	grid location . x y
+} -returnCodes error -result {bad screen distance "x"}
+test grid-6.4 {location: basic argument checking} -body {
+	grid location . 1c y
+} -returnCodes error -result {bad screen distance "y"}
+test grid-6.5 {location: basic argument checking} -body {
 	frame .f
 	grid location .f 10 10
-} {-1 -1}
-grid_reset 6.5
+} -cleanup {
+    grid_reset 6.5
+} -result {-1 -1}
 
-test grid-6.6 {location (x)} {
+test grid-6.6 {location (x)} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -314,10 +323,11 @@ test grid-6.6 {location (x)} {
 	}
     }
     set result
-} {{-10->-1 0} {0->0 0} {201->1 0}}
-grid_reset 6.6
+} -cleanup {
+    grid_reset 6.6
+} -result {{-10->-1 0} {0->0 0} {201->1 0}}
 
-test grid-6.7 {location (y)} {
+test grid-6.7 {location (y)} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -331,10 +341,11 @@ test grid-6.7 {location (y)} {
 	}
     }
     set result
-} {{-10->0 -1} {0->0 0} {101->0 1}}
-grid_reset 6.7
+} -cleanup {
+    grid_reset 6.7
+} -result {{-10->0 -1} {0->0 0} {101->0 1}}
 
-test grid-6.8 {location (weights)} {
+test grid-6.8 {location (weights)} -body {
     frame .f -width 300 -height 100 -highlightthickness 0 -bg red
     frame .a
     grid .a
@@ -354,10 +365,13 @@ test grid-6.8 {location (weights)} {
 	}
     }
     set result
-} {{-10->-1 -1} {0->0 0} {16->0 1} {201->1 1}}
-grid_reset 6.8
+} -cleanup {
+    grid_reset 6.8
+} -result {{-10->-1 -1} {0->0 0} {16->0 1} {201->1 1}}
 
-test grid-6.9 {location: check updates pending} {nonPortable} {
+test grid-6.9 {location: check updates pending} -constraints {
+	nonPortable
+} -body {
 	set a ""
 	foreach i {0 1 2} {
 	    frame .$i -width 120 -height 75 -bg red
@@ -365,35 +379,42 @@ test grid-6.9 {location: check updates pending} {nonPortable} {
 	    grid .$i -row $i -column $i
 	}
 	set a
-} {{0 0} {1 1} {1 1}}
-grid_reset 6.9
-
-test grid-7.1 {propagate} {
-    list [catch {grid propagate . 1 xxx} msg] $msg
-} {1 {wrong # args: should be "grid propagate window ?boolean?"}}
-grid_reset 7.1
-
-test grid-7.2 {propagate} {
-    list [catch {grid propagate .} msg] $msg
-} {0 1}
-grid_reset 7.2
-
-test grid-7.3 {propagate} {
-    list [catch {grid propagate . 0;grid propagate .} msg] $msg
-} {0 0}
-grid_reset 7.3
-
-test grid-7.4 {propagate} {
-    list [catch {grid propagate .x} msg] $msg
-} {1 {bad window path name ".x"}}
-grid_reset 7.4
-
-test grid-7.5 {propagate} {
-    list [catch {grid propagate . x} msg] $msg
-} {1 {expected boolean value but got "x"}}
-grid_reset 7.5
-
-test grid-7.6 {propagate} {
+} -cleanup {
+    grid_reset 6.9
+} -result {{0 0} {1 1} {1 1}}
+
+
+test grid-7.1 {propagate} -body {
+    grid propagate . 1 xxx
+} -cleanup {
+    grid_reset 7.1
+} -returnCodes error -result {wrong # args: should be "grid propagate window ?boolean?"}
+
+test grid-7.2 {propagate} -body {
+    grid propagate .
+} -cleanup {
+    grid_reset 7.2
+} -result {1}
+
+test grid-7.3 {propagate} -body {
+    grid propagate . 0;grid propagate .
+} -cleanup {
+    grid_reset 7.3
+} -result {0}
+
+test grid-7.4 {propagate} -body {
+    grid propagate .x
+} -cleanup {
+    grid_reset 7.4
+} -returnCodes error -result {bad window path name ".x"}
+
+test grid-7.5 {propagate} -body {
+    grid propagate . x
+} -cleanup {
+    grid_reset 7.5
+} -returnCodes error -result {expected boolean value but got "x"}
+
+test grid-7.6 {propagate} -body {
     frame .f -width 100 -height 100 -bg red
     grid .f -row 0 -column 0
     update
@@ -407,9 +428,10 @@ test grid-7.6 {propagate} {
     update
     lappend a [winfo width .f]x[winfo height .f]
     set a
-} {100x100 100x100 75x85}
-grid_reset 7.6
-test grid-7.7 {propagate} {
+} -cleanup {
+    grid_reset 7.6
+} -result {100x100 100x100 75x85}
+test grid-7.7 {propagate} -body {
     grid propagate . 1
     set res [list [grid propagate .]]
     grid propagate . 0
@@ -417,26 +439,31 @@ test grid-7.7 {propagate} {
     grid propagate . 0
     lappend res [grid propagate .]
     set res
-} [list 1 0 0]
-grid_reset 7.7
+} -cleanup {
+    grid_reset 7.7
+} -result [list 1 0 0]
+
 
-test grid-8.1 {size} {
-    list [catch {grid size . foo} msg] $msg
-} {1 {wrong # args: should be "grid size window"}}
-grid_reset 8.1
+test grid-8.1 {size} -body {
+    grid size . foo
+} -cleanup {
+    grid_reset 8.1
+} -returnCodes error -result {wrong # args: should be "grid size window"}
 
-test grid-8.2 {size} {
-    list [catch {grid size .x} msg] $msg
-} {1 {bad window path name ".x"}}
-grid_reset 8.2
+test grid-8.2 {size} -body {
+    grid size .x
+} -cleanup {
+    grid_reset 8.2
+} -returnCodes error -result {bad window path name ".x"}
 
-test grid-8.3 {size} {
+test grid-8.3 {size} -body {
     frame .f
-    list [catch {grid size .f} msg] $msg
-} {0 {0 0}}
-grid_reset 8.3
+    grid size .f
+} -cleanup {
+    grid_reset 8.3
+} -result {0 0}
 
-test grid-8.4 {size} {
+test grid-8.4 {size} -body {
     catch {unset a}
     scale .f
     grid .f -row 0 -column 0
@@ -452,10 +479,11 @@ test grid-8.4 {size} {
     update
     lappend a [grid size .]
     set a
-} {{1 1} {6 5} {664 948} {1 1}}
-grid_reset 8.4
+} -cleanup {
+    grid_reset 8.4
+} -result {{1 1} {6 5} {664 948} {1 1}}
 
-test grid-8.5 {size} {
+test grid-8.5 {size} -body {
     catch {unset a}
     scale .f
     grid .f -row 0 -column 0
@@ -472,10 +500,11 @@ test grid-8.5 {size} {
     update
     lappend a [grid size .]
     set a
-} {{1 1} {1 18} {64 18} {1 1}}
-grid_reset 8.5
+} -cleanup {
+    grid_reset 8.5
+} -result {{1 1} {1 18} {64 18} {1 1}}
 
-test grid-8.6 {size} {
+test grid-8.6 {size} -body {
     catch {unset a}
     scale .f
     grid .f -row 10 -column 50
@@ -498,55 +527,49 @@ test grid-8.6 {size} {
     update
     lappend a [grid size .]
     set a
-} {{51 11} {51 11} {31 11} {21 11} {16 1} {1 1}}
-grid_reset 8.6
-
-test grid-9.1 {slaves} {
-	list [catch {grid slaves .} msg] $msg
-} {0 {}}
-
-test grid-9.2 {slaves} {
-	list [catch {grid slaves .foo} msg] $msg
-} {1 {bad window path name ".foo"}}
-
-test grid-9.3 {slaves} {
-	list [catch {grid slaves a b} msg] $msg
-} {1 {wrong # args: should be "grid slaves window ?-option value ...?"}}
-
-test grid-9.4 {slaves} {
-	list [catch {grid slaves . a b} msg] $msg
-} {1 {bad option "a": must be -column or -row}}
-
-test grid-9.5 {slaves} {
-	list [catch {grid slaves . -column x} msg] $msg
-} {1 {expected integer but got "x"}}
-
-test grid-9.6 {slaves} {
-	list [catch {grid slaves . -row -3} msg] $msg
-} {1 {-row is an invalid value: should NOT be < 0}}
-
-test grid-9.7 {slaves} {
-	list [catch {grid slaves . -foo 3} msg] $msg
-} {1 {bad option "-foo": must be -column or -row}}
-
-test grid-9.8 {slaves} {
-	list [catch {grid slaves .x -row 3} msg] $msg
-} {1 {bad window path name ".x"}}
-
-test grid-9.9 {slaves} {
-	list [catch {grid slaves . -row 3} msg] $msg
-} {0 {}}
-
-test grid-9.10 {slaves} {
+} -cleanup {
+    grid_reset 8.6
+} -result {{51 11} {51 11} {31 11} {21 11} {16 1} {1 1}}
+
+
+test grid-9.1 {slaves} -body {
+	grid slaves .
+} -returnCodes ok -result {}
+test grid-9.2 {slaves} -body {
+	grid slaves .foo
+} -returnCodes error -result {bad window path name ".foo"}
+test grid-9.3 {slaves} -body {
+	grid slaves a b
+} -returnCodes error -result {wrong # args: should be "grid slaves window ?-option value ...?"}
+test grid-9.4 {slaves} -body {
+	grid slaves . a b
+} -returnCodes error -result {bad option "a": must be -column or -row}
+test grid-9.5 {slaves} -body {
+	grid slaves . -column x
+} -returnCodes error -result {expected integer but got "x"}
+test grid-9.6 {slaves} -body {
+	grid slaves . -row -3
+} -returnCodes error -result {-row is an invalid value: should NOT be < 0}
+test grid-9.7 {slaves} -body {
+	grid slaves . -foo 3
+} -returnCodes error -result {bad option "-foo": must be -column or -row}
+test grid-9.8 {slaves} -body {
+	grid slaves .x -row 3
+} -returnCodes error -result {bad window path name ".x"}
+test grid-9.9 {slaves} -body {
+	grid slaves . -row 3
+} -returnCodes ok -result {}
+test grid-9.10 {slaves} -body {
 	foreach i {0 1 2} {
 	    label .$i -text $i
 	    grid .$i -row $i -column $i
 	}
-	list [catch {grid slaves .} msg] $msg
-} {0 {.2 .1 .0}}
-grid_reset 9.10
+	grid slaves .
+} -cleanup {
+    grid_reset 9.10
+} -result {.2 .1 .0}
 
-test grid-9.11 {slaves} {
+test grid-9.11 {slaves} -body {
     catch {unset a}
     foreach i {0 1 2} {
 	label .$i -text $i
@@ -561,95 +584,112 @@ test grid-9.11 {slaves} {
 	lappend a $col{[grid slaves . -column $col]}
     }
     set a
-} {{0{.0-x .0}} {1{.1-x .1}} {2{.2-x .2}} 3{} 0{.0} {1{.1 .0-x}} {2{.2 .1-x}} 3{.2-x}} 
-grid_reset 9.11
+} -cleanup {
+    grid_reset 9.11
+} -result {{0{.0-x .0}} {1{.1-x .1}} {2{.2-x .2}} 3{} 0{.0} {1{.1 .0-x}} {2{.2 .1-x}} 3{.2-x}} 
 
-# column/row configure
 
-test grid-10.1 {column/row configure} {
-	list [catch {grid columnconfigure .} msg] $msg
-} {1 {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}}
-grid_reset 10.1
-
-test grid-10.2 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -weight 0 -pad} msg] $msg
-} {1 {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}}
-grid_reset 10.2
-
-test grid-10.3 {column/row configure} {
-	list [catch {grid columnconfigure .f 0 -weight} msg] $msg
-} {1 {bad window path name ".f"}}
-grid_reset 10.3
-
-test grid-10.4 {column/row configure} {
-	list [catch {grid columnconfigure . nine -weight} msg] $msg
-} {1 {expected integer but got "nine" (when retreiving options only integer indices are allowed)}}
-grid_reset 10.4
-
-test grid-10.5 {column/row configure} {
-	list [catch {grid columnconfigure . 265 -weight} msg] $msg
-} {0 0}
-grid_reset 10.5
-
-test grid-10.6 {column/row configure} {
-	list [catch {grid columnconfigure . 0} msg] $msg
-} {0 {-minsize 0 -pad 0 -uniform {} -weight 0}}
-grid_reset 10.6
-
-test grid-10.7 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -foo} msg] $msg
-} {1 {bad option "-foo": must be -minsize, -pad, -uniform, or -weight}}
-grid_reset 10.7
-
-test grid-10.8 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -minsize foo} msg] $msg
-} {1 {bad screen distance "foo"}}
-grid_reset 10.8
-
-test grid-10.9 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -minsize foo} msg] $msg
-} {1 {bad screen distance "foo"}}
-grid_reset 10.9
-
-test grid-10.10 {column/row configure} {
+# column/row configure
+test grid-10.1 {column/row configure} -body {
+	grid columnconfigure .
+} -cleanup {
+    grid_reset 10.1
+} -returnCodes error -result {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}
+
+test grid-10.2 {column/row configure} -body {
+	grid columnconfigure . 0 -weight 0 -pad
+} -cleanup {
+    grid_reset 10.2
+} -returnCodes error -result {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}
+
+test grid-10.3 {column/row configure} -body {
+	grid columnconfigure .f 0 -weight
+} -cleanup {
+    grid_reset 10.3
+} -returnCodes error -result {bad window path name ".f"}
+
+test grid-10.4 {column/row configure} -body {
+	grid columnconfigure . nine -weight
+} -cleanup {
+    grid_reset 10.4
+} -returnCodes error -result {expected integer but got "nine" (when retreiving options only integer indices are allowed)}
+
+test grid-10.5 {column/row configure} -body {
+	grid columnconfigure . 265 -weight
+} -cleanup {
+    grid_reset 10.5
+} -result {0}
+
+test grid-10.6 {column/row configure} -body {
+	grid columnconfigure . 0
+} -cleanup {
+    grid_reset 10.6
+} -result {-minsize 0 -pad 0 -uniform {} -weight 0}
+
+test grid-10.7 {column/row configure} -body {
+	grid columnconfigure . 0 -foo
+} -cleanup {
+    grid_reset 10.7
+} -returnCodes error -result {bad option "-foo": must be -minsize, -pad, -uniform, or -weight}
+
+test grid-10.8 {column/row configure} -body {
+	grid columnconfigure . 0 -minsize foo
+} -cleanup {
+    grid_reset 10.8
+} -returnCodes error -result {bad screen distance "foo"}
+
+test grid-10.9 {column/row configure} -body {
+	grid columnconfigure . 0 -minsize foo
+} -cleanup {
+    grid_reset 10.9
+} -returnCodes error -result {bad screen distance "foo"}
+
+test grid-10.10 {column/row configure} -body {
 	grid columnconfigure . 0 -minsize 10
 	grid columnconfigure . 0 -minsize
-} {10}
-grid_reset 10.10
-
-test grid-10.11 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -weight bad} msg] $msg
-} {1 {expected integer but got "bad"}}
-grid_reset 10.11
-
-test grid-10.12 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -weight -3} msg] $msg
-} {1 {invalid arg "-weight": should be non-negative}}
-grid_reset 10.12
-
-test grid-10.13 {column/row configure} {
+} -cleanup {
+    grid_reset 10.10
+} -result {10}
+
+test grid-10.11 {column/row configure} -body {
+	grid columnconfigure . 0 -weight bad
+} -cleanup {
+    grid_reset 10.11
+} -returnCodes error -result {expected integer but got "bad"}
+
+test grid-10.12 {column/row configure} -body {
+	grid columnconfigure . 0 -weight -3
+} -cleanup {
+    grid_reset 10.12
+} -returnCodes error -result {invalid arg "-weight": should be non-negative}
+
+test grid-10.13 {column/row configure} -body {
 	grid columnconfigure . 0 -weight 3
 	grid columnconfigure . 0 -weight
-} {3}
-grid_reset 10.13
-
-test grid-10.14 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -pad foo} msg] $msg
-} {1 {bad screen distance "foo"}}
-grid_reset 10.14
-
-test grid-10.15 {column/row configure} {
-	list [catch {grid columnconfigure . 0 -pad -3} msg] $msg
-} {1 {invalid arg "-pad": should be non-negative}}
-grid_reset 10.15
-
-test grid-10.16 {column/row configure} {
+} -cleanup {
+    grid_reset 10.13
+} -result {3}
+
+test grid-10.14 {column/row configure} -body {
+	grid columnconfigure . 0 -pad foo
+} -cleanup {
+    grid_reset 10.14
+} -returnCodes error -result {bad screen distance "foo"}
+
+test grid-10.15 {column/row configure} -body {
+	grid columnconfigure . 0 -pad -3
+} -cleanup {
+    grid_reset 10.15
+} -returnCodes error -result {invalid arg "-pad": should be non-negative}
+
+test grid-10.16 {column/row configure} -body {
 	grid columnconfigure . 0 -pad 3
 	grid columnconfigure . 0 -pad
-} {3}
-grid_reset 10.16
+} -cleanup {
+    grid_reset 10.16
+} -result {3}
 
-test grid-10.17 {column/row configure} {
+test grid-10.17 {column/row configure} -body {
 	frame .f
 	set a ""
 	grid columnconfigure .f 0 -weight 0
@@ -662,10 +702,11 @@ test grid-10.17 {column/row configure} {
 	lappend a [grid columnconfigure .f 0 -weight]
 	grid columnconfigure .f 0 -weight 0
 	set a
-} {0 1 0 1}
-grid_reset 10.17
+} -cleanup {
+    grid_reset 10.17
+} -result {0 1 0 1}
 
-test grid-10.18 {column/row configure} {
+test grid-10.18 {column/row configure} -body {
 	frame .f
 	grid columnconfigure .f {0 2} -minsize 10 -weight 1
 	list [grid columnconfigure .f 0 -minsize] \
@@ -674,32 +715,37 @@ test grid-10.18 {column/row configure} {
 		[grid columnconfigure .f 0 -weight] \
 		[grid columnconfigure .f 1 -weight] \
 		[grid columnconfigure .f 2 -weight]
-}  {10 0 10 1 0 1}
-grid_reset 10.18
+} -cleanup {
+    grid_reset 10.18
+} -result {10 0 10 1 0 1}
 
-test grid-10.19 {column/row configure} {
-	list [catch {grid columnconfigure . {0 -1 2} -weight 1} msg] $msg
-} {1 {grid columnconfigure: "-1" is out of range}}
-grid_reset 10.19
+test grid-10.19 {column/row configure} -body {
+	grid columnconfigure . {0 -1 2} -weight 1
+} -cleanup {
+    grid_reset 10.19
+} -returnCodes error -result {grid columnconfigure: "-1" is out of range}
 
-test grid-10.20 {column/row configure} {
+test grid-10.20 {column/row configure} -body {
 	grid columnconfigure . 0 -uniform foo
 	grid columnconfigure . 0 -uniform
-} {foo}
-grid_reset 10.20
+} -cleanup {
+    grid_reset 10.20
+} -result {foo}
 
-test grid-10.21 {column/row configure} {
-    list [catch {grid columnconfigure . .b -weight 1} msg] $msg
-} {1 {grid columnconfigure: illegal index ".b"}}
-grid_reset 10.21
+test grid-10.21 {column/row configure} -body {
+    grid columnconfigure . .b -weight 1
+} -cleanup {
+    grid_reset 10.21
+} -returnCodes error -result {grid columnconfigure: illegal index ".b"}
 
-test grid-10.22 {column/row configure} {
+test grid-10.22 {column/row configure} -body {
     button .b
-    list [catch {grid columnconfigure . .b -weight 1} msg] $msg
-} {1 {grid columnconfigure: the window ".b" is not managed by "."}}
-grid_reset 10.22
+    grid columnconfigure . .b -weight 1
+} -cleanup {
+    grid_reset 10.22
+} -returnCodes error -result {grid columnconfigure: the window ".b" is not managed by "."}
 
-test grid-10.23 {column/row configure} {
+test grid-10.23 {column/row configure} -body {
     button .b
     grid .b -column 1 -columnspan 2
     grid columnconfigure . .b -weight 1
@@ -708,10 +754,11 @@ test grid-10.23 {column/row configure} {
         lappend res [grid columnconfigure . $i -weight]
     }
     set res
-} {0 1 1 0}
-grid_reset 10.23
+} -cleanup {
+    grid_reset 10.23
+} -result {0 1 1 0}
 
-test grid-10.24 {column/row configure} {
+test grid-10.24 {column/row configure} -body {
     button .b
     button .c
     button .d
@@ -725,10 +772,11 @@ test grid-10.24 {column/row configure} {
         lappend res [grid columnconfigure . $i -weight]
     }
     set res
-} {0 1 2 2 2 1 0}
-grid_reset 10.24
+} -cleanup {
+    grid_reset 10.24
+} -result {0 1 2 2 2 1 0}
 
-test grid-10.25 {column/row configure} {
+test grid-10.25 {column/row configure} -body {
     button .b
     button .c
     button .d
@@ -742,46 +790,43 @@ test grid-10.25 {column/row configure} {
         lappend res [grid rowconfigure . $i -weight]
     }
     set res
-} {0 2 1 1 2 2 0 1}
-grid_reset 10.25
+} -cleanup {
+    grid_reset 10.25
+} -result {0 2 1 1 2 2 0 1}
 
-test grid-10.26 {column/row configure} {
+test grid-10.26 {column/row configure} -body {
     button .b
     grid columnconfigure .b 0
-} {-minsize 0 -pad 0 -uniform {} -weight 0}
-grid_reset 10.26
+} -cleanup {
+    grid_reset 10.26
+} -result {-minsize 0 -pad 0 -uniform {} -weight 0}
 
-test grid-10.30 {column/row configure - no indices} {
+test grid-10.27 {column/row configure - no indices} -body {
     # Bug 1422430
     set t [toplevel .test]
-    set res [list [catch {grid columnconfigure $t "" -weight 1} msg] $msg]
+    grid columnconfigure $t "" -weight 1
+} -cleanup {
     destroy $t
-    set res
-} {1 {no column indices specified}}
-
-test grid-10.31 {column/row configure - no indices} {
+} -returnCodes error -result {no column indices specified}
+test grid-10.28 {column/row configure - no indices} -body {
     set t [toplevel .test]
-    set res [list [catch {grid rowconfigure $t "" -weight 1} msg] $msg]
+    grid rowconfigure $t "" -weight 1
+} -cleanup {
     destroy $t
-    set res
-} {1 {no row indices specified}}
-
-test grid-10.32 {column/row configure - invalid indices} {
-    list [catch {grid columnconfigure . {0 1 2} -weight} msg] $msg
-} {1 {grid columnconfigure: must specify a single element on retrieval}}
-
-test grid-10.33 {column/row configure - invalid indices} {
-    list [catch {grid rowconfigure . {0 1 2} -weight} msg] $msg
-} {1 {grid rowconfigure: must specify a single element on retrieval}}
-
-test grid-10.34 {column/row configure - empty 'all' configure} {
+} -returnCodes error -result {no row indices specified}
+test grid-10.29 {column/row configure - invalid indices} -body {
+    grid columnconfigure . {0 1 2} -weight
+} -returnCodes error -result {grid columnconfigure: must specify a single element on retrieval}
+test grid-10.30 {column/row configure - invalid indices} -body {
+    grid rowconfigure . {0 1 2} -weight
+} -returnCodes error -result {grid rowconfigure: must specify a single element on retrieval}
+test grid-10.31 {column/row configure - empty 'all' configure} -body {
     # Bug 1422430
     set t [toplevel .test]
     grid rowconfigure $t all -weight 1
     destroy $t
-} {}
-
-test grid-10.35 {column/row configure} {
+} -result {}
+test grid-10.32 {column/row configure} -body {
     # Test that no lingering message is there
     frame .f
     set res    [grid columnconfigure .f all -weight 1]
@@ -793,20 +838,23 @@ test grid-10.35 {column/row configure} {
     append res [grid columnconfigure .f {2 .f.f} -weight 1]
     destroy .f
     set res
-} {}
-grid_reset 10.35
-
-test grid-10.36 {column/row configure} {
-    list [catch {grid columnconfigure . all} msg] $msg
-} {1 {expected integer but got "all" (when retreiving options only integer indices are allowed)}}
-grid_reset 10.36
-
-test grid-10.37 {column/row configure} {
-    list [catch {grid columnconfigure . 100000} msg] $msg
-} {0 {-minsize 0 -pad 0 -uniform {} -weight 0}}
-grid_reset 10.37
-
-test grid-10.38 {column/row configure} -body {
+} -cleanup {
+    grid_reset 10.35
+} -result {}
+
+test grid-10.33 {column/row configure} -body {
+    grid columnconfigure . all
+} -cleanup {
+    grid_reset 10.36
+} -returnCodes error -result {expected integer but got "all" (when retreiving options only integer indices are allowed)}
+
+test grid-10.34 {column/row configure} -body {
+    grid columnconfigure . 100000
+} -cleanup {
+    grid_reset 10.37
+} -result {-minsize 0 -pad 0 -uniform {} -weight 0}
+
+test grid-10.35 {column/row configure} -body {
     # This is a test for bug 1423666 where a column >= 10000 caused
     # a crash in layout.  The update is needed to reach the layout stage.
     # Test different combinations of row/column overflow
@@ -829,7 +877,7 @@ test grid-10.38 {column/row configure} -body {
 } 0 end]
 grid_reset 10.38
 
-test grid-10.39 {column/row configure} -body {
+test grid-10.36 {column/row configure} -body {
     # Additional tests for row/column overflow
     frame .f
     frame .g
@@ -851,38 +899,43 @@ test grid-10.39 {column/row configure} -body {
 } 0 end]
 grid_reset 10.39
 
-# auto-placement tests
 
-test grid-11.1 {default widget placement} {
-	list [catch {grid ^} msg] $msg
-} {1 {can't use '^', cant find master}}
-grid_reset 11.1
+# auto-placement tests
+test grid-11.1 {default widget placement} -body {
+	grid ^
+} -cleanup {
+    grid_reset 11.1
+} -returnCodes error -result {can't use '^', cant find master}
 
-test grid-11.2 {default widget placement} {
+test grid-11.2 {default widget placement} -body {
 	button .b
-	list [catch {grid .b ^} msg] $msg
-} {1 {can't find slave to extend with "^".}}
-grid_reset 11.2
+	grid .b ^
+} -cleanup {
+    grid_reset 11.2
+} -returnCodes error -result {can't find slave to extend with "^".}
 
-test grid-11.3 {default widget placement} {
+test grid-11.3 {default widget placement} -body {
 	button .b
-	list [catch {grid .b - - .c} msg] $msg
-} {1 {bad window path name ".c"}}
-grid_reset 11.3
+	grid .b - - .c
+} -cleanup {
+    grid_reset 11.3
+} -returnCodes error -result {bad window path name ".c"}
 
-test grid-11.4 {default widget placement} {
+test grid-11.4 {default widget placement} -body {
 	button .b
-	list [catch {grid .b - - = -} msg] $msg
-} {1 {invalid window shortcut, "=" should be '-', 'x', or '^'}}
-grid_reset 11.4
+	grid .b - - = -
+} -cleanup {
+    grid_reset 11.4
+} -returnCodes error -result {invalid window shortcut, "=" should be '-', 'x', or '^'}
 
-test grid-11.5 {default widget placement} {
+test grid-11.5 {default widget placement} -body {
 	button .b
-	list [catch {grid .b - x -} msg] $msg
-} {1 {Must specify window before shortcut '-'.}}
-grid_reset 11.5
+	grid .b - x -
+} -cleanup {
+    grid_reset 11.5
+} -returnCodes error -result {Must specify window before shortcut '-'.}
 
-test grid-11.6 {default widget placement} {
+test grid-11.6 {default widget placement} -body {
     foreach i {1 2 3 4 5 6} {
 	frame .f$i -width 50 -height 50 -highlightthickness 0 -bg red
     }
@@ -895,31 +948,35 @@ test grid-11.6 {default widget placement} {
 		[winfo width .f$i],[winfo height .f$i]"
     }
     set a
-} {{0,50  100,50} {150,50  50,50}}
-grid_reset 11.6
+} -cleanup {
+    grid_reset 11.6
+} -result {{0,50  100,50} {150,50  50,50}}
 
-test grid-11.7 {default widget placement} {
+test grid-11.7 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -row 5 -column 5
-    list [catch "grid .f x -" msg] $msg
-} {1 {Must specify window before shortcut '-'.}}
-grid_reset 11.7
+    grid .f x -
+} -cleanup {
+    grid_reset 11.7
+} -returnCodes error -result {Must specify window before shortcut '-'.}
 
-test grid-11.8 {default widget placement} {
+test grid-11.8 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -row 5 -column 5
-    list [catch "grid .f ^ -" msg] $msg
-} {1 {Must specify window before shortcut '-'.}}
-grid_reset 11.8
+    grid .f ^ -
+} -cleanup {
+    grid_reset 11.8
+} -returnCodes error -result {Must specify window before shortcut '-'.}
 
-test grid-11.9 {default widget placement} {
+test grid-11.9 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -row 5 -column 5
-    list [catch "grid .f x ^" msg] $msg
-} {1 {can't find slave to extend with "^".}}
-grid_reset 11.9
+    grid .f x ^
+} -cleanup {
+    grid_reset 11.9
+} -returnCodes error -result {can't find slave to extend with "^".}
 
-test grid-11.10 {default widget placement} {
+test grid-11.10 {default widget placement} -body {
     foreach i {1 2 3} {
 		frame .f$i -width 100 -height 50 -highlightthickness 0 -bg red
     }
@@ -932,10 +989,11 @@ test grid-11.10 {default widget placement} {
 		[winfo width .f$i],[winfo height .f$i]"
     }
     set a
-} {{0,0  100,50} {100,0  100,100} {0,50  100,50}}
-grid_reset 11.10
+} -cleanup {
+    grid_reset 11.10
+} -result {{0,0  100,50} {100,0  100,100} {0,50  100,50}}
 
-test grid-11.11 {default widget placement} {
+test grid-11.11 {default widget placement} -body {
     foreach i {1 2 3 4 5 6 7 8 9 10 11 12} {
 		frame .f$i -width 50 -height 50 -highlightthickness 1 -highlightbackground black
     }
@@ -951,10 +1009,11 @@ test grid-11.11 {default widget placement} {
 		[winfo width .f$i],[winfo height .f$i]"
     }
     set a
-} {{0,50  50,50} {50,50  100,150} {150,50  50,50} {0,100  50,50} {150,100  50,50} {0,150  50,50} {150,150  50,50} {0,200  200,50}}
-grid_reset 11.11
+} -cleanup {
+    grid_reset 11.11
+} -result {{0,50  50,50} {50,50  100,150} {150,50  50,50} {0,100  50,50} {150,100  50,50} {0,150  50,50} {150,150  50,50} {0,200  200,50}}
 
-test grid-11.12 {default widget placement} {
+test grid-11.12 {default widget placement} -body {
     foreach i {1 2 3 4} {
 		frame .f$i -width 75 -height 50 -highlightthickness 1 -highlightbackground black
     }
@@ -973,10 +1032,11 @@ test grid-11.12 {default widget placement} {
 			[winfo width .f$i],[winfo height .f$i]"
 	}
 	set a
-} {{0,0  75,50} {75,0  75,100} {150,0  75,50} {0,50  75,50} {0,0  75,50} {75,0  75,100} {150,0  75,100} {75,50  75,50}}
-grid_reset 11.12
+} -cleanup {
+    grid_reset 11.12
+} -result {{0,0  75,50} {75,0  75,100} {150,0  75,50} {0,50  75,50} {0,0  75,50} {75,0  75,100} {150,0  75,100} {75,50  75,50}}
 
-test grid-11.13 {default widget placement} {
+test grid-11.13 {default widget placement} -body {
     foreach i {1 2 3 4 5 6 7} {
 		frame .f$i -width 40 -height 50 -highlightthickness 1 -highlightbackground black
     }
@@ -989,10 +1049,11 @@ test grid-11.13 {default widget placement} {
 		[winfo width .f$i],[winfo height .f$i]"
     }
     set a
-} {{0,50  120,50} {120,50  80,50}}
-grid_reset 11.13
+} -cleanup {
+    grid_reset 11.13
+} -result {{0,50  120,50} {120,50  80,50}}
 
-test grid-11.14 {default widget placement} {
+test grid-11.14 {default widget placement} -body {
     foreach i {1 2 3} {
 	frame .f$i -width 60 -height 60 -highlightthickness 0 -bg red
     }
@@ -1005,10 +1066,11 @@ test grid-11.14 {default widget placement} {
 		[winfo width .f$i],[winfo height .f$i]"
     }
     set a
-} {{0,30  60,60} {60,0  60,60} {60,60  60,60}}
-grid_reset 11.14
+} -cleanup {
+    grid_reset 11.14
+} -result {{0,30  60,60} {60,0  60,60} {60,60  60,60}}
 
-test grid-11.15 {^ ^ test with multiple windows} {
+test grid-11.15 {^ ^ test with multiple windows} -body {
     foreach i {1 2 3 4} {
 	frame .f$i -width 50 -height 50 -bd 1 -relief solid
     }
@@ -1021,10 +1083,11 @@ test grid-11.15 {^ ^ test with multiple windows} {
 		[winfo width .f$i],[winfo height .f$i]"
     }
     set a
-} {{0,0 50,50} {50,0 50,100} {100,0 50,100} {0,50 50,50}}
-grid_reset 11.15
+} -cleanup {
+    grid_reset 11.15
+} -result {{0,0 50,50} {50,0 50,100} {100,0 50,100} {0,50 50,50}}
 
-test grid-11.16 {default widget placement} {
+test grid-11.16 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
     }
@@ -1035,10 +1098,11 @@ test grid-11.16 {default widget placement} {
     lappend res [winfo height .a]
     lappend res [winfo height .b]
     lappend res [winfo height .c]
-} {50 100 50}
-grid_reset 11.16
+} -cleanup {
+    grid_reset 11.16
+} -result {50 100 50}
 
-test grid-11.17 {default widget placement} {
+test grid-11.17 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
     }
@@ -1049,10 +1113,11 @@ test grid-11.17 {default widget placement} {
     lappend res [winfo height .a]
     lappend res [winfo height .b]
     lappend res [winfo height .c]
-} {100 50 100}
-grid_reset 11.17
+} -cleanup {
+    grid_reset 11.17
+} -result {100 50 100}
 
-test grid-11.18 {default widget placement} {
+test grid-11.18 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
     }
@@ -1065,10 +1130,11 @@ test grid-11.18 {default widget placement} {
     lappend res [winfo height .b]
     lappend res [winfo height .c]
     lappend res [winfo height .d]
-} {100 100 100 50}
-grid_reset 11.18
+} -cleanup {
+    grid_reset 11.18
+} -result {100 100 100 50}
 
-test grid-11.19 {default widget placement} {
+test grid-11.19 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
     }
@@ -1084,10 +1150,12 @@ test grid-11.19 {default widget placement} {
     lappend res [winfo height .b]
     lappend res [winfo height .c]
     lappend res [winfo height .d]
-} {50 100 100 50}
-grid_reset 11.19
+} -cleanup {
+    grid_reset 11.19
+} -result {50 100 100 50}
+
 
-test grid-12.1 {-sticky} {
+test grid-12.1 {-sticky} -body {
     catch {unset data}
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     set a ""
@@ -1103,7 +1171,9 @@ test grid-12.1 {-sticky} {
 	append a "($data(-sticky)) [winfo x .f] [winfo y .f] [winfo width .f] [winfo height .f]\n"
     }
     set a
-} {() 25 25 200 100
+} -cleanup {
+    grid_reset 12.1
+} -result {() 25 25 200 100
 (n) 25 0 200 100
 (s) 25 50 200 100
 (e) 50 25 200 100
@@ -1120,63 +1190,71 @@ test grid-12.1 {-sticky} {
 (new) 0 0 250 100
 (nesw) 0 0 250 150
 }
-grid_reset 12.1
    
-test grid-12.2 {-sticky} {
+test grid-12.2 {-sticky} -body {
     frame .f -bg red
-    list [catch "grid .f -sticky glue" msg] $msg
-} {1 {bad stickyness value "glue": must be a string containing n, e, s, and/or w}}
-grid_reset 12.2
+    grid .f -sticky glue
+} -cleanup {
+    grid_reset 12.2
+} -returnCodes error -result {bad stickyness value "glue": must be a string containing n, e, s, and/or w}
    
-test grid-12.3 {-sticky} {
+test grid-12.3 {-sticky} -body {
     frame .f -bg red
     grid .f -sticky {n,s,e,w}
     array set A [grid info .f]
     set A(-sticky)
-} {nesw}
-grid_reset 12.3
+} -cleanup {
+    grid_reset 12.3
+} -result {nesw}
 
-test grid-13.1 {-in} {
+
+test grid-13.1 {-in} -body {
     frame .f -bg red
-    list [catch "grid .f -in .f" msg] $msg
-} {1 {Window can't be managed in itself}}
-grid_reset 13.1
+    grid .f -in .f
+} -cleanup {
+    grid_reset 13.1
+} -returnCodes error -result {Window can't be managed in itself}
 
-test grid-13.1.1 {-in} {
+test grid-13.2 {-in} -body {
     frame .f -bg red
     list [winfo manager .f] \
          [catch {grid .f -in .f} err] $err \
          [winfo manager .f]
-} {{} 1 {Window can't be managed in itself} {}}
-grid_reset 13.1.1
+} -cleanup {
+    grid_reset 13.1.1
+} -result {{} 1 {Window can't be managed in itself} {}}
 
-test grid-13.2 {-in} {
+test grid-13.3 {-in} -body {
     frame .f -bg red
-    list [catch "grid .f -in .bad" msg] $msg
-} {1 {bad window path name ".bad"}}
-grid_reset 13.2
+    grid .f -in .bad
+} -cleanup {
+    grid_reset 13.2
+} -returnCodes error -result {bad window path name ".bad"}
 
-test grid-13.3 {-in} {
+test grid-13.4 {-in} -body {
     frame .f -bg red
     toplevel .top
-    list [catch "grid .f -in .top" msg] $msg
-} {1 {can't put .f inside .top}}
+    grid .f -in .top
+} -cleanup {
+    grid_reset 13.3
+} -returnCodes error -result {can't put .f inside .top}
 destroy .top
-grid_reset 13.3
 
-test grid-13.4 {-ipadx} {
+test grid-13.5 {-ipadx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -ipadx x" msg] $msg
-} {1 {bad ipadx value "x": must be positive screen distance}}
-grid_reset 13.4
+    grid .f -ipadx x
+} -cleanup {
+    grid_reset 13.4
+} -returnCodes error -result {bad ipadx value "x": must be positive screen distance}
 
-test grid-13.4.1 {-ipadx} {
+test grid-13.6 {-ipadx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -ipadx {5 5}" msg] $msg
-} {1 {bad ipadx value "5 5": must be positive screen distance}}
-grid_reset 13.4.1
+    grid .f -ipadx {5 5}
+} -cleanup {
+    grid_reset 13.4.1
+} -returnCodes error -result {bad ipadx value "5 5": must be positive screen distance}
 
-test grid-13.5 {-ipadx} {
+test grid-13.7 {-ipadx} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -1184,22 +1262,25 @@ test grid-13.5 {-ipadx} {
     grid .f -ipadx 1
     update
     list $a [winfo width .f]
-} {200 202}
-grid_reset 13.5
+} -cleanup {
+    grid_reset 13.5
+} -result {200 202}
 
-test grid-13.6 {-ipady} {
+test grid-13.8 {-ipady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -ipady x" msg] $msg
-} {1 {bad ipady value "x": must be positive screen distance}}
-grid_reset 13.6
+    grid .f -ipady x
+} -cleanup {
+    grid_reset 13.6
+} -returnCodes error -result {bad ipady value "x": must be positive screen distance}
 
-test grid-13.6.1 {-ipady} {
+test grid-13.9 {-ipady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -ipady {5 5}" msg] $msg
-} {1 {bad ipady value "5 5": must be positive screen distance}}
-grid_reset 13.6.1
+    grid .f -ipady {5 5}
+} -cleanup {
+    grid_reset 13.6.1
+} -returnCodes error -result {bad ipady value "5 5": must be positive screen distance}
 
-test grid-13.7 {-ipady} {
+test grid-13.10 {-ipady} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -1207,22 +1288,25 @@ test grid-13.7 {-ipady} {
     grid .f -ipady 1
     update
     list $a [winfo height .f]
-} {100 102}
-grid_reset 13.7
+} -cleanup {
+    grid_reset 13.7
+} -result {100 102}
 
-test grid-13.8 {-padx} {
+test grid-13.11 {-padx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -padx x" msg] $msg
-} {1 {bad pad value "x": must be positive screen distance}}
-grid_reset 13.8
+    grid .f -padx x
+} -cleanup {
+    grid_reset 13.8
+} -returnCodes error -result {bad pad value "x": must be positive screen distance}
 
-test grid-13.8.1 {-padx} {
+test grid-13.12 {-padx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -padx {10 x}" msg] $msg
-} {1 {bad 2nd pad value "x": must be positive screen distance}}
-grid_reset 13.8.1
+    grid .f -padx {10 x}
+} -cleanup {
+    grid_reset 13.8.1
+} -returnCodes error -result {bad 2nd pad value "x": must be positive screen distance}
 
-test grid-13.9 {-padx} {
+test grid-13.13 {-padx} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -1230,10 +1314,11 @@ test grid-13.9 {-padx} {
     grid .f -padx 1
     update
     list $a "[winfo width .f] [winfo width .] [winfo x .f]"
-} {{200 200} {200 202 1}}
-grid_reset 13.9
+} -cleanup {
+    grid_reset 13.9
+} -result {{200 200} {200 202 1}}
 
-test grid-13.9.1 {-padx} {
+test grid-13.14 {-padx} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -1241,22 +1326,25 @@ test grid-13.9.1 {-padx} {
     grid .f -padx {10 5}
     update
     list $a "[winfo width .f] [winfo width .] [winfo x .f]"
-} {{200 200} {200 215 10}}
-grid_reset 13.9.1
+} -cleanup {
+    grid_reset 13.9.1
+} -result {{200 200} {200 215 10}}
 
-test grid-13.10 {-pady} {
+test grid-13.15 {-pady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -pady x" msg] $msg
-} {1 {bad pad value "x": must be positive screen distance}}
-grid_reset 13.10
+    grid .f -pady x
+} -cleanup {
+    grid_reset 13.10
+} -returnCodes error -result {bad pad value "x": must be positive screen distance}
 
-test grid-13.10.1 {-pady} {
+test grid-13.16 {-pady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
-    list [catch "grid .f -pady {10 x}" msg] $msg
-} {1 {bad 2nd pad value "x": must be positive screen distance}}
-grid_reset 13.10.1
+    grid .f -pady {10 x}
+} -cleanup {
+    grid_reset 13.10.1
+} -returnCodes error -result {bad 2nd pad value "x": must be positive screen distance}
 
-test grid-13.11 {-pady} {
+test grid-13.17 {-pady} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -1264,10 +1352,11 @@ test grid-13.11 {-pady} {
     grid .f -pady 1
     update
     list $a "[winfo height .f] [winfo height .] [winfo y .f]"
-} {{100 100} {100 102 1}}
-grid_reset 13.11
+} -cleanup {
+    grid_reset 13.11
+} -result {{100 100} {100 102 1}}
 
-test grid-13.11.1 {-pady} {
+test grid-13.18 {-pady} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
     update
@@ -1275,10 +1364,11 @@ test grid-13.11.1 {-pady} {
     grid .f -pady {4 16}
     update
     list $a "[winfo height .f] [winfo height .] [winfo y .f]"
-} {{100 100} {100 120 4}}
-grid_reset 13.11.1
+} -cleanup {
+    grid_reset 13.11.1
+} -result {{100 100} {100 120 4}}
 
-test grid-13.12 {-ipad x and y} {
+test grid-13.19 {-ipad x and y} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid columnconfigure . 0 -minsize 150
     grid rowconfigure . 0 -minsize 100
@@ -1294,10 +1384,11 @@ test grid-13.12 {-ipad x and y} {
 	}
     }
     set a
-} { 0,0:,65,40,20,20 0,5:,65,35,20,30 5,0:,60,40,30,20 5,5:,60,35,30,30}
-grid_reset 13.12
+} -cleanup {
+    grid_reset 13.12
+} -result { 0,0:,65,40,20,20 0,5:,65,35,20,30 5,0:,60,40,30,20 5,5:,60,35,30,30}
 
-test grid-13.13 {reparenting} {
+test grid-13.20 {reparenting} -body {
     frame .1
     frame .2
     button .b
@@ -1311,10 +1402,12 @@ test grid-13.13 {reparenting} {
     lappend a [grid slaves .1],[grid slaves .2],$info(-in)
     unset info
     set a
-} {.b,,.1 ,.b,.2}
-grid_reset 13.13
+} -cleanup {
+    grid_reset 13.13
+} -result {.b,,.1 ,.b,.2}
+
 
-test grid-14.1 {structure notify} {
+test grid-14.1 {structure notify} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     frame .g -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f 
@@ -1328,10 +1421,11 @@ test grid-14.1 {structure notify} {
     lappend a "[winfo x .g],[winfo y .g] \
         [winfo width .g],[winfo height .g]"
     set a
-} {{0,0  200,100} {5,5  200,100}}
-grid_reset 14.1
+} -cleanup {
+    grid_reset 14.1
+} -result {{0,0  200,100} {5,5  200,100}}
 
-test grid-14.2 {structure notify} {
+test grid-14.2 {structure notify} -body {
     frame .f -width 200 -height 100 
     frame .f.g -width 200 -height 100 
     grid .f 
@@ -1342,10 +1436,13 @@ test grid-14.2 {structure notify} {
     .f config -bd 20
     update
     lappend a [grid bbox .],[grid bbox .f]
-} {{0 0 200 100,0 0 200 100} {0 0 240 140,20 20 200 100}}
-grid_reset 14.2
+} -cleanup {
+    grid_reset 14.2
+} -result {{0 0 200 100,0 0 200 100} {0 0 240 140,20 20 200 100}}
 
-test grid-14.3 {map notify: bug 1648} {nonPortable} {
+test grid-14.3 {map notify: bug 1648} -constraints {
+	nonPortable
+} -body {
     # This test is nonPortable because the number of times
     # A(.) will be incremented is unspecified--the behavior
     # is different accross window managers.
@@ -1364,10 +1461,12 @@ test grid-14.3 {map notify: bug 1648} {nonPortable} {
     update
     bind . <Configure> {}
     array get A
-} {.2 2 .0 1 . 2 .1 1}
-grid_reset 14.3
+} -cleanup {
+    grid_reset 14.3
+} -result {.2 2 .0 1 . 2 .1 1}
 
-test grid-15.1 {lost slave} {
+
+test grid-15.1 {lost slave} -body {
     button .b
     grid .b
     set a [grid slaves .]
@@ -1375,10 +1474,11 @@ test grid-15.1 {lost slave} {
     lappend a [grid slaves .]
     grid .b
     lappend a [grid slaves .]
-} {.b {} .b}
-grid_reset 15.1
+} -cleanup {
+    grid_reset 15.1
+} -result {.b {} .b}
 
-test grid-15.2 {lost slave} {
+test grid-15.2 {lost slave} -body {
     frame .f
     grid .f
     button .b
@@ -1388,10 +1488,12 @@ test grid-15.2 {lost slave} {
     lappend a [grid slaves .f]
     grid .b -in .f
     lappend a [grid slaves .f]
-} {.b {} .b}
-grid_reset 15.2
+} -cleanup {
+    grid_reset 15.2
+} -result {.b {} .b}
+
 
-test grid-16.1 {layout centering} {
+test grid-16.1 {layout centering} -body {
     foreach i {0 1 2} {
     	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1401,10 +1503,11 @@ test grid-16.1 {layout centering} {
     . configure -width 300 -height 250
     update
     grid bbox .
-} {37 50 225 150}
-grid_reset 16.1
+} -cleanup {
+    grid_reset 16.1
+} -result {37 50 225 150}
 
-test grid-16.2 {layout weights (expanding)} {
+test grid-16.2 {layout weights (expanding)} -body {
     foreach i {0 1 2} {
     	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1419,12 +1522,13 @@ test grid-16.2 {layout weights (expanding)} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
     set a
-} {120-75 167-100 213-125}
-grid_reset 16.2
+} -cleanup {
+    grid_reset 16.2
+} -result {120-75 167-100 213-125}
 
-test grid-16.3 {layout weights (shrinking)} {
+test grid-16.3 {layout weights (shrinking)} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
+    	frame .$i -bg gray -width 100 -height 75 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
     	grid rowconfigure . $i -weight [expr $i + 1]
     	grid columnconfigure . $i -weight [expr $i + 1]
@@ -1437,10 +1541,11 @@ test grid-16.3 {layout weights (shrinking)} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
     set a
-} {84-63 66-50 50-37}
-grid_reset 16.3
+} -cleanup {
+    grid_reset 16.3
+} -result {84-63 66-50 50-37}
 
-test grid-16.4 {layout weights (shrinking with minsize)} {
+test grid-16.4 {layout weights (shrinking with minsize)} -body {
     foreach i {0 1 2} {
     	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1455,10 +1560,11 @@ test grid-16.4 {layout weights (shrinking with minsize)} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
     set a
-} {70-60 65-45 65-45}
-grid_reset 16.4
+} -cleanup {
+    grid_reset 16.4
+} -result {70-60 65-45 65-45}
 
-test grid-16.5 {layout weights (shrinking at minsize)} {
+test grid-16.5 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
     	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1473,11 +1579,12 @@ test grid-16.5 {layout weights (shrinking at minsize)} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
     set a
-} {100-75 100-75 100-75}
-grid_reset 16.5
+} -cleanup {
+    grid_reset 16.5
+} -result {100-75 100-75 100-75}
 
 
-test grid-16.6 {layout weights (shrinking at minsize)} {
+test grid-16.6 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
     	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1492,10 +1599,17 @@ test grid-16.6 {layout weights (shrinking at minsize)} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
     set a
-} {69-52 69-52 69-52}
-grid_reset 16.6
-
-test grid-16.7 {layout weights (shrinking at minsize)} {
+} -cleanup {
+    grid_reset 16.6
+} -result {69-52 69-52 69-52}
+
+# test fails when run alone
+# reason (I think): -minsize 0 causes both: 
+# [winfo ismapped .$i] => 0 and 
+# not responding for width ang height settings, so that 
+# [winfo width .$i] [winfo height .$i] take different values
+# That doesn't happen if previous tests run
+test grid-16.7 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
     	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1503,17 +1617,18 @@ test grid-16.7 {layout weights (shrinking at minsize)} {
     grid propagate . 0
     grid columnconfigure . 1 -weight 1 -minsize 0
     grid rowconfigure . 1 -weight 1 -minsize 0
-    . configure -width 100 -height 75
+    . configure -width 100 -height 1
     set a ""
     update
     foreach i {0 1 2} {
 	lappend a [winfo width .$i]-[winfo height .$i]-[winfo ismapped .$i]
     }
     set a
-} {100-75-1 1-1-0 100-75-1}
-grid_reset 16.7
+} -cleanup {
+    grid_reset 16.7
+} -result {100-75-1 1-1-0 100-75-1}
 
-test grid-16.8 {layout internal constraints} {
+test grid-16.8 {layout internal constraints} -body {
     foreach i {0 1 2 3 4} {
     	frame .$i -bg gray  -width 30 -height 25 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1549,10 +1664,11 @@ test grid-16.8 {layout internal constraints} {
     	append a "[winfo x .$i] "
     }
     set a
-} {0 30 130 230 280 , 0 30 130 230 260 , 0 30 113 196 280 , 0 30 60 90 120 }
-grid_reset 16.8
+} -cleanup {
+    grid_reset 16.8
+} -result {0 30 130 230 280 , 0 30 130 230 260 , 0 30 113 196 280 , 0 30 60 90 120 }
 
-test grid-16.9 {layout uniform} {
+test grid-16.9 {layout uniform} -body {
     frame .f1 -width 75 -height 50
     frame .f2 -width 60 -height 25
     frame .f3 -width 95 -height 75
@@ -1566,10 +1682,11 @@ test grid-16.9 {layout uniform} {
     update
     list [grid bbox . 0 0] [grid bbox . 0 1] [grid bbox . 0 2] \
             [grid bbox . 0 3] [grid bbox . 0 4]
-} {{0 0 135 75} {0 75 135 100} {0 175 135 75} {0 250 135 100} {0 350 135 40}}
-grid_reset 16.9
+} -cleanup {
+    grid_reset 16.9
+} -result {{0 0 135 75} {0 75 135 100} {0 175 135 75} {0 250 135 100} {0 350 135 40}}
 
-test grid-16.10 {layout uniform} {
+test grid-16.10 {layout uniform} -body {
     grid [frame .f1 -width  75 -height  50] -row 0 -column 0
     grid [frame .f2 -width  60 -height  30] -row 1 -column 2
     grid [frame .f3 -width  95 -height  90] -row 2 -column 1
@@ -1587,10 +1704,11 @@ test grid-16.10 {layout uniform} {
     update
     list [grid bbox . 0 0] [grid bbox . 2 1] [grid bbox . 1 2] \
             [grid bbox . 4 3] [grid bbox . 3 4]
-} {{0 0 75 60} {170 60 150 30} {75 90 95 90} {390 180 140 100} {320 280 70 45}}
-grid_reset 16.10
+} -cleanup {
+    grid_reset 16.10
+} -result {{0 0 75 60} {170 60 150 30} {75 90 95 90} {390 180 140 100} {320 280 70 45}}
 
-test grid-16.11 {layout uniform (shrink)} {
+test grid-16.11 {layout uniform (shrink)} -body {
     frame .f1 -width 75 -height 50
     frame .f2 -width 100 -height 95
     grid .f1 .f2 -sticky news
@@ -1603,10 +1721,11 @@ test grid-16.11 {layout uniform (shrink)} {
     . configure -width 150 -height 95
     update
     lappend res [grid bbox . 0 0] [grid bbox . 1 0]
-} {{0 0 100 95} {100 0 100 95} {0 0 50 95} {50 0 100 95}}
-grid_reset 16.11
+} -cleanup {
+    grid_reset 16.11
+} -result {{0 0 100 95} {100 0 100 95} {0 0 50 95} {50 0 100 95}}
 
-test grid-16.12 {layout uniform (grow)} {
+test grid-16.12 {layout uniform (grow)} -body {
     frame .f1 -width 40 -height 50
     frame .f2 -width 50 -height 95
     frame .f3 -width 60 -height 50
@@ -1627,11 +1746,12 @@ test grid-16.12 {layout uniform (grow)} {
     update
     lappend res [grid bbox . 0 0] [grid bbox . 1 0]
     lappend res [grid bbox . 2 0] [grid bbox . 3 0]
-} [list {0 0 50 95} {50 0 50 95} {100 0 100 95} {200 0 70 95} \
+} -cleanup {
+    grid_reset 16.12
+} -result [list {0 0 50 95} {50 0 50 95} {100 0 100 95} {200 0 70 95} \
         {0 0 70 95} {70 0 50 95} {120 0 140 95} {260 0 90 95}]
-grid_reset 16.12
 
-test grid-16.13 {layout span} {
+test grid-16.13 {layout span} -body {
     frame .f1 -width 24 -height 20
     frame .f2 -width 38 -height 20
     frame .f3 -width 150 -height 20
@@ -1654,11 +1774,12 @@ test grid-16.13 {layout span} {
     set res
     # The last result below should ideally be 8 8 8 126 but the current
     # implementation is not exact enough.
-} [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 14 42 56 38 0] \
+} -cleanup {
+    grid_reset 16.13
+} -result [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 14 42 56 38 0] \
            [list 18 38 18 76 0] [list 7 8 9 126 0]]
-grid_reset 16.13
 
-test grid-16.14 {layout span} {
+test grid-16.14 {layout span} -body {
     frame .f1 -width 110 -height 20
     frame .f2 -width 38 -height 20
     frame .f3 -width 150 -height 20
@@ -1679,11 +1800,12 @@ test grid-16.14 {layout span} {
         lappend res $res2
     }
     set res
-} [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 14 42 56 38 0] \
+} -cleanup {
+    grid_reset 16.14
+} -result [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 14 42 56 38 0] \
            [list 27 55 28 40 0] [list 36 37 37 40 0]]
-grid_reset 16.14
 
-test grid-16.15 {layout span} {
+test grid-16.15 {layout span} -body {
     frame .f1 -width 24 -height 20
     frame .f2 -width 38 -height 20
     frame .f3 -width 150 -height 20
@@ -1704,11 +1826,12 @@ test grid-16.15 {layout span} {
         lappend res $res2
     }
     set res
-} [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 0 0 112 38 0] \
+} -cleanup {
+    grid_reset 16.15
+} -result [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 0 0 112 38 0] \
            [list 0 37 37 76 0] [list 0 12 12 126 0]]
-grid_reset 16.15
 
-test grid-16.16 {layout span} {
+test grid-16.16 {layout span} -body {
     frame .f1 -width 64 -height 20
     frame .f2 -width 38 -height 20
     frame .f3 -width 150 -height 20
@@ -1733,11 +1856,12 @@ test grid-16.16 {layout span} {
         lappend res $res2
     }
     set res
-} [list [list 30 34 43 43 0] [list 30 34 48 38 0] [list 22 42 48 38 0] \
+} -cleanup {
+    grid_reset 16.16
+} -result [list [list 30 34 43 43 0] [list 30 34 48 38 0] [list 22 42 48 38 0] \
            [list 25 39 29 57 0] [list 30 34 22 64 0]]
-grid_reset 16.16
 
-test grid-16.17 {layout weights (shrinking at minsize)} {
+test grid-16.17 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2 3} {
     	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1757,10 +1881,11 @@ test grid-16.17 {layout weights (shrinking at minsize)} {
 	lappend a [winfo width .$i]-[winfo height .$i]-[winfo ismapped .$i]
     }
     set a
-} {25-25-1 25-25-1 100-75-1 100-75-1 25-25-0 25-25-0 100-75-1 100-75-1}
-grid_reset 16.17
+} -cleanup {
+    grid_reset 16.17
+} -result {25-25-1 25-25-1 100-75-1 100-75-1 25-25-0 25-25-0 100-75-1 100-75-1}
 
-test grid-16.18 {layout span} {
+test grid-16.18 {layout span} -body {
     frame .f1 -width 30  -height 20
     frame .f2 -width 166 -height 20
     frame .f3 -width 39  -height 20
@@ -1783,10 +1908,12 @@ test grid-16.18 {layout span} {
         lappend res $res2
     }
     set res
-} [list [list 137 29 10] [list 30 136 10] [list 98 68 10]]
-grid_reset 16.18
+} -cleanup {
+    grid_reset 16.18
+} -result [list [list 137 29 10] [list 30 136 10] [list 98 68 10]]
+
 
-test grid-17.1 {forget and pending idle handlers} {
+test grid-17.1 {forget and pending idle handlers} -body {
     # This test is intended to detect a crash caused by a failure to remove
     # pending idle handlers when grid forget is invoked.
 
@@ -1807,9 +1934,10 @@ test grid-17.1 {forget and pending idle handlers} {
     grid .t.f.l
     destroy .t
     set result ok
-} ok
+} -result ok
 
-test grid-18.1 {test respect for internalborder} {
+
+test grid-18.1 {test respect for internalborder} -body {
     toplevel .pack
     wm geometry .pack 200x200
     frame .pack.l -width 15 -height 10
@@ -1826,8 +1954,8 @@ test grid-18.1 {test respect for internalborder} {
     lappend res [winfo geometry .pack.lf.f]
     destroy .pack
     set res
-} {196x188+2+10 177x186+5+7}
-test grid-18.2 {test support for minreqsize} {
+} -result {196x188+2+10 177x186+5+7}
+test grid-18.2 {test support for minreqsize} -body {
     toplevel .pack
     wm geometry .pack {}
     frame .pack.l -width 150 -height 100
@@ -1842,9 +1970,10 @@ test grid-18.2 {test support for minreqsize} {
     lappend res [winfo geometry .pack.lf]
     destroy .pack
     set res
-} {162x127+0+0 172x112+0+0}
+} -result {162x127+0+0 172x112+0+0}
+
 
-test grid-19.1 {uniform realloc} {
+test grid-19.1 {uniform realloc} -body {
     # Use a lot of uniform groups to test the reallocation mechanism
     for {set t 0} {$t < 100} {incr t 2} {
         frame .fa$t -width 5 -height 20
@@ -1854,55 +1983,65 @@ test grid-19.1 {uniform realloc} {
     }
     update
     grid bbox .
-} {0 0 600 20}
-grid_reset 19.1
+} -cleanup {
+    grid_reset 19.1
+} -result {0 0 600 20}
 
-test grid-20.1 {recalculate size after removal (destroy)} {
+
+test grid-20.1 {recalculate size after removal (destroy)} -body {
     label .l1 -text l1
     grid .l1 -row 2 -column 2
     destroy .l1
     label .l2 -text l2
     grid .l2
     grid size .
-} {1 1}
-grid_reset 20.1
+} -cleanup {
+    grid_reset 20.1
+} -result {1 1}
 
-test grid-20.2 {recalculate size after removal (forget)} {
+test grid-20.2 {recalculate size after removal (forget)} -body {
     label .l1 -text l1
     grid .l1 -row 2 -column 2
     grid forget .l1
     label .l2 -text l2
     grid .l2
     grid size .
-} {1 1}
-grid_reset 20.2
-
-test grid-21.1 {anchor} {
-    list [catch {grid anchor . 1 xxx} msg] $msg
-} {1 {wrong # args: should be "grid anchor window ?anchor?"}}
-grid_reset 21.1
-
-test grid-21.2 {anchor} {
-    list [catch {grid anchor .} msg] $msg
-} {0 nw}
-grid_reset 21.2
-
-test grid-21.3 {anchor} {
-    list [catch {grid anchor . se;grid anchor .} msg] $msg
-} {0 se}
-grid_reset 21.3
-
-test grid-21.4 {anchor} {
-    list [catch {grid anchor .x} msg] $msg
-} {1 {bad window path name ".x"}}
-grid_reset 21.4
-
-test grid-21.5 {anchor} {
-    list [catch {grid anchor . x} msg] $msg
-} {1 {bad anchor "x": must be n, ne, e, se, s, sw, w, nw, or center}}
-grid_reset 21.5
-
-test grid-21.6 {anchor} {
+} -cleanup {
+    grid_reset 20.2
+} -result {1 1}
+
+
+test grid-21.1 {anchor} -body {
+    grid anchor . 1 xxx
+} -cleanup {
+    grid_reset 21.1
+} -returnCodes error -result {wrong # args: should be "grid anchor window ?anchor?"}
+
+test grid-21.2 {anchor} -body {
+    grid anchor .
+} -cleanup {
+    grid_reset 21.2
+} -result {nw}
+
+test grid-21.3 {anchor} -body {
+    grid anchor . se;grid anchor .
+} -cleanup {
+    grid_reset 21.3
+} -result {se}
+
+test grid-21.4 {anchor} -body {
+    grid anchor .x
+} -cleanup {
+    grid_reset 21.4
+} -returnCodes error -result {bad window path name ".x"}
+
+test grid-21.5 {anchor} -body {
+    grid anchor . x
+} -cleanup {
+    grid_reset 21.5
+} -returnCodes error -result {bad anchor "x": must be n, ne, e, se, s, sw, w, nw, or center}
+
+test grid-21.6 {anchor} -body {
     foreach i {0 1 2} {
     	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
     	grid .$i -row $i -column $i -sticky nswe
@@ -1917,12 +2056,13 @@ test grid-21.6 {anchor} {
         lappend res [grid bbox .]
     }
     set res
-} [list {37 0 225 150} {75 0 225 150} {75 50 225 150} {75 100 225 150} \
+} -cleanup {
+    grid_reset 21.6
+} -result [list {37 0 225 150} {75 0 225 150} {75 50 225 150} {75 100 225 150} \
            {37 100 225 150} {0 100 225 150} {0 50 225 150} {0 0 225 150} \
            {37 50 225 150}]
-grid_reset 21.6
 
-test grid-21.7 {anchor} {
+test grid-21.7 {anchor} -body {
     # Test with a non-symmetric internal border.
     # This only tests vertically, there is currently no way to get
     # it assymetric horizontally.
@@ -1947,11 +2087,15 @@ test grid-21.7 {anchor} {
     }
     pack propagate . 1 ; wm geometry . {}
     set res
-} [list {37 20 225 150} {75 20 225 150} {75 60 225 150} {75 100 225 150} \
+} -cleanup {
+    grid_reset 21.7
+} -result [list {37 20 225 150} {75 20 225 150} {75 60 225 150} {75 100 225 150} \
            {37 100 225 150} {0 100 225 150} {0 60 225 150} {0 20 225 150} \
            {37 60 225 150}]
-grid_reset 21.7
 
 # cleanup
 cleanupTests
 return
+
+
+