* Converted several files in the Tk test suite for testing by

	tcltest 2.1.

1 files changed, 22 insertions, 31 deletions

diff --git a/tests/unixButton.test b/tests/unixButton.test
index 6604e36..6b1bcbb 100644
--- a/tests/unixButton.test
+++ b/tests/unixButton.test
@@ -8,25 +8,17 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixButton.test,v 1.3 1999/04/16 01:51:41 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {$tcl_platform(platform)!="unix"} {
-    puts "skipping: Unix only tests..."
-    ::tcltest::cleanupTests
-    return
-}
-
-if {[lsearch [image types] test] < 0} {
-    puts "This application hasn't been compiled with the \"test\""
-    puts "image, so I can't run this test.  Are you sure you're using"
-    puts "tktest instead of wish?"
-    ::tcltest::cleanupTests
-    return
-}
+# RCS: @(#) $Id: unixButton.test,v 1.4 2002/07/12 13:40:59 dgp Exp $
+
+package require tcltest 2.1
+namespace import -force tcltest::test
+namespace import -force tcltest::testConstraint
+namespace import -force tcltest::testsDirectory
+namespace import -force tcltest::configure
+configure -testdir [file join [pwd] [file dirname [info script]]]
+configure -loadfile [file join [testsDirectory] constraints.tcl]
+tcltest::loadTestedCommands
+eval configure $argv
 
 foreach i [winfo children .] {
     destroy $i
@@ -58,7 +50,6 @@ catch {unset value}
 catch {unset value2}
 
 eval image delete [image names]
-image create test image1
 label .l -text Label
 button .b -text Button
 checkbutton .c -text Checkbutton
@@ -66,7 +57,7 @@ radiobutton .r -text Radiobutton
 pack .l .b .c .r
 update
 
-test unixbutton-1.1 {TkpComputeButtonGeometry procedure} {
+test unixbutton-1.1 {TkpComputeButtonGeometry procedure} {unix testImageType} {
     eval destroy [winfo children .]
     image create test image1
     image1 changed 0 0 0 0 60 40
@@ -81,7 +72,7 @@ test unixbutton-1.1 {TkpComputeButtonGeometry procedure} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {68 48 74 54 112 52 112 52}
-test unixbutton-1.2 {TkpComputeButtonGeometry procedure} {
+test unixbutton-1.2 {TkpComputeButtonGeometry procedure} unix {
     eval destroy [winfo children .]
     label .b1 -bitmap question -bd 3 -padx 0 -pady 2
     button .b2 -bitmap question -bd 3 -padx 0 -pady 2
@@ -94,7 +85,7 @@ test unixbutton-1.2 {TkpComputeButtonGeometry procedure} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {23 33 29 39 54 37 54 37}
-test unixbutton-1.3 {TkpComputeButtonGeometry procedure} {
+test unixbutton-1.3 {TkpComputeButtonGeometry procedure} unix {
     eval destroy [winfo children .]
     label .b1 -bitmap question -bd 3 -highlightthickness 4
     button .b2 -bitmap question -bd 3 -highlightthickness 0
@@ -109,7 +100,7 @@ test unixbutton-1.3 {TkpComputeButtonGeometry procedure} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {31 41 25 35 25 35 25 35}
-test unixbutton-1.4 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
+test unixbutton-1.4 {TkpComputeButtonGeometry procedure} {unix nonPortable fonts} {
     eval destroy [winfo children .]
     label .b1 -text Xagqpim -padx 0 -pady 2 -font {Helvetica -18 bold}
     button .b2 -text Xagqpim -padx 0 -pady 2 -font {Helvetica -18 bold}
@@ -122,21 +113,21 @@ test unixbutton-1.4 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {82 29 88 35 114 31 121 29}
-test unixbutton-1.5 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
+test unixbutton-1.5 {TkpComputeButtonGeometry procedure} {unix nonPortable fonts} {
     eval destroy [winfo children .]
     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
     pack .l1
     update
     list [winfo reqwidth .l1] [winfo reqheight .l1]
 } {136 88}
-test unixbutton-1.6 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
+test unixbutton-1.6 {TkpComputeButtonGeometry procedure} {unix nonPortable fonts} {
     eval destroy [winfo children .]
     label .l1 -text "This is a long string without wrapping.\n\nIt also has a blank line (above)." -padx 0 -pady 0
     pack .l1
     update
     list [winfo reqwidth .l1] [winfo reqheight .l1]
 } {231 46}
-test unixbutton-1.7 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
+test unixbutton-1.7 {TkpComputeButtonGeometry procedure} {unix nonPortable fonts} {
     eval destroy [winfo children .]
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 -width 10
     button .b2 -text Xagqpim -bd 2 -padx 0 -pady 2 -height 5
@@ -149,7 +140,7 @@ test unixbutton-1.7 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {74 22 60 84 168 38 61 22}
-test unixbutton-1.8 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
+test unixbutton-1.8 {TkpComputeButtonGeometry procedure} {unix nonPortable fonts} {
     eval destroy [winfo children .]
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 \
 	-highlightthickness 4
@@ -165,17 +156,17 @@ test unixbutton-1.8 {TkpComputeButtonGeometry procedure} {nonPortable fonts} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {62 30 56 24 58 22 62 22}
-test unixbutton-1.9 {TkpComputeButtonGeometry procedure} {
+test unixbutton-1.9 {TkpComputeButtonGeometry procedure} unix {
     eval destroy [winfo children .]
     button .b2 -bitmap question -default active
     list [winfo reqwidth .b2] [winfo reqheight .b2]
 } {37 47}
-test unixbutton-1.10 {TkpComputeButtonGeometry procedure} {
+test unixbutton-1.10 {TkpComputeButtonGeometry procedure} unix {
     eval destroy [winfo children .]
     button .b2 -bitmap question -default normal
     list [winfo reqwidth .b2] [winfo reqheight .b2]
 } {37 47}
-test unixbutton-1.11 {TkpComputeButtonGeometry procedure} {
+test unixbutton-1.11 {TkpComputeButtonGeometry procedure} unix {
     eval destroy [winfo children .]
     button .b2 -bitmap question -default disabled
     list [winfo reqwidth .b2] [winfo reqheight .b2]