Update to tcltest2

1 files changed, 231 insertions, 116 deletions

diff --git a/tests/textMark.test b/tests/textMark.test
index d08b037..2942cba 100644
--- a/tests/textMark.test
+++ b/tests/textMark.test
@@ -6,22 +6,34 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textMark.test,v 1.10 2008/07/23 23:24:24 nijtmans Exp $
+# RCS: @(#) $Id: textMark.test,v 1.11 2008/08/28 08:52:06 aniap Exp $
 
-package require tcltest 2.1
+package require tcltest 2.2
+namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-catch {destroy .t}
+
+destroy .t
 text .t -width 20 -height 10
-testConstraint haveCourier12 [expr {[catch {
-    .t configure -font {Courier 12}
-}] == 0}]
 pack append . .t {top expand fill}
 update
 .t debug on
 wm geometry . {}
+entry .t.e
+
+.t insert 1.0 "Line 1
+abcdefghijklm
+12345
+Line 4
+bOy GIrl .#@? x_yz
+!@#$%
+Line 7"
   
+testConstraint haveCourier12 [expr {[catch {
+    .t configure -font {Courier 12}
+}] == 0}]
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
@@ -30,195 +42,298 @@ wm minsize . 1 1
 wm positionfrom . user
 wm deiconify .
 
-entry .t.e
-.t insert 1.0 "Line 1
-abcdefghijklm
-12345
-Line 4
-bOy GIrl .#@? x_yz
-!@#$%
-Line 7"
 
-test textMark-1.1 {TkTextMarkCmd - missing option} haveCourier12 {
-    list [catch {.t mark} msg] $msg
-} {1 {wrong # args: should be ".t mark option ?arg ...?"}}
-test textMark-1.2 {TkTextMarkCmd - bogus option} haveCourier12 {
-    list [catch {.t mark gorp} msg] $msg
-} {1 {bad mark option "gorp": must be gravity, names, next, previous, set, or unset}}
-test textMark-1.3 {TkTextMarkCmd - "gravity" option} haveCourier12 {
-    list [catch {.t mark gravity foo} msg] $msg
-} {1 {there is no mark named "foo"}}
-test textMark-1.4 {TkTextMarkCmd - "gravity" option} haveCourier12 {
-    .t mark unset x
+test textMark-1.1 {TkTextMarkCmd - missing option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark
+} -returnCodes error -result {wrong # args: should be ".t mark option ?arg ...?"}
+test textMark-1.2 {TkTextMarkCmd - bogus option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark gorp
+} -returnCodes error -result {bad mark option "gorp": must be gravity, names, next, previous, set, or unset}
+test textMark-1.3 {TkTextMarkCmd - "gravity" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark gravity foo
+} -returnCodes error -result {there is no mark named "foo"}
+test textMark-1.4 {TkTextMarkCmd - "gravity" option} -constraints {
+	haveCourier12 
+} -body {
     .t mark set x 1.3
     .t insert 1.3 x
     list [.t mark gravity x] [.t index x]
-} {right 1.4}
-test textMark-1.5 {TkTextMarkCmd - "gravity" option} haveCourier12 {
-    .t mark unset x
+} -result {right 1.4}
+test textMark-1.5 {TkTextMarkCmd - "gravity" option} -constraints {
+	haveCourier12 
+} -body {
     .t mark set x 1.3
     .t mark g x left
     .t insert 1.3 x
     list [.t mark gravity x] [.t index x]
-} {left 1.3}
-test textMark-1.6 {TkTextMarkCmd - "gravity" option} haveCourier12 {
-    .t mark unset x
+} -result {left 1.3}
+test textMark-1.6 {TkTextMarkCmd - "gravity" option} -constraints {
+	haveCourier12 
+} -body {
     .t mark set x 1.3
     .t mark gravity x right
     .t insert 1.3 x
     list [.t mark gravity x] [.t index x]
-} {right 1.4}
-test textMark-1.7 {TkTextMarkCmd - "gravity" option} haveCourier12 {
-    list [catch {.t mark gravity x gorp} msg] $msg
-} {1 {bad mark gravity "gorp": must be left or right}}
-test textMark-1.8 {TkTextMarkCmd - "gravity" option} haveCourier12 {
-    list [catch {.t mark gravity} msg] $msg
-} {1 {wrong # args: should be ".t mark gravity markName ?gravity?"}}
-
-test textMark-2.1 {TkTextMarkCmd - "names" option} haveCourier12 {
-    list [catch {.t mark names 2} msg] $msg
-} {1 {wrong # args: should be ".t mark names"}}
-.t mark unset x
-test textMark-2.2 {TkTextMarkCmd - "names" option} haveCourier12 {
+} -result {right 1.4}
+test textMark-1.7 {TkTextMarkCmd - "gravity" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark set x 1.3
+    .t mark gravity x gorp
+} -returnCodes error -result {bad mark gravity "gorp": must be left or right}
+test textMark-1.8 {TkTextMarkCmd - "gravity" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark gravity
+} -returnCodes error -result {wrong # args: should be ".t mark gravity markName ?gravity?"}
+
+
+test textMark-2.1 {TkTextMarkCmd - "names" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark names 2
+} -returnCodes error -result {wrong # args: should be ".t mark names"}
+test textMark-2.2 {TkTextMarkCmd - "names" option} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     lsort [.t mark na]
-} {current insert}
-test textMark-2.3 {TkTextMarkCmd - "names" option} haveCourier12 {
+} -result {current insert}
+test textMark-2.3 {TkTextMarkCmd - "names" option} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set a 1.1
     .t mark set "b c" 2.3
     lsort [.t mark names]
-} {a {b c} current insert}
-
-test textMark-3.1 {TkTextMarkCmd - "set" option} haveCourier12 {
-    list [catch {.t mark set a} msg] $msg
-} {1 {wrong # args: should be ".t mark set markName index"}}
-test textMark-3.2 {TkTextMarkCmd - "set" option} haveCourier12 {
-    list [catch {.t mark s a b c} msg] $msg
-} {1 {wrong # args: should be ".t mark set markName index"}}
-test textMark-3.3 {TkTextMarkCmd - "set" option} haveCourier12 {
-    list [catch {.t mark set a @x} msg] $msg
-} {1 {bad text index "@x"}}
-test textMark-3.4 {TkTextMarkCmd - "set" option} haveCourier12 {
+} -result {a {b c} current insert}
+
+
+test textMark-3.1 {TkTextMarkCmd - "set" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark set a
+} -returnCodes error -result {wrong # args: should be ".t mark set markName index"}
+test textMark-3.2 {TkTextMarkCmd - "set" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark s a b c
+} -returnCodes error -result {wrong # args: should be ".t mark set markName index"}
+test textMark-3.3 {TkTextMarkCmd - "set" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark set a @x
+} -returnCodes error -result {bad text index "@x"}
+test textMark-3.4 {TkTextMarkCmd - "set" option} -constraints {
+	haveCourier12 
+} -body {
     .t mark set a 1.2
     .t index a
-} 1.2
-test textMark-3.5 {TkTextMarkCmd - "set" option} haveCourier12 {
+} -result 1.2
+test textMark-3.5 {TkTextMarkCmd - "set" option} -constraints {
+	haveCourier12 
+} -body {
     .t mark set a end
     .t index a
-} {8.0}
+} -result {8.0}
 
-test textMark-4.1 {TkTextMarkCmd - "unset" option} haveCourier12 {
-    list [catch {.t mark unset} msg] $msg
-} {0 {}}
-test textMark-4.2 {TkTextMarkCmd - "unset" option} haveCourier12 {
+
+test textMark-4.1 {TkTextMarkCmd - "unset" option} -constraints {
+	haveCourier12 
+} -body {
+    .t mark unset
+} -returnCodes ok -result {}
+test textMark-4.2 {TkTextMarkCmd - "unset" option} -constraints {
+	haveCourier12 
+} -body {
     .t mark set a 1.2
     .t mark set b 2.3
     .t mark unset a b
-        list [catch {.t index a} msg] $msg [catch {.t index b} msg2] $msg2
-} {1 {bad text index "a"} 1 {bad text index "b"}}
-test textMark-4.3 {TkTextMarkCmd - "unset" option} haveCourier12 {
+    .t index a
+} -returnCodes error -result {bad text index "a"}
+test textMark-4.2 {TkTextMarkCmd - "unset" option} -constraints {
+    haveCourier12 
+} -body {
+    .t mark set a 1.2
+    .t mark set b 2.3
+    .t mark unset a b
+    .t index b
+} -returnCodes error -result {bad text index "b"}
+test textMark-4.3 {TkTextMarkCmd - "unset" option} -constraints {
+	haveCourier12 
+} -body {
     .t mark set a 1.2
     .t mark set b 2.3
     .t mark set 49ers 3.1
     eval .t mark unset [.t mark names]
     lsort [.t mark names]
-} {current insert}
+} -result {current insert}
+
+
+test textMark-5.1 {TkTextMarkCmd - miscellaneous} -constraints {
+	haveCourier12 
+} -body {
+    .t mark
+} -returnCodes error -result {wrong # args: should be ".t mark option ?arg ...?"}
+test textMark-5.2 {TkTextMarkCmd - miscellaneous} -constraints {
+	haveCourier12 
+} -body {
+    .t mark foo
+} -returnCodes error -result {bad mark option "foo": must be gravity, names, next, previous, set, or unset}
 
-test textMark-5.1 {TkTextMarkCmd - miscellaneous} haveCourier12 {
-    list [catch {.t mark} msg] $msg
-} {1 {wrong # args: should be ".t mark option ?arg ...?"}}
-test textMark-5.2 {TkTextMarkCmd - miscellaneous} haveCourier12 {
-    list [catch {.t mark foo} msg] $msg
-} {1 {bad mark option "foo": must be gravity, names, next, previous, set, or unset}}
 
-test textMark-6.1 {TkTextMarkSegToIndex} haveCourier12 {
+test textMark-6.1 {TkTextMarkSegToIndex} -constraints haveCourier12 -body {
     .t mark set a 1.2
     .t mark set b 1.2
     .t mark set c 1.2
     .t mark set d 1.4
     list [.t index a] [.t index b] [.t index c ] [.t index d]
-} {1.2 1.2 1.2 1.4}
-
-catch {eval {.t mark unset} [.t mark names]}
-test textMark-7.1 {MarkFindNext - invalid mark name} haveCourier12 {
-    catch {.t mark next bogus} x
-    set x
-} {bad text index "bogus"}
-test textMark-7.2 {MarkFindNext - marks at same location} haveCourier12 {
+} -result {1.2 1.2 1.2 1.4}
+
+
+test textMark-7.1 {MarkFindNext - invalid mark name} -constraints {
+	haveCourier12 
+} -body {
+    .t mark next bogus
+} -returnCodes error -result {bad text index "bogus"}
+test textMark-7.2 {MarkFindNext - marks at same location} -constraints {
+	haveCourier12 
+} -body {
     .t mark set insert 2.0
     .t mark set current 2.0
     .t mark next current
-} {insert}
-test textMark-7.3 {MarkFindNext - numerical starting mark} haveCourier12 {
+} -result {insert}
+test textMark-7.3 {MarkFindNext - numerical starting mark} -constraints {
+	haveCourier12 
+} -body {
     .t mark set current 1.0
     .t mark set insert 1.0
     .t mark next 1.0
-} {insert}
-test textMark-7.4 {MarkFindNext - mark on the same line} haveCourier12 {
+} -result {insert}
+test textMark-7.4 {MarkFindNext - mark on the same line} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.0
     .t mark set insert 1.1
     .t mark next current
-} {insert}
-test textMark-7.5 {MarkFindNext - mark on the next line} haveCourier12 {
+} -result {insert}
+test textMark-7.5 {MarkFindNext - mark on the next line} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.end
     .t mark set insert 2.0
     .t mark next current
-} {insert}
-test textMark-7.6 {MarkFindNext - mark far away} haveCourier12 {
+} -result {insert}
+test textMark-7.6 {MarkFindNext - mark far away} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.2
     .t mark set insert 7.0
     .t mark next current
-} {insert}
-test textMark-7.7 {MarkFindNext - mark on top of end} haveCourier12 {
+} -result {insert}
+test textMark-7.7 {MarkFindNext - mark on top of end} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current end
     .t mark next end
-} {current}
-test textMark-7.8 {MarkFindNext - no next mark} haveCourier12 {
+} -result {current}
+test textMark-7.8 {MarkFindNext - no next mark} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.0
     .t mark set insert 3.0
     .t mark next insert
-} {}
-test textMark-8.1 {MarkFindPrev - invalid mark name} haveCourier12 {
-    catch {.t mark prev bogus} x
-    set x
-} {bad text index "bogus"}
-test textMark-8.2 {MarkFindPrev - marks at same location} haveCourier12 {
+} -result {}
+
+
+test textMark-8.1 {MarkFindPrev - invalid mark name} -constraints {
+	haveCourier12 
+} -body {
+    .t mark prev bogus
+} -returnCodes error -result {bad text index "bogus"}
+test textMark-8.2 {MarkFindPrev - marks at same location} -constraints {
+	haveCourier12 
+} -body {
     .t mark set insert 2.0
     .t mark set current 2.0
     .t mark prev insert
-} {current}
-test textMark-8.3 {MarkFindPrev - numerical starting mark} haveCourier12 {
+} -result {current}
+test textMark-8.3 {MarkFindPrev - numerical starting mark} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.0
     .t mark set insert 1.0
     .t mark prev 1.1
-} {current}
-test textMark-8.4 {MarkFindPrev - mark on the same line} haveCourier12 {
+} -result {current}
+test textMark-8.4 {MarkFindPrev - mark on the same line} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.0
     .t mark set insert 1.1
     .t mark prev insert
-} {current}
-test textMark-8.5 {MarkFindPrev - mark on the previous line} haveCourier12 {
+} -result {current}
+test textMark-8.5 {MarkFindPrev - mark on the previous line} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.end
     .t mark set insert 2.0
     .t mark prev insert
-} {current}
-test textMark-8.6 {MarkFindPrev - mark far away} haveCourier12 {
+} -result {current}
+test textMark-8.6 {MarkFindPrev - mark far away} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.2
     .t mark set insert 7.0
     .t mark prev insert
-} {current}
-test textMark-8.7 {MarkFindPrev - mark on top of end} haveCourier12 {
+} -result {current}
+test textMark-8.7 {MarkFindPrev - mark on top of end} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set insert 3.0
     .t mark set current end
     .t mark prev end
-} {insert}
-test textMark-8.8 {MarkFindPrev - no previous mark} haveCourier12 {
+} -result {insert}
+test textMark-8.8 {MarkFindPrev - no previous mark} -constraints {
+	haveCourier12 
+} -setup {
+    .t mark unset {*}[.t mark names]
+} -body {
     .t mark set current 1.0
     .t mark set insert 3.0
     .t mark prev current
-} {}
+} -result {}
 
-catch {destroy .t}
+destroy .t
 
 # cleanup
 cleanupTests
 return
+