Improved the tests a bit

2 files changed, 45 insertions, 36 deletions

diff --git a/tests/text.test b/tests/text.test
index 3ba85b7..563f61b 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -960,13 +960,25 @@ test text-11.10 {TextWidgetCmd procedure, "insert" option} {
     list [.t get 1.0 1.end] [.t tag ranges bold] [.t tag ranges silly]
 } {{First second} {1.0 1.5} {1.5 1.12}}
 
-test text-11a.1 {TextWidgetCmd procedure, "sync" option} {
+test text-11a.1 {TextWidgetCmd procedure, "sync" option} -setup {
     destroy .yt
+} -body {
     text .yt
     list [catch {.yt sync mytext} msg] $msg
-} {1 {wrong # args: should be ".yt sync ?-command command?"}}
-test text-11a.2 {TextWidgetCmd procedure, "sync" option} {
+} -cleanup {
+    destroy .yt
+} -result {1 {wrong # args: should be ".yt sync ?-command command?"}}
+test text-11a.2 {TextWidgetCmd procedure, "sync" option with -command} -setup {
+    destroy .yt
+} -body {
+    text .yt
+    list [catch {.yt sync -comx foo} msg] $msg
+} -cleanup {
+    destroy .yt
+} -result {1 {wrong option "-comx": should be "-command"}}
+test text-11a.3 {TextWidgetCmd procedure, "sync" option} -setup {
     destroy .top.yt .top
+} -body {
     toplevel .top
     pack [text .top.yt]
     set content {}
@@ -993,14 +1005,31 @@ test text-11a.2 {TextWidgetCmd procedure, "sync" option} {
     .top.yt yview moveto $fraction1
     set fraction2 [lindex [.top.yt yview] 0]
     lappend res [expr {$fraction1 == $fraction2}]
-} {1 0 1}
-test text-11a.11 {TextWidgetCmd procedure, "pendingsync" option} {
+} -cleanup {
+    destroy .top.yt .top
+} -result {1 0 1}
+test text-11a.4 {TextWidgetCmd procedure, "sync" option with -command} -setup {
+    destroy .yt
+} -body {
+    set ::x 0
+    pack [text .yt] -expand 1 -fill both
+    .yt sync -command [list set ::x 1]
+    set ::x
+} -cleanup {
+    destroy .yt
+} -result {1}
+
+test text-11a.11 {TextWidgetCmd procedure, "pendingsync" option} -setup {
     destroy .yt
+} -body {
     text .yt
     list [catch {.yt pendingsync mytext} msg] $msg
-} {1 {wrong # args: should be ".yt pendingsync"}}
-test text-11a.12 {TextWidgetCmd procedure, "pendingsync" option} {
+} -cleanup {
+    destroy .yt
+} -result {1 {wrong # args: should be ".yt pendingsync"}}
+test text-11a.12 {TextWidgetCmd procedure, "pendingsync" option} -setup {
     destroy .top.yt .top
+} -body {
     toplevel .top
     pack [text .top.yt]
     set content {}
@@ -1024,9 +1053,13 @@ test text-11a.12 {TextWidgetCmd procedure, "pendingsync" option} {
     .top.yt yview moveto $fraction1
     set fraction2 [lindex [.top.yt yview] 0]
     lappend res [expr {$fraction1 == $fraction2}]
-} {1 1 1}
-test text-11a.21 {"<<WidgetViewSync>>" event} {
+} -cleanup {
+    destroy .top.yt .top
+} -result {1 1 1}
+
+test text-11a.21 {"<<WidgetViewSync>>" event} -setup {
     destroy .top.yt .top
+} -body {
     toplevel .top
     pack [text .top.yt]
     set content {}
@@ -1052,7 +1085,9 @@ test text-11a.21 {"<<WidgetViewSync>>" event} {
     .top.yt yview moveto $fraction1
     set fraction2 [lindex [.top.yt yview] 0]
     lappend res [expr {$fraction1 == $fraction2}]
-} {1 1 1}
+} -cleanup {
+    destroy .top.yt .top
+} -result {1 1 1}
 
 # edit, mark, scan, search, see, tag, window, xview and yview actions are tested elsewhere.
 
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 80bdb9d..c8264e6 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4191,32 +4191,6 @@ test textDisp-34.1 {Line heights recalculation problem: bug 2677890} -setup {
     destroy .t1
 } -result {0}
 
-test textDisp-34.2 {text sync syntax} -body {
-} -body {
-    pack [text .t1] -expand 1 -fill both
-    .t1 sync foo
-} -cleanup {
-    destroy .t1
-} -returnCodes 1 -result {wrong # args: should be ".t1 sync ?-command command?"}
-
-test textDisp-34.3 {text sync syntax} -body {
-} -body {
-    pack [text .t1] -expand 1 -fill both
-    .t1 sync -comx foo
-} -cleanup {
-    destroy .t1
-} -returnCodes 1 -result {wrong option "-comx": should be "-command"}
-
-test textDisp-34.4 {text sync syntax} -body {
-} -body {
-    set ::x 0
-    pack [text .t1] -expand 1 -fill both
-    .t1 sync -comm [list set ::x 1]
-    set ::x
-} -cleanup {
-    destroy .t1
-} -result {1}
-
 deleteWindows
 option clear