Much more cleaning up of result handling.

5 files changed, 25 insertions, 25 deletions

diff --git a/tests/embed.test b/tests/embed.test
index 8a29862..1fe73ef 100644
--- a/tests/embed.test
+++ b/tests/embed.test
@@ -33,7 +33,7 @@ test embed-1.3 {CreateFrame procedure, both -use and -container is invalid} -set
     toplevel .t -use [winfo id .container] -container 1
 } -cleanup {
     deleteWindows
-} -returnCodes error -result {A window cannot have both the -use and the -container option set.}
+} -returnCodes error -result {windows cannot have both the -use and the -container option set}
 
 # testing window embedding for win platforms
 test embed-1.4.win {TkpUseWindow procedure, -container must be set} -constraints {
diff --git a/tests/font.test b/tests/font.test
index 3a2568c..dff9fc9 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -76,7 +76,7 @@ test font-2.1 {TkFontPkgFree} -setup {
     lappend x [foo eval {catch {font families} msg; set msg}]
 } -cleanup {
         interp delete foo
-} -result {{named font "wiggles" doesn't exist} {can't invoke "font" command:  application has been destroyed}}
+} -result {{named font "wiggles" doesn't exist} {can't invoke "font" command: application has been destroyed}}
 
 
 test font-3.1 {font command: general} -body {
diff --git a/tests/frame.test b/tests/frame.test
index 35b9605..c7b0ed8 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -468,7 +468,7 @@ test frame-2.18 {toplevel configuration options} -setup {
     toplevel .x -container 1 -use [winfo id .t]
 } -cleanup {
     deleteWindows
-} -returnCodes error -result {A window cannot have both the -use and the -container option set.}
+} -returnCodes error -result {windows cannot have both the -use and the -container option set}
 test frame-2.19 {toplevel configuration options} -setup {
 	deleteWindows
     set opts {}
diff --git a/tests/grid.test b/tests/grid.test
index b27318e..0f0feeb 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -59,7 +59,7 @@ test grid-1.4 {basic argument checking} -body {
 	grid configure .b - foo
 } -cleanup {
     grid_reset 1.4
-} -returnCodes error -result {unexpected parameter, "foo", in configure list. Should be window name or option}
+} -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}
@@ -546,7 +546,7 @@ test grid-9.5 {slaves} -body {
 } -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}
+} -returnCodes error -result {-3 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}
@@ -865,12 +865,12 @@ test grid-10.35 {column/row configure} -body {
     lappend res [catch {grid .f -row 9998 -rowspan 2} msg] $msg ; update
     set res
 } -cleanup {destroy .f} -result [lrange {
-    1 {Column out of bounds}
-    1 {Row out of bounds}
-    1 {Column out of bounds}
-    1 {Row out of bounds}
-    1 {Column out of bounds}
-    1 {Row out of bounds}
+    1 {column out of bounds}
+    1 {row out of bounds}
+    1 {column out of bounds}
+    1 {row out of bounds}
+    1 {column out of bounds}
+    1 {row out of bounds}
 } 0 end]
 grid_reset 10.38
 
@@ -889,10 +889,10 @@ test grid-10.36 {column/row configure} -body {
     update
     set res
 } -cleanup {destroy .f .g} -result [lrange {
-    1 {Row out of bounds}
-    1 {Row out of bounds}
-    1 {Column out of bounds}
-    1 {Column out of bounds}
+    1 {row out of bounds}
+    1 {row out of bounds}
+    1 {column out of bounds}
+    1 {column out of bounds}
 } 0 end]
 grid_reset 10.39
 
@@ -909,7 +909,7 @@ test grid-11.2 {default widget placement} -body {
 	grid .b ^
 } -cleanup {
     grid_reset 11.2
-} -returnCodes error -result {can't find slave to extend with "^".}
+} -returnCodes error -result {can't find slave to extend with "^"}
 
 test grid-11.3 {default widget placement} -body {
 	button .b
@@ -930,7 +930,7 @@ test grid-11.5 {default widget placement} -body {
 	grid .b - x -
 } -cleanup {
     grid_reset 11.5
-} -returnCodes error -result {Must specify window before shortcut '-'.}
+} -returnCodes error -result {must specify window before shortcut '-'}
 
 test grid-11.6 {default widget placement} -body {
     foreach i {1 2 3 4 5 6} {
@@ -955,7 +955,7 @@ test grid-11.7 {default widget placement} -body {
     grid .f x -
 } -cleanup {
     grid_reset 11.7
-} -returnCodes error -result {Must specify window before shortcut '-'.}
+} -returnCodes error -result {must specify window before shortcut '-'}
 
 test grid-11.8 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
@@ -963,7 +963,7 @@ test grid-11.8 {default widget placement} -body {
     grid .f ^ -
 } -cleanup {
     grid_reset 11.8
-} -returnCodes error -result {Must specify window before shortcut '-'.}
+} -returnCodes error -result {must specify window before shortcut '-'}
 
 test grid-11.9 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
@@ -971,7 +971,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 slave to extend with "^"}
 
 test grid-11.10 {default widget placement} -body {
     foreach i {1 2 3} {
@@ -1210,7 +1210,7 @@ test grid-13.1 {-in} -body {
     grid .f -in .f
 } -cleanup {
     grid_reset 13.1
-} -returnCodes error -result {Window can't be managed in itself}
+} -returnCodes error -result {window can't be managed in itself}
 
 test grid-13.2 {-in} -body {
     frame .f -bg red
@@ -1219,7 +1219,7 @@ test grid-13.2 {-in} -body {
          [winfo manager .f]
 } -cleanup {
     grid_reset 13.1.1
-} -result {{} 1 {Window can't be managed in itself} {}}
+} -result {{} 1 {window can't be managed in itself} {}}
 
 test grid-13.3 {-in} -body {
     frame .f -bg red
diff --git a/tests/text.test b/tests/text.test
index f8cb3d7..5089bb1 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -1397,7 +1397,7 @@ abcdefghijklm
     .t replace 3.1 2.3 foo
 } -cleanup {
     destroy .t
-} -returnCodes {error} -result {Index "2.3" before "3.1" in the text}
+} -returnCodes {error} -result {index "2.3" before "3.1" in the text}
 test text-8.20 {TextWidgetCmd procedure, "replace" option} -setup {
     text .t
 } -body {
@@ -3705,7 +3705,7 @@ test text-22.1 {TextSearchCmd procedure, argument parsing} -body {
     .t search -
 } -cleanup {
     destroy .t
-} -returnCodes {error} -result {bad switch "-": must be --, -all, -backward, -count, -elide, -exact, -forward, -nocase, -nolinestop, -overlap, -regexp, or -strictlimits}
+} -returnCodes error -result {ambiguous switch "-": must be --, -all, -backwards, -count, -elide, -exact, -forwards, -nocase, -nolinestop, -overlap, -regexp, or -strictlimits}
 test text-22.2 {TextSearchCmd procedure, -backwards option} -body {
     text .t
     .t insert end "xxyz xyz x. the\nfoo -forward bar xxxxx BaR foo\nxyz xxyzx"
@@ -3769,7 +3769,7 @@ test text-22.10 {TextSearchCmd procedure, -n ambiguous option} -body {
     .t search -n BaR 1.1
 } -cleanup {
     destroy .t
-} -returnCodes {error} -result {bad switch "-n": must be --, -all, -backward, -count, -elide, -exact, -forward, -nocase, -nolinestop, -overlap, -regexp, or -strictlimits}
+} -returnCodes error -result {ambiguous switch "-n": must be --, -all, -backwards, -count, -elide, -exact, -forwards, -nocase, -nolinestop, -overlap, -regexp, or -strictlimits}
 test text-22.11 {TextSearchCmd procedure, -nocase option} -body {
     text .t
     .t insert end "xxyz xyz x. the\nfoo -forward bar xxxxx BaR foo\nxyz xxyzx"