Updated to tk 8.4.1

[pf3gnuchains/sourceware.git] / tk / tests / raise.test

diff --git a/tk/tests/raise.test b/tk/tests/raise.test
index b0017ba..670213a 100644 (file)
--- a/tk/tests/raise.test
+++ b/tk/tests/raise.test
@@ -10,17 +10,14 @@
 #
 # RCS: @(#) $Id$
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
+package require tcltest 2.1
+namespace import -force tcltest::configure
+namespace import -force tcltest::testsDirectory
+configure -testdir [file join [pwd] [file dirname [info script]]]
+configure -loadfile [file join [testsDirectory] constraints.tcl]
+tcltest::loadTestedCommands
 
-if {[info commands testmakeexist] == {}} {
-    puts "This application hasn't been compiled with the \"testmakeexist\""
-    puts "command, so I can't run this test.  Are you sure you're using"
-    puts "tktest instead of wish?"
-    ::tcltest::cleanupTests
-    return
-}
+testConstraint testmakeexist [llength [info commands testmakeexist]]
 
 # Procedure to create a bunch of overlapping windows, which should
 # make it easy to detect differences in order.
@@ -58,9 +55,7 @@ proc raise_getOrder {} {
 # Procedure to set up a collection of top-level windows
 
 proc raise_makeToplevels {} {
-    foreach i [winfo child .] {
-       destroy $i
-    }
+    deleteWindows
     foreach i {.raise1 .raise2 .raise3} {
        toplevel $i
        wm geom $i 150x100+0+0
@@ -68,36 +63,33 @@ proc raise_makeToplevels {} {
     }
 }
 
-foreach i [winfo child .] {
-    destroy $i
-}
 toplevel .raise
 wm geom .raise 250x200+0+0
 
 test raise-1.1 {preserve creation order} {
     raise_setup
-    update
+    tkwait visibility .raise.e
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.2 {preserve creation order} {
+test raise-1.2 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.a
     update
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.3 {preserve creation order} {
+test raise-1.3 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.c
     update
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.4 {preserve creation order} {
+test raise-1.4 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.e
     update
     raise_getOrder
 } {d d d b c e e e}
-test raise-1.5 {preserve creation order} {
+test raise-1.5 {preserve creation order} testmakeexist {
     raise_setup
     testmakeexist .raise.d .raise.c .raise.b
     update
@@ -141,21 +133,21 @@ test raise-3.1 {raise internal windows after creation} {
     raise .raise.a .raise.d
     raise_getOrder
 } {a d d a c e e e}
-test raise-3.2 {raise internal windows after creation} {
+test raise-3.2 {raise internal windows after creation} testmakeexist {
     raise_setup
     testmakeexist .raise.a .raise.b
     raise .raise.a .raise.b
     update
     raise_getOrder
 } {d d d a c e e e}
-test raise-3.3 {raise internal windows after creation} {
+test raise-3.3 {raise internal windows after creation} testmakeexist {
     raise_setup
     testmakeexist .raise.a .raise.d
     raise .raise.a .raise.b
     update
     raise_getOrder
 } {d d d a c e e e}
-test raise-3.4 {raise internal windows after creation} {
+test raise-3.4 {raise internal windows after creation} testmakeexist {
     raise_setup
     testmakeexist .raise.a .raise.c .raise.d
     raise .raise.a .raise.b
@@ -295,9 +287,7 @@ test raise-7.8 {errors in raise/lower commands} {
     list [catch {lower . badName4} msg] $msg
 } {1 {bad window path name "badName4"}}
 
-foreach i [winfo child .] {
-    destroy $i
-}
+deleteWindows
 
 # cleanup
 ::tcltest::cleanupTests