Merge trunkcore-tk-print-fixes

1 files changed, 28 insertions, 11 deletions

diff --git a/tests/bgerror.test b/tests/bgerror.test
index eda8ba6..fc3611c 100644
--- a/tests/bgerror.test
+++ b/tests/bgerror.test
@@ -1,14 +1,34 @@
 # This file is a Tcl script to test the bgerror command.
-# It is organized in the standard fashion for Tcl tests.
 #
 # Copyright © 1997 Sun Microsystems, Inc.
 # Copyright © 1998-1999 Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.2
-namespace import ::tcltest::*
-eval tcltest::configure $argv
-tcltest::loadTestedCommands
+# NOTE
+#
+# Some testing of the default error dialog would be needed too, but that's
+# not easy at all to emulate.
+
+#
+# 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
+
+#
+# TESTS
+#
 
 test bgerror-1.1 {bgerror / tkerror compat} -setup {
     set errRes {}
@@ -57,11 +77,8 @@ test bgerror-1.3 {bgerror / tkerror compat / accumulation / break} -setup {
     catch {rename tkerror {}}
 } -result {err1}
 
+#
+# TESTFILE CLEANUP
+#
 
-# some testing of the default error dialog
-# would be needed too, but that's not easy at all
-# to emulate.
-
-# cleanup
 cleanupTests
-return