Update to tcltest2

1 files changed, 111 insertions, 60 deletions

diff --git a/tests/winButton.test b/tests/winButton.test
index 1ffcc2f..a383433 100644
--- a/tests/winButton.test
+++ b/tests/winButton.test
@@ -8,79 +8,93 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winButton.test,v 1.12 2007/05/11 12:10:19 patthoyts Exp $
+# RCS: @(#) $Id: winButton.test,v 1.13 2008/08/30 21:52:26 aniap Exp $
 
-package require tcltest 2.1
-eval tcltest::configure $argv
+package require tcltest 2.2
+namespace import ::tcltest::*
+tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
 proc bogusTrace args {
     error "trace aborted"
 }
-catch {unset value}
-catch {unset value2}
 option clear
 eval image delete [image names]
-if {[testConstraint testImageType]} {
-    image create test image1
-}
-label .l -text Label
-button .b -text Button
-checkbutton .c -text Checkbutton
-radiobutton .r -text Radiobutton
-pack .l .b .c .r
-update
 
-test winbutton-1.1 {TkpComputeButtonGeometry procedure} {testImageType win} {
+# ----------------------------------------------------------------------
+
+test winbutton-1.1 {TkpComputeButtonGeometry procedure} -constraints {
+    testImageType win
+} -setup {
     deleteWindows
+} -body {
     image create test image1
     image1 changed 0 0 0 0 60 40
     label .b1 -image image1 -bd 4 -padx 0 -pady 2
     button .b2 -image image1 -bd 4 -padx 0 -pady 2
-    checkbutton .b3 -image image1 -bd 4 -padx 1 -pady 1 -font {{MS Sans Serif} 8}
-    radiobutton .b4 -image image1 -bd 4 -padx 2 -pady 0 -font {{MS Sans Serif} 8}
+    checkbutton .b3 -image image1 -bd 4 -padx 1 -pady 1 \
+        -font {{MS Sans Serif} 8}
+    radiobutton .b4 -image image1 -bd 4 -padx 2 -pady 0 \
+        -font {{MS Sans Serif} 8}
     pack .b1 .b2 .b3 .b4
     update
     # with patch 463234 with native L&F enabled, this returns:
     # {68 48 70 50 88 50 88 50}
     list [winfo reqwidth .b1] [winfo reqheight .b1] \
-	    [winfo reqwidth .b2] [winfo reqheight .b2] \
-	    [winfo reqwidth .b3] [winfo reqheight .b3] \
-	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {68 48 70 50 90 52 90 52}
-test winbutton-1.2 {TkpComputeButtonGeometry procedure} win {
+        [winfo reqwidth .b2] [winfo reqheight .b2] \
+        [winfo reqwidth .b3] [winfo reqheight .b3] \
+        [winfo reqwidth .b4] [winfo reqheight .b4]
+} -cleanup {
     deleteWindows
+    image delete image1
+} -result {68 48 70 50 90 52 90 52}
+
+test winbutton-1.2 {TkpComputeButtonGeometry procedure} -constraints win -setup {
+    deleteWindows
+} -body {
     label .b1 -bitmap question -bd 3 -padx 0 -pady 2
     button .b2 -bitmap question -bd 3 -padx 0 -pady 2
-    checkbutton .b3 -bitmap question -bd 3 -padx 1 -pady 1 -font {{MS Sans Serif} 8}
-    radiobutton .b4 -bitmap question -bd 3 -padx 2 -pady 0 -font {{MS Sans Serif} 8}
+    checkbutton .b3 -bitmap question -bd 3 -padx 1 -pady 1 \
+        -font {{MS Sans Serif} 8}
+    radiobutton .b4 -bitmap question -bd 3 -padx 2 -pady 0 \
+        -font {{MS Sans Serif} 8}
     pack .b1 .b2 .b3 .b4
     update
     # with patch 463234 with native L&F enabled, this returns:
     # {23 33 25 35 43 35 43 35}
     list [winfo reqwidth .b1] [winfo reqheight .b1] \
-	    [winfo reqwidth .b2] [winfo reqheight .b2] \
-	    [winfo reqwidth .b3] [winfo reqheight .b3] \
-	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {23 33 25 35 45 37 45 37}
-test winbutton-1.3 {TkpComputeButtonGeometry procedure} win {
+        [winfo reqwidth .b2] [winfo reqheight .b2] \
+        [winfo reqwidth .b3] [winfo reqheight .b3] \
+        [winfo reqwidth .b4] [winfo reqheight .b4]
+} -cleanup {
     deleteWindows
+} -result {23 33 25 35 45 37 45 37}
+
+test winbutton-1.3 {TkpComputeButtonGeometry procedure} -constraints win -setup {
+    deleteWindows
+} -body {
     label .b1 -bitmap question -bd 3 -highlightthickness 4
     button .b2 -bitmap question -bd 3 -highlightthickness 0
     checkbutton .b3 -bitmap question -bd 3 -highlightthickness 1 \
-	    -indicatoron 0
+        -indicatoron 0
     radiobutton .b4 -bitmap question -bd 3 -indicatoron false
     pack .b1 .b2 .b3 .b4
     update
     # with patch 463234 with native L&F enabled, this returns:
     # {31 41 23 33 25 35 25 35}
     list [winfo reqwidth .b1] [winfo reqheight .b1] \
-	    [winfo reqwidth .b2] [winfo reqheight .b2] \
-	    [winfo reqwidth .b3] [winfo reqheight .b3] \
-	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {31 41 23 33 27 37 27 37}
-test winbutton-1.4 {TkpComputeButtonGeometry procedure} {win nonPortable} {
+        [winfo reqwidth .b2] [winfo reqheight .b2] \
+        [winfo reqwidth .b3] [winfo reqheight .b3] \
+        [winfo reqwidth .b4] [winfo reqheight .b4]
+} -cleanup {
+    deleteWindows
+} -result {31 41 23 33 27 37 27 37}
+
+test winbutton-1.4 {TkpComputeButtonGeometry procedure} -constraints {
+    win nonPortable
+} -setup {
     deleteWindows
+} -body {
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 -font {{MS Sans Serif} 8}
     button .b2 -text Xagqpim -bd 2 -padx 0 -pady 2 -font {{MS Sans Serif} 8}
     checkbutton .b3 -text Xagqpim -bd 2 -padx 1 -pady 1 -font {{MS Sans Serif} 8}
@@ -88,26 +102,46 @@ test winbutton-1.4 {TkpComputeButtonGeometry procedure} {win nonPortable} {
     pack .b1 .b2 .b3 .b4
     update
     list [winfo reqwidth .b1] [winfo reqheight .b1] \
-	    [winfo reqwidth .b2] [winfo reqheight .b2] \
-	    [winfo reqwidth .b3] [winfo reqheight .b3] \
-	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {58 24 67 33 88 30 90 28} 
-test winbutton-1.5 {TkpComputeButtonGeometry procedure} {win nonPortable} {
+        [winfo reqwidth .b2] [winfo reqheight .b2] \
+        [winfo reqwidth .b3] [winfo reqheight .b3] \
+        [winfo reqwidth .b4] [winfo reqheight .b4]
+} -cleanup {
+    deleteWindows
+} -result {58 24 67 33 88 30 90 28}
+
+test winbutton-1.5 {TkpComputeButtonGeometry procedure} -constraints {
+    win nonPortable
+} -setup {
     deleteWindows
-    label .l1 -text "This is a long string that will wrap around on several lines.\n\nIt also has a blank line (above)." -wraplength 1.5i -padx 0 -pady 0
+} -body {
+    label .l1 -wraplength 1.5i -padx 0 -pady 0 \
+        -text "This is a long string that will wrap around on several lines.\n\nIt also has a blank line (above)."
     pack .l1
     update
     list [winfo reqwidth .l1] [winfo reqheight .l1]
-} {178 84}
-test winbutton-1.6 {TkpComputeButtonGeometry procedure} {win nonPortable} {
+} -cleanup {
     deleteWindows
-    label .l1 -text "This is a long string without wrapping.\n\nIt also has a blank line (above)." -padx 0 -pady 0
+} -result {178 84}
+
+test winbutton-1.6 {TkpComputeButtonGeometry procedure} -constraints {
+    win nonPortable
+} -setup {
+    deleteWindows
+} -body {
+    label .l1 -padx 0 -pady 0 \
+        -text "This is a long string without wrapping.\n\nIt also has a blank line (above)."
     pack .l1
     update
     list [winfo reqwidth .l1] [winfo reqheight .l1]
-} {222 52}
-test winbutton-1.7 {TkpComputeButtonGeometry procedure} {win nonPortable} {
+} -cleanup {
+    deleteWindows
+} -result {222 52}
+
+test winbutton-1.7 {TkpComputeButtonGeometry procedure} -constraints {
+    win nonPortable
+} -setup {
     deleteWindows
+} -body {
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 -width 10
     button .b2 -text Xagqpim -bd 2 -padx 0 -pady 2 -height 5
     checkbutton .b3 -text Xagqpim -bd 2 -padx 1 -pady 1 -width 20 -height 2
@@ -115,33 +149,50 @@ test winbutton-1.7 {TkpComputeButtonGeometry procedure} {win nonPortable} {
     pack .b1 .b2 .b3 .b4
     update
     list [winfo reqwidth .b1] [winfo reqheight .b1] \
-	    [winfo reqwidth .b2] [winfo reqheight .b2] \
-	    [winfo reqwidth .b3] [winfo reqheight .b3] \
-	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {74 24 67 97 174 46 64 28}
-test winbutton-1.8 {TkpComputeButtonGeometry procedure} {win nonPortable} {
+        [winfo reqwidth .b2] [winfo reqheight .b2] \
+        [winfo reqwidth .b3] [winfo reqheight .b3] \
+        [winfo reqwidth .b4] [winfo reqheight .b4]
+} -cleanup {
+    deleteWindows
+} -result {74 24 67 97 174 46 64 28}
+
+test winbutton-1.8 {TkpComputeButtonGeometry procedure} -constraints {
+    win nonPortable
+} -setup {
     deleteWindows
+} -body {
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 \
-	-highlightthickness 4
+    -highlightthickness 4
     button .b2 -text Xagqpim -bd 2 -padx 0 -pady 2 \
-	-highlightthickness 0
+    -highlightthickness 0
     checkbutton .b3 -text Xagqpim -bd 2 -padx 1 -pady 1  \
-	-highlightthickness 1 -indicatoron no
+    -highlightthickness 1 -indicatoron no
     radiobutton .b4 -text Xagqpim -bd 2 -padx 2 -pady 0 -indicatoron 0
     pack .b1 .b2 .b3 .b4
     update
     list [winfo reqwidth .b1] [winfo reqheight .b1] \
-	    [winfo reqwidth .b2] [winfo reqheight .b2] \
-	    [winfo reqwidth .b3] [winfo reqheight .b3] \
-	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {66 32 65 31 69 31 71 29}
-test winbutton-1.9 {TkpComputeButtonGeometry procedure} win {
+        [winfo reqwidth .b2] [winfo reqheight .b2] \
+        [winfo reqwidth .b3] [winfo reqheight .b3] \
+        [winfo reqwidth .b4] [winfo reqheight .b4]
+} -cleanup {
     deleteWindows
+} -result {66 32 65 31 69 31 71 29}
+
+test winbutton-1.9 {TkpComputeButtonGeometry procedure} -constraints win -setup {
+    deleteWindows
+} -body {
     button .b2 -bitmap question -default normal
     list [winfo reqwidth .b2] [winfo reqheight .b2]
-} {23 33}
+} -cleanup {
+    deleteWindows
+} -result {23 33}
 
 # cleanup
 deleteWindows
 cleanupTests
 return
+
+# Local variables:
+# mode: tcl
+# End:
+