Merge trunkcore-tk-print-fixes

1 files changed, 23 insertions, 7 deletions

diff --git a/tests/obj.test b/tests/obj.test
index 87e4a95..3f22d4f 100644
--- a/tests/obj.test
+++ b/tests/obj.test
@@ -1,14 +1,29 @@
 # This file is a Tcl script to test new object types in Tk.
-# 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
+#
+# 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 obj-1.1 {TkGetPixelsFromObj} -body {
 } -result {}
@@ -22,7 +37,8 @@ test obj-3.1 {DupPixelInternalRep} -body {
 test obj-4.1 {SetPixelFromAny} -body {
 } -result {}
 
+#
+# TESTFILE CLEANUP
+#
 
-# cleanup
 cleanupTests
-return