* Completed conversion of Tk test suite to use tcltest.

1 files changed, 11 insertions, 14 deletions

diff --git a/tests/frame.test b/tests/frame.test
index 7e7746c..4acd84b 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -7,17 +7,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: frame.test,v 1.6 2001/09/26 21:36:19 pspjuth Exp $
+# RCS: @(#) $Id: frame.test,v 1.7 2002/07/14 05:48:46 dgp Exp $
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-foreach i [winfo children .] {
-    catch {destroy $i}
-}
-wm geometry . {}
-raise .
+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
 
 # eatColors --
 # Creates a toplevel window and allocates enough colors in it to
@@ -532,7 +529,7 @@ test frame-7.1 {FrameEventProc procedure} {
     lappend result [info commands .frame2]
 } {.frame2 {}}
 test frame-7.2 {FrameEventProc procedure} {
-    eval destroy [winfo children .]
+    deleteWindows
     frame .f1 -bg #543210
     rename .f1 .f2
     set x {}
@@ -543,13 +540,13 @@ test frame-7.2 {FrameEventProc procedure} {
 } {.f1 #543210 {} {}}
 
 test frame-8.1 {FrameCmdDeletedProc procedure} {
-    eval destroy [winfo children .]
+    deleteWindows
     frame .f1
     rename .f1 {}
     list [info command .f*] [winfo children .]
 } {{} {}}
 test frame-8.2 {FrameCmdDeletedProc procedure} {
-    eval destroy [winfo children .]
+    deleteWindows
     toplevel .f1 -menu .m
     wm geometry .f1 +0+0
     update
@@ -604,7 +601,7 @@ test frame-9.3 {MapFrame procedure, window deleted while mapping} {
 } {0}
 
 set l [interp hidden]
-eval destroy [winfo children .]
+deleteWindows
 
 test frame-10.1 {frame widget vs hidden commands} {
     catch {destroy .t}