Merge trunkcore-tk-print-fixes

1 files changed, 27 insertions, 8 deletions

diff --git a/tests/cmds.test b/tests/cmds.test
index 8a1ff2a..1fcf047 100644
--- a/tests/cmds.test
+++ b/tests/cmds.test
@@ -1,17 +1,36 @@
 # This file is a Tcl script to test the procedures in the file
-# tkCmds.c.  It is organized in the standard fashion for Tcl tests.
+# tkCmds.c.
 #
 # Copyright © 1996 Sun Microsystems, Inc.
 # Copyright © 1998-1999 Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.2
-eval tcltest::configure $argv
-tcltest::loadTestedCommands
-namespace import -force tcltest::test
+#
+# TESTFILE INITIALIZATION
+#
+
+package require tcltest 2.2; # needed in mode -singleproc 0
+
+# Load the main script main.tcl, which takes care of:
+# - setup for the application and the root window
+# - importing commands from the tcltest namespace
+# - loading of the testutils mechanism along with its utility procs
+# - loading of Tk specific test constraints (additionally to constraints
+#   provided by the package tcltest)
+source [file join [tcltest::configure -testdir] main.tcl]
 
+# Ensure a pristine initial window state
+resetWindows
+
+#
+# COMMON TEST SETUP
+#
 update
 
+#
+# TESTS
+#
+
 test cmds-1.1 {tkwait visibility, argument errors} -body {
     tkwait visibility
 } -returnCodes error -result {wrong # args: should be "tkwait variable|visibility|window name"}
@@ -53,8 +72,8 @@ test cmds-1.6 {tkwait visibility, window gets deleted} -setup {
     destroy .f
 } -result {deleted}
 
+#
+# TESTFILE CLEANUP
+#
 
-# cleanup
 cleanupTests
-return
-