diff options
94 files changed, 292 insertions, 596 deletions
@@ -1,3 +1,9 @@ +2003-04-01 Don Porter <dgp@users.sourceforge.net> + + * tests/all.tcl: Made better use of a common + * tests/constraints.tcl: -loadfile to hold definitions + * tests/*.test: common to all test files. + 2003-03-27 Mo DeJong <mdejong@users.sourceforge.net> * unix/configure: Regen. diff --git a/tests/all.tcl b/tests/all.tcl index dbfe6c6..56d570f 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -9,11 +9,13 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: all.tcl,v 1.7 2002/07/14 05:48:45 dgp Exp $ +# RCS: @(#) $Id: all.tcl,v 1.8 2003/04/01 21:06:14 dgp Exp $ package require Tcl 8.4 package require tcltest 2.1 tcltest::configure -testdir [file join [pwd] [file dirname [info script]]] +tcltest::configure -loadfile \ + [file join [tcltest::testsDirectory] constraints.tcl] tcltest::configure -singleproc 1 eval tcltest::configure $argv tcltest::runAllTests diff --git a/tests/bell.test b/tests/bell.test index 3c0975b..59bfca6 100644 --- a/tests/bell.test +++ b/tests/bell.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-2000 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: bell.test,v 1.6 2002/07/14 05:48:45 dgp Exp $ +# RCS: @(#) $Id: bell.test,v 1.7 2003/04/01 21:06:15 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test bell-1.1 {bell command} { @@ -47,7 +44,7 @@ test bell-1.8 {bell command} { } {} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/bgerror.test b/tests/bgerror.test index dab97fd..e104980 100644 --- a/tests/bgerror.test +++ b/tests/bgerror.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: bgerror.test,v 1.4 2002/07/14 05:48:45 dgp Exp $ +# RCS: @(#) $Id: bgerror.test,v 1.5 2003/04/01 21:06:15 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test bgerror-1.1 {bgerror / tkerror compat} { @@ -59,7 +56,7 @@ catch {rename tkerror {}} # to emulate. # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/bind.test b/tests/bind.test index b7df78b..9ecee81 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: bind.test,v 1.11 2003/02/28 15:55:34 dkf Exp $ +# RCS: @(#) $Id: bind.test,v 1.12 2003/04/01 21:06:16 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands catch {destroy .b} @@ -2684,5 +2681,5 @@ test bind-31.2 {MouseWheel events} { destroy .b # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/bitmap.test b/tests/bitmap.test index bb5a50f..f81613d 100644 --- a/tests/bitmap.test +++ b/tests/bitmap.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: bitmap.test,v 1.3 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: bitmap.test,v 1.4 2003/04/01 21:06:17 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint testbitmap [llength [info commands testbitmap]] @@ -94,7 +91,7 @@ test bitmap-4.1 {FreeBitmapObjProc} testbitmap { destroy .t # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/border.test b/tests/border.test index 55df1e4..0bf08b8 100644 --- a/tests/border.test +++ b/tests/border.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: border.test,v 1.3 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: border.test,v 1.4 2003/04/01 21:06:17 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint testborder [llength [info commands testborder]] @@ -164,7 +161,7 @@ if {[testConstraint pseudocolor8]} { } # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/button.test b/tests/button.test index 794c7b4..a087238 100644 --- a/tests/button.test +++ b/tests/button.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: button.test,v 1.13 2002/09/02 23:32:35 hobbs Exp $ +# RCS: @(#) $Id: button.test,v 1.14 2003/04/01 21:06:17 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands proc bogusTrace args { @@ -808,5 +805,5 @@ deleteWindows option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/canvImg.test b/tests/canvImg.test index 94292d2..e848bf3 100644 --- a/tests/canvImg.test +++ b/tests/canvImg.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: canvImg.test,v 1.5 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: canvImg.test,v 1.6 2003/04/01 21:06:18 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands eval image delete [image names] @@ -392,7 +389,7 @@ test canvImg-11.3 {ImageChangedProc procedure} testImageType { } {{foo2 display 0 0 20 40 50 40}} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/canvPs.test b/tests/canvPs.test index 8ab93a0..0b8392c 100644 --- a/tests/canvPs.test +++ b/tests/canvPs.test @@ -6,18 +6,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: canvPs.test,v 1.5 2002/10/10 07:25:24 hobbs Exp $ +# RCS: @(#) $Id: canvPs.test,v 1.6 2003/04/01 21:06:18 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - canvas .c -width 400 -height 300 -bd 2 -relief sunken .c create rectangle 20 20 80 80 -fill red pack .c @@ -128,7 +122,7 @@ test canvPs-3.2 {test ps generation with an embedded window not mapped} {} { removeFile foo.ps removeFile bar.ps deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/canvRect.test b/tests/canvRect.test index fafbb17..a9918e1 100644 --- a/tests/canvRect.test +++ b/tests/canvRect.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: canvRect.test,v 1.6 2003/02/09 07:48:22 hobbs Exp $ +# RCS: @(#) $Id: canvRect.test,v 1.7 2003/04/01 21:06:18 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands canvas .c -width 400 -height 300 -bd 2 -relief sunken @@ -324,7 +321,7 @@ end } # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/canvText.test b/tests/canvText.test index 21f09a6..5d5acb9 100644 --- a/tests/canvText.test +++ b/tests/canvText.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: canvText.test,v 1.12 2003/02/09 07:48:22 hobbs Exp $ +# RCS: @(#) $Id: canvText.test,v 1.13 2003/04/01 21:06:19 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands canvas .c -width 400 -height 300 -bd 2 -relief sunken @@ -517,7 +514,7 @@ test canvText-18.1 {bug fix 2525, find enclosed on text with newlines} { } 1 # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/canvWind.test b/tests/canvWind.test index e8077cb..37e6e34 100644 --- a/tests/canvWind.test +++ b/tests/canvWind.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: canvWind.test,v 1.4 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: canvWind.test,v 1.5 2003/04/01 21:06:19 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test canvWind-1.1 {DisplayWinItem, windows off-screen vertically} { @@ -130,7 +127,7 @@ test canvWind-1.4 {DisplayWinItem, windows off-screen horizontally} { catch {destroy .t} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/canvas.test b/tests/canvas.test index ed470f9..5a2b5d3 100644 --- a/tests/canvas.test +++ b/tests/canvas.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-2000 Ajuba Solutions. # All rights reserved. # -# RCS: @(#) $Id: canvas.test,v 1.16 2003/02/09 07:48:22 hobbs Exp $ +# RCS: @(#) $Id: canvas.test,v 1.17 2003/04/01 21:06:19 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # XXX - This test file is woefully incomplete. At present, only a @@ -477,5 +474,5 @@ test canvas-16.1 {arc coords check} { destroy .c # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/choosedir.test b/tests/choosedir.test index e8da6a3..98831df 100644 --- a/tests/choosedir.test +++ b/tests/choosedir.test @@ -5,18 +5,13 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: choosedir.test,v 1.10 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: choosedir.test,v 1.11 2003/04/01 21:06:19 dgp Exp $ # 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::makeDirectory - #---------------------------------------------------------------------- # # Procedures needed by this test file @@ -150,5 +145,5 @@ test choosedir-5.1 "tk_chooseDirectory, handles {} entry text" {unixOnly} { } $real # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/clipboard.test b/tests/clipboard.test index ba937fc..2793aaf 100644 --- a/tests/clipboard.test +++ b/tests/clipboard.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: clipboard.test,v 1.6 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: clipboard.test,v 1.7 2003/04/01 21:06:20 dgp Exp $ # # Note: Multiple display clipboard handling will only be tested if the @@ -14,10 +14,7 @@ # 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # set up a very large buffer to test INCR retrievals @@ -245,7 +242,7 @@ test clipboard-7.16 {Tk_ClipboardCmd procedure} { } {0 {} -type} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/clrpick.test b/tests/clrpick.test index 77dce58..4e7d9c6 100644 --- a/tests/clrpick.test +++ b/tests/clrpick.test @@ -5,14 +5,11 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: clrpick.test,v 1.7 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: clrpick.test,v 1.8 2003/04/01 21:06:20 dgp Exp $ # 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test clrpick-1.1 {tk_chooseColor command} { @@ -215,5 +212,5 @@ test clrpick-4.1 {tk_chooseColor: screen is inherited from parent} unixOnly { } [winfo screen $parent] # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/cmds.test b/tests/cmds.test index 87871b3..7e1680c 100644 --- a/tests/cmds.test +++ b/tests/cmds.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: cmds.test,v 1.4 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: cmds.test,v 1.5 2003/04/01 21:06:20 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands update @@ -43,7 +40,7 @@ test cmds-1.5 {tkwait visibility, window gets deleted} { } {1 {window ".f.b" was deleted before its visibility changed} deleted} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/color.test b/tests/color.test index fec3748..1cf5d37 100644 --- a/tests/color.test +++ b/tests/color.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: color.test,v 1.6 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: color.test,v 1.7 2003/04/01 21:06:20 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint testcolor [llength [info commands testcolor]] @@ -272,5 +269,5 @@ test color-4.1 {FreeColorObjProc} colorsFree { destroy .t # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/config.test b/tests/config.test index df9c0c4..2822a21 100644 --- a/tests/config.test +++ b/tests/config.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: config.test,v 1.6 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: config.test,v 1.7 2003/04/01 21:06:20 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint testobjconfig [llength [info commands testobjconfig]] @@ -893,5 +890,5 @@ deleteWindows if {[testConstraint testobjconfig]} { killTables } -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/constraints.tcl b/tests/constraints.tcl index 3006cca..f8c7a59 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -175,6 +175,14 @@ cleanupbg eval tcltest::configure $argv namespace import -force tcltest::test +namespace import -force tcltest::makeFile +namespace import -force tcltest::removeFile +namespace import -force tcltest::makeDirectory +namespace import -force tcltest::removeDirectory +namespace import -force tcltest::interpreter +namespace import -force tcltest::testsDirectory +namespace import -force tcltest::cleanupTests +namespace import -force tcltest::bytestring deleteWindows wm geometry . {} diff --git a/tests/cursor.test b/tests/cursor.test index 054fb0d..861853f 100644 --- a/tests/cursor.test +++ b/tests/cursor.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: cursor.test,v 1.8 2002/09/03 00:22:37 hobbs Exp $ +# RCS: @(#) $Id: cursor.test,v 1.9 2003/04/01 21:06:22 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint testcursor [llength [info commands testcursor]] @@ -83,8 +80,8 @@ set wincur(data_binary) {} foreach wincur(num) $wincur(data_octal) { append wincur(data_binary) [binary format c 0$wincur(num)] } -set wincur(dir) [::tcltest::makeDirectory {dir with spaces}] -set wincur(file) [::tcltest::makeFile $wincur(data_binary) "test file.cur" $wincur(dir)] +set wincur(dir) [makeDirectory {dir with spaces}] +set wincur(file) [makeFile $wincur(data_binary) "test file.cur" $wincur(dir)] test cursor-2.3 {Tk_GetCursor procedure: cursor specs are lists} {pcOnly} { destroy .b1 button .b1 -cursor [list @$wincur(file)] @@ -93,7 +90,7 @@ test cursor-2.4 {Tk_GetCursor procedure: cursor specs are lists} {pcOnly} { destroy .b1 button .b1 -cursor @[regsub -all {[][ \\{}""$#]} $wincur(file) {\\&}] } {.b1} -::tcltest::removeDirectory $wincur(dir) +removeDirectory $wincur(dir) unset wincur test cursor-3.1 {Tk_FreeCursorFromObj - reference counts} {testcursor} { @@ -135,5 +132,5 @@ test cursor-4.1 {FreeCursorObjProc} {testcursor} { destroy .t # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/dialog.test b/tests/dialog.test index a10eb44..45e00f8 100644 --- a/tests/dialog.test +++ b/tests/dialog.test @@ -1,14 +1,11 @@ # This file is a Tcl script to test out Tk's "tk_dialog" command. # It is organized in the standard fashion for Tcl tests. # -# RCS: @(#) $Id: dialog.test,v 1.3 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: dialog.test,v 1.4 2003/04/01 21:06:22 dgp Exp $ # 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test dialog-1.1 {tk_dialog command} { @@ -60,5 +57,5 @@ test dialog-2.2 {tk_dialog operation} { set res } {-1} -tcltest::cleanupTests +cleanupTests return diff --git a/tests/embed.test b/tests/embed.test index 92a21b5..88a6a95 100644 --- a/tests/embed.test +++ b/tests/embed.test @@ -4,13 +4,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: embed.test,v 1.2 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: embed.test,v 1.3 2003/04/01 21:06:22 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test embed-1.1 {TkpUseWindow procedure, bad window identifier} { @@ -47,5 +44,5 @@ test embed-1.5 {TkpUseWindow procedure, -container must be set} { # FIXME: test cases common to unixEmbed.test and macEmbed.test should # be moved here. -tcltest::cleanupTests +cleanupTests return diff --git a/tests/entry.test b/tests/entry.test index 101a0c6..69480b8 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: entry.test,v 1.14 2003/02/25 00:46:41 hobbs Exp $ +# RCS: @(#) $Id: entry.test,v 1.15 2003/04/01 21:06:22 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands proc scroll args { @@ -1621,5 +1618,5 @@ destroy .e option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/event.test b/tests/event.test index 66fc029..c726d68 100644 --- a/tests/event.test +++ b/tests/event.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: event.test,v 1.13 2003/02/18 06:22:44 mdejong Exp $ +# RCS: @(#) $Id: event.test,v 1.14 2003/04/01 21:06:23 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # XXX This test file is woefully incomplete. Right now it only tests @@ -677,6 +674,6 @@ rename _pause {} rename _text_ind_to_x_y {} rename _get_selection {} -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/filebox.test b/tests/filebox.test index 6cd1937..e386022 100644 --- a/tests/filebox.test +++ b/tests/filebox.test @@ -6,19 +6,13 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: filebox.test,v 1.13 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: filebox.test,v 1.14 2003/04/01 21:06:23 dgp Exp $ # 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - set tk_strictMotif_old $tk_strictMotif #---------------------------------------------------------------------- @@ -400,5 +394,5 @@ foreach mode $modes { set tk_strictMotif $tk_strictMotif_old # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/focus.test b/tests/focus.test index 25cd932..37a0263 100644 --- a/tests/focus.test +++ b/tests/focus.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: focus.test,v 1.8 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: focus.test,v 1.9 2003/04/01 21:06:25 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands button .b -text .b -relief raised -bd 2 @@ -643,7 +640,7 @@ bind all <FocusIn> {} bind all <FocusOut> {} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/focusTcl.test b/tests/focusTcl.test index db064e0..11071ff 100644 --- a/tests/focusTcl.test +++ b/tests/focusTcl.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: focusTcl.test,v 1.5 2002/07/14 15:45:23 dgp Exp $ +# RCS: @(#) $Id: focusTcl.test,v 1.6 2003/04/01 21:06:28 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands proc setup1 w { @@ -279,7 +276,7 @@ bind Frame <Key> {} option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/font.test b/tests/font.test index f16d895..330f12e 100644 --- a/tests/font.test +++ b/tests/font.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: font.test,v 1.8 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: font.test,v 1.9 2003/04/01 21:06:29 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands catch {destroy .b} @@ -1363,7 +1360,7 @@ setup destroy .b # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/frame.test b/tests/frame.test index 4acd84b..5decf68 100644 --- a/tests/frame.test +++ b/tests/frame.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: frame.test,v 1.7 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: frame.test,v 1.8 2003/04/01 21:06:34 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # eatColors -- @@ -874,5 +871,5 @@ rename eatColors {} rename colorsFree {} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/geometry.test b/tests/geometry.test index 0f3fda3..77a2a93 100644 --- a/tests/geometry.test +++ b/tests/geometry.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: geometry.test,v 1.4 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: geometry.test,v 1.5 2003/04/01 21:06:34 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands wm geometry . 300x300 @@ -250,7 +247,7 @@ test geometry-4.10 {Tk_MaintainGeometry and Tk_UnmaintainGeometry} { catch {destroy .t} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/get.test b/tests/get.test index aae8010..c9c2e38 100644 --- a/tests/get.test +++ b/tests/get.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: get.test,v 1.3 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: get.test,v 1.4 2003/04/01 21:06:35 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands button .b @@ -79,7 +76,7 @@ test get-2.4 {Tk_GetJustifyFromObj - error} { } {1 {bad justification "stupid": must be left, right, or center}} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/grab.test b/tests/grab.test index 4ad8aea..d2ee4b2 100644 --- a/tests/grab.test +++ b/tests/grab.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-2000 by Ajuba Solutions. # All rights reserved. # -# RCS: @(#) $Id: grab.test,v 1.2 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: grab.test,v 1.3 2003/04/01 21:06:35 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # There's currently no way to test the actual grab effect, per se, @@ -181,5 +178,5 @@ test grab-5.2 {Tk_GrabObjCmd, grab set} { set result } [list "." "global"] -tcltest::cleanupTests +cleanupTests return diff --git a/tests/grid.test b/tests/grid.test index 47f99c0..bfbd1f6 100644 --- a/tests/grid.test +++ b/tests/grid.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: grid.test,v 1.18 2003/03/12 00:09:37 mdejong Exp $ +# RCS: @(#) $Id: grid.test,v 1.19 2003/04/01 21:06:36 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # helper routine to return "." to a sane state after a test @@ -1526,5 +1523,5 @@ test grid-20.2 {recalculate size after removal (forget)} { grid_reset 20.2 # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/id.test b/tests/id.test index 7e3f958..acc0712 100644 --- a/tests/id.test +++ b/tests/id.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: id.test,v 1.6 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: id.test,v 1.7 2003/04/01 21:06:36 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test id-1.1 {WindowIdCleanup, delaying window release} {unixOnly testwrapper} { @@ -92,7 +89,7 @@ test id-1.1 {WindowIdCleanup, delaying window release} {unixOnly testwrapper} { bind all <Destroy> {} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/image.test b/tests/image.test index dd5d3dd..45bc42d 100644 --- a/tests/image.test +++ b/tests/image.test @@ -7,19 +7,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: image.test,v 1.8 2003/01/22 14:32:59 dkf Exp $ +# RCS: @(#) $Id: image.test,v 1.9 2003/04/01 21:06:36 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::interpreter -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - eval image delete [image names] canvas .c -highlightthickness 2 pack .c @@ -384,5 +377,5 @@ destroy .c eval image delete [image names] # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/imgBmap.test b/tests/imgBmap.test index ff301c6..ebdaf07 100644 --- a/tests/imgBmap.test +++ b/tests/imgBmap.test @@ -7,18 +7,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: imgBmap.test,v 1.4 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: imgBmap.test,v 1.5 2003/04/01 21:06:37 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - set data1 {#define foo_width 16 #define foo_height 16 #define foo_x_hot 3 @@ -473,7 +467,7 @@ destroy .c eval image delete [image names] # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/imgPPM.test b/tests/imgPPM.test index 867f54a..20f224b 100644 --- a/tests/imgPPM.test +++ b/tests/imgPPM.test @@ -6,18 +6,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: imgPPM.test,v 1.5 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: imgPPM.test,v 1.6 2003/04/01 21:06:37 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - eval image delete [image names] proc put {file data} { @@ -155,7 +149,7 @@ removeFile test2.ppm eval image delete [image names] # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test index e2b4468..4a5eead 100644 --- a/tests/imgPhoto.test +++ b/tests/imgPhoto.test @@ -9,18 +9,12 @@ # # Author: Paul Mackerras (paulus@cs.anu.edu.au) # -# RCS: @(#) $Id: imgPhoto.test,v 1.15 2002/10/18 00:48:22 hobbs Exp $ +# RCS: @(#) $Id: imgPhoto.test,v 1.16 2003/04/01 21:06:37 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - eval image delete [image names] canvas .c @@ -666,5 +660,5 @@ eval image delete [image names] # cleanup removeFile README-imgPhoto -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/listbox.test b/tests/listbox.test index 37f5f30..dd686cc 100644 --- a/tests/listbox.test +++ b/tests/listbox.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: listbox.test,v 1.21 2003/02/25 02:07:25 hobbs Exp $ +# RCS: @(#) $Id: listbox.test,v 1.22 2003/04/01 21:06:37 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands set fixed {Courier -12} @@ -2150,5 +2147,5 @@ deleteWindows option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/macEmbed.test b/tests/macEmbed.test index fe68f21..8fb2bee 100644 --- a/tests/macEmbed.test +++ b/tests/macEmbed.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: macEmbed.test,v 1.8 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: macEmbed.test,v 1.9 2003/04/01 21:06:38 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test macEmbed-1.1 {TkpUseWindow procedure, bad window identifier} {macOnly} { @@ -252,7 +249,7 @@ test macEmbed-7.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} {macOn deleteWindows # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/macFont.test b/tests/macFont.test index 0ba293e..2afc946 100644 --- a/tests/macFont.test +++ b/tests/macFont.test @@ -10,13 +10,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: macFont.test,v 1.6 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: macFont.test,v 1.7 2003/04/01 21:06:38 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands catch {destroy .b} @@ -282,5 +279,5 @@ test macFont-9.4 {AllocMacFont: extract text metrics} {macOnly} { destroy .b # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/macMenu.test b/tests/macMenu.test index 2a36c60..ae38a49 100644 --- a/tests/macMenu.test +++ b/tests/macMenu.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: macMenu.test,v 1.7 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: macMenu.test,v 1.8 2003/04/01 21:06:39 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test macMenu-1.0 {TkMacUseMenuID} {macOnly} { @@ -1545,5 +1542,5 @@ test macMenu-45.1 {TkpMenuInit - called at boot time} {macOnly} { # cleanup deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/macWinMenu.test b/tests/macWinMenu.test index 315f2aa..935c365 100644 --- a/tests/macWinMenu.test +++ b/tests/macWinMenu.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: macWinMenu.test,v 1.4 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: macWinMenu.test,v 1.5 2003/04/01 21:06:41 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test macWinMenu-1.1 {PreprocessMenu} {macOrPc nonUnixUserInteraction} { @@ -88,7 +85,7 @@ test macWinMenu-2.1 {TkPreprocessMenu} {macOrPc nonUnixUserInteraction} { # cleanup deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/macscrollbar.test b/tests/macscrollbar.test index b62c65e..d3d9c6e 100644 --- a/tests/macscrollbar.test +++ b/tests/macscrollbar.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: macscrollbar.test,v 1.5 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: macscrollbar.test,v 1.6 2003/04/01 21:06:41 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands update @@ -91,5 +88,5 @@ test macscroll-1.7 {TkpDisplayScrollbar procedure} {macOnly} { deleteWindows # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/main.test b/tests/main.test index 0f25637..17fbaf9 100644 --- a/tests/main.test +++ b/tests/main.test @@ -8,19 +8,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: main.test,v 1.6 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: main.test,v 1.7 2003/04/01 21:06:41 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::interpreter -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - test main-1.1 {StdinProc} {unix} { set script [makeFile { close stdin; exit @@ -35,7 +28,7 @@ test main-1.1 {StdinProc} {unix} { } {0 {}} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/menu.test b/tests/menu.test index a9652bf..30d38dc 100644 --- a/tests/menu.test +++ b/tests/menu.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: menu.test,v 1.13 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: menu.test,v 1.14 2003/04/01 21:06:42 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test menu-1.1 {Tk_MenuCmd procedure} { @@ -2488,5 +2485,5 @@ test menu-35.1 {menus on multiple screens - crashes tk8.3.1, Bug 5454} \ # cleanup deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/menuDraw.test b/tests/menuDraw.test index d412a23..cfaf236 100644 --- a/tests/menuDraw.test +++ b/tests/menuDraw.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: menuDraw.test,v 1.5 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: menuDraw.test,v 1.6 2003/04/01 21:06:43 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test menuDraw-1.1 {TkMenuInitializeDrawingFields} { @@ -520,7 +517,7 @@ test menuDraw-17.2 {AdjustMenuCoords - menu} {pcOnly userInteraction} { # cleanup deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/menubut.test b/tests/menubut.test index 86db6ae..93153bc 100644 --- a/tests/menubut.test +++ b/tests/menubut.test @@ -6,17 +6,14 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: menubut.test,v 1.7 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: menubut.test,v 1.8 2003/04/01 21:06:45 dgp Exp $ # XXX This test file is woefully incomplete right now. If any part # XXX of a procedure has tests then the whole procedure has tests, # XXX but many procedures have no tests. 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Create entries in the option database to be sure that geometry options @@ -342,7 +339,7 @@ deleteWindows option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/message.test b/tests/message.test index a5f52e5..40daf6e 100644 --- a/tests/message.test +++ b/tests/message.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-2000 by Ajuba Solutions. # All rights reserved. # -# RCS: @(#) $Id: message.test,v 1.2 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: message.test,v 1.3 2003/04/01 21:06:46 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands option add *Message.borderWidth 2 @@ -121,5 +118,5 @@ test message-3.7 {MessageWidgetObjCmd procedure, "configure"} { } {4} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/msgbox.test b/tests/msgbox.test index a20d787..fb07c80 100644 --- a/tests/msgbox.test +++ b/tests/msgbox.test @@ -5,14 +5,11 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: msgbox.test,v 1.6 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: msgbox.test,v 1.7 2003/04/01 21:06:47 dgp Exp $ # 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test msgbox-1.1 {tk_messageBox command} { @@ -181,5 +178,5 @@ test msgbox-3.2 {tk_messageBox handles iconified parent} {nonUnixUserInteraction wm deiconify . # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/obj.test b/tests/obj.test index bc4618e..9778b2e 100644 --- a/tests/obj.test +++ b/tests/obj.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: obj.test,v 1.3 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: obj.test,v 1.4 2003/04/01 21:06:47 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test obj-1.1 {TkGetPixelsFromObj} { @@ -31,7 +28,7 @@ test obj-4.1 {SetPixelFromAny} { deleteWindows # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/oldpack.test b/tests/oldpack.test index 52e2d4e..33a2719 100644 --- a/tests/oldpack.test +++ b/tests/oldpack.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: oldpack.test,v 1.5 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: oldpack.test,v 1.6 2003/04/01 21:06:48 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # First, test a single window packed in various ways in a parent @@ -510,7 +507,7 @@ test pack-9.3 {information output} { catch {destroy .pack} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/option.test b/tests/option.test index 173ec37..7ddaa96 100644 --- a/tests/option.test +++ b/tests/option.test @@ -6,18 +6,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: option.test,v 1.4 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: option.test,v 1.5 2003/04/01 21:06:48 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - catch {destroy .op1} catch {destroy .op2} set appName [winfo name .] @@ -231,7 +225,7 @@ catch {destroy .op1} catch {destroy .op2} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/pack.test b/tests/pack.test index c4af29f..cb514e7 100644 --- a/tests/pack.test +++ b/tests/pack.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: pack.test,v 1.11 2003/03/12 00:09:40 mdejong Exp $ +# RCS: @(#) $Id: pack.test,v 1.12 2003/04/01 21:06:48 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Utility procedures: @@ -1111,5 +1108,5 @@ foreach i {pack1 pack2 pack3 pack4} { } # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/panedwindow.test b/tests/panedwindow.test index e073d4a..0da6bbc 100644 --- a/tests/panedwindow.test +++ b/tests/panedwindow.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: panedwindow.test,v 1.8 2003/02/21 11:48:56 dkf Exp $ +# RCS: @(#) $Id: panedwindow.test,v 1.9 2003/04/01 21:06:49 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands set i 1 @@ -2476,5 +2473,5 @@ test panedwindow-30.1 {display on depths other than the default one} { } # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/place.test b/tests/place.test index 10e45b7..847047c 100644 --- a/tests/place.test +++ b/tests/place.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: place.test,v 1.9 2003/03/12 00:09:40 mdejong Exp $ +# RCS: @(#) $Id: place.test,v 1.10 2003/04/01 21:06:49 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # XXX - This test file is woefully incomplete. At present, only a @@ -386,5 +383,5 @@ test place-13.1 {test respect for internalborder} { catch {destroy .t} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/raise.test b/tests/raise.test index 53bf9b3..bcf3573 100644 --- a/tests/raise.test +++ b/tests/raise.test @@ -8,13 +8,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: raise.test,v 1.7 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: raise.test,v 1.8 2003/04/01 21:06:50 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint testmakeexist [llength [info commands testmakeexist]] @@ -290,7 +287,7 @@ test raise-7.8 {errors in raise/lower commands} { deleteWindows # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/safe.test b/tests/safe.test index 060a1e1..3dea901 100644 --- a/tests/safe.test +++ b/tests/safe.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: safe.test,v 1.10 2002/09/02 19:16:24 hobbs Exp $ +# RCS: @(#) $Id: safe.test,v 1.11 2003/04/01 21:06:50 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands ## NOTE: Any time tests fail here with an error like: @@ -215,5 +212,5 @@ test safe-7.1 {canvas printing} { # cleanup unset hidden_cmds -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/scale.test b/tests/scale.test index fb9ba5d..ae2803e 100644 --- a/tests/scale.test +++ b/tests/scale.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: scale.test,v 1.12 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: scale.test,v 1.13 2003/04/01 21:06:50 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Create entries in the option database to be sure that geometry options @@ -821,5 +818,5 @@ catch {destroy .s} option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/scrollbar.test b/tests/scrollbar.test index 025df53..3de4c58 100644 --- a/tests/scrollbar.test +++ b/tests/scrollbar.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: scrollbar.test,v 1.9 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: scrollbar.test,v 1.10 2003/04/01 21:06:50 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands ## testmetrics is a win/mac only test command @@ -670,7 +667,7 @@ catch {destroy .s} catch {destroy .t} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/select.test b/tests/select.test index 0e24c7c..db401b7 100644 --- a/tests/select.test +++ b/tests/select.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: select.test,v 1.9 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: select.test,v 1.10 2003/04/01 21:06:51 dgp Exp $ # # Note: Multiple display selection handling will only be tested if the @@ -14,14 +14,9 @@ # 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::interpreter - global longValue selValue selInfo set selValue {} @@ -1044,7 +1039,7 @@ test select-13.1 {SelectionSize procedure, handler deleted} {unixOnly} { catch {rename weirdHandler {}} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/send.test b/tests/send.test index a40eb98..9eab6c5 100644 --- a/tests/send.test +++ b/tests/send.test @@ -10,13 +10,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: send.test,v 1.8 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: send.test,v 1.9 2003/04/01 21:06:51 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint xhost [llength [auto_execok xhost]] @@ -626,5 +623,5 @@ catch { rename newApp {} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/spinbox.test b/tests/spinbox.test index b142611..b9b05f2 100644 --- a/tests/spinbox.test +++ b/tests/spinbox.test @@ -4,13 +4,10 @@ # Copyright (c) 1998-2000 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: spinbox.test,v 1.6 2003/03/13 19:34:40 dgp Exp $ +# RCS: @(#) $Id: spinbox.test,v 1.7 2003/04/01 21:06:52 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands proc scroll args { @@ -1600,5 +1597,5 @@ catch {unset ::e ::vVals} option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/text.test b/tests/text.test index 1c21d21..08e0b0f 100644 --- a/tests/text.test +++ b/tests/text.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: text.test,v 1.19 2002/10/17 23:38:01 hobbs Exp $ +# RCS: @(#) $Id: text.test,v 1.20 2003/04/01 21:06:52 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Create entries in the option database to be sure that geometry options @@ -1583,5 +1580,5 @@ deleteWindows option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/textBTree.test b/tests/textBTree.test index 7578536..85194dc 100644 --- a/tests/textBTree.test +++ b/tests/textBTree.test @@ -8,13 +8,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textBTree.test,v 1.5 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: textBTree.test,v 1.6 2003/04/01 21:06:53 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands catch {destroy .t} @@ -899,7 +896,7 @@ test btree-18.9 {tag search back, large complex btree spans} { destroy .t # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/textDisp.test b/tests/textDisp.test index 14b3b4a..79310b0 100644 --- a/tests/textDisp.test +++ b/tests/textDisp.test @@ -6,19 +6,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textDisp.test,v 1.8 2002/11/22 23:25:20 hobbs Exp $ +# RCS: @(#) $Id: textDisp.test,v 1.9 2003/04/01 21:06:53 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::interpreter -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - # The procedure below is used as the scrolling command for the text; # it just saves the scrolling information in a variable "scrollInfo". @@ -2873,5 +2866,5 @@ deleteWindows option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/textImage.test b/tests/textImage.test index f75ce8a..73b9dc9 100644 --- a/tests/textImage.test +++ b/tests/textImage.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textImage.test,v 1.5 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: textImage.test,v 1.6 2003/04/01 21:06:54 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # One time setup. Create a font to insure the tests are font metric invariant. @@ -351,7 +348,7 @@ foreach image [image names] {image delete $image} font delete test_font # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/textIndex.test b/tests/textIndex.test index 98f81bb..a80af7c 100644 --- a/tests/textIndex.test +++ b/tests/textIndex.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textIndex.test,v 1.7 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: textIndex.test,v 1.8 2003/04/01 21:06:54 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Some tests require the testtext command @@ -670,7 +667,7 @@ test testIndex-16.2 {TkTextPrintIndex} { # cleanup rename textimage {} catch {destroy .t} -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/textMark.test b/tests/textMark.test index af1dc4d..14cfa5e 100644 --- a/tests/textMark.test +++ b/tests/textMark.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textMark.test,v 1.5 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: textMark.test,v 1.6 2003/04/01 21:06:54 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands catch {destroy .t} @@ -222,7 +219,7 @@ test textMark-8.8 {MarkFindPrev - no previous mark} courier12 { catch {destroy .t} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/textTag.test b/tests/textTag.test index da86a7a..d30f7a8 100644 --- a/tests/textTag.test +++ b/tests/textTag.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textTag.test,v 1.6 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: textTag.test,v 1.7 2003/04/01 21:06:55 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands catch {destroy .t} @@ -767,7 +764,7 @@ test textTag-16.7 {TkTextPickCurrent procedure} courier12 { catch {destroy .t} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/textWind.test b/tests/textWind.test index c7093ca..dbe5f26 100644 --- a/tests/textWind.test +++ b/tests/textWind.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: textWind.test,v 1.5 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: textWind.test,v 1.6 2003/04/01 21:06:55 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Create entries in the option database to be sure that geometry options @@ -824,7 +821,7 @@ catch {destroy .t} option clear # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/tk.test b/tests/tk.test index be450a2..0cf566b 100644 --- a/tests/tk.test +++ b/tests/tk.test @@ -5,13 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # Copyright (c) 2002 ActiveState Corporation. # -# RCS: @(#) $Id: tk.test,v 1.9 2002/09/02 19:15:38 hobbs Exp $ +# RCS: @(#) $Id: tk.test,v 1.10 2003/04/01 21:06:55 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test tk-1.1 {tk command: general} { @@ -133,5 +130,5 @@ test tk-5.6 {tk caret} { } {0 30} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/unixButton.test b/tests/unixButton.test index 6899720..30ce8ee 100644 --- a/tests/unixButton.test +++ b/tests/unixButton.test @@ -8,13 +8,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixButton.test,v 1.6 2003/02/25 01:39:56 hobbs Exp $ +# RCS: @(#) $Id: unixButton.test,v 1.7 2003/04/01 21:06:55 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Create entries in the option database to be sure that geometry options @@ -195,5 +192,5 @@ test unixbutton-2.1 {disabled coloring check, bug 669595} unix { deleteWindows # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test index fbded5b..1f0538d 100644 --- a/tests/unixEmbed.test +++ b/tests/unixEmbed.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixEmbed.test,v 1.11 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: unixEmbed.test,v 1.12 2003/04/01 21:06:55 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands setupbg @@ -560,7 +557,7 @@ test unixEmbed-10.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} unix # cleanup deleteWindows cleanupbg -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/unixFont.test b/tests/unixFont.test index 420bf13..68f8395 100644 --- a/tests/unixFont.test +++ b/tests/unixFont.test @@ -12,13 +12,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixFont.test,v 1.7 2002/07/13 20:28:35 dgp Exp $ +# RCS: @(#) $Id: unixFont.test,v 1.8 2003/04/01 21:06:56 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint hasArial 1 @@ -315,7 +312,7 @@ test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} unix { } {0 1 1 1 1 2} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/unixMenu.test b/tests/unixMenu.test index 7592921..457462e 100644 --- a/tests/unixMenu.test +++ b/tests/unixMenu.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixMenu.test,v 1.7 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: unixMenu.test,v 1.8 2003/04/01 21:06:56 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test unixMenu-1.1 {TkpNewMenu - normal menu} unix { @@ -949,5 +946,5 @@ test unixMenu-26.1 {TkpMenuInit - nothing to do} {} {} # cleanup deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/unixSelect.test b/tests/unixSelect.test index ddbdc35..c3516d3 100644 --- a/tests/unixSelect.test +++ b/tests/unixSelect.test @@ -9,13 +9,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixSelect.test,v 1.8 2003/01/14 19:24:51 jenglish Exp $ +# RCS: @(#) $Id: unixSelect.test,v 1.9 2003/04/01 21:06:57 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands global longValue selValue selInfo @@ -360,5 +357,5 @@ test unixSelect-1.20 {Automatic UTF8_STRING support for selection handle} {unixO } "This is the selection value" # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/unixWm.test b/tests/unixWm.test index fdf5b1d..58035bb 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -7,19 +7,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixWm.test,v 1.33 2003/03/18 16:30:42 dgp Exp $ +# RCS: @(#) $Id: unixWm.test,v 1.34 2003/04/01 21:06:57 dgp Exp $ package require tcltest 2.2 -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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::interpreter -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile - proc sleep ms { global x after $ms {set x 1} @@ -2454,5 +2447,5 @@ test unixWm-60.2 {wm attributes} unix { # cleanup catch {destroy .t} -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/util.test b/tests/util.test index f9ee697..35e8f39 100644 --- a/tests/util.test +++ b/tests/util.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: util.test,v 1.5 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: util.test,v 1.6 2003/04/01 21:06:58 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands listbox .l -width 20 -height 5 -relief sunken -bd 2 @@ -67,7 +64,7 @@ test util-1.12 {Tk_GetScrollInfo procedure} { } {1 {unknown option "dropdead": must be moveto or scroll}} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/visual.test b/tests/visual.test index ee13af2..77dd665 100644 --- a/tests/visual.test +++ b/tests/visual.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: visual.test,v 1.6 2002/07/14 05:48:46 dgp Exp $ +# RCS: @(#) $Id: visual.test,v 1.7 2003/04/01 21:06:58 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands update @@ -303,7 +300,7 @@ rename eatColors {} rename colorsFree {} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/visual_bb.test b/tests/visual_bb.test index 4520a8c..a465d64 100644 --- a/tests/visual_bb.test +++ b/tests/visual_bb.test @@ -6,17 +6,12 @@ # at the window to make sure it appears as expected. Individual tests # are kept in separate ".tcl" files in this directory. # -# RCS: @(#) $Id: visual_bb.test,v 1.7 2002/07/14 18:31:48 dgp Exp $ +# RCS: @(#) $Id: visual_bb.test,v 1.8 2003/04/01 21:07:00 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::cleanupTests - set auto_path ". $auto_path" wm title . "Visual Tests for Tk" diff --git a/tests/winButton.test b/tests/winButton.test index eb9373d..80149b4 100644 --- a/tests/winButton.test +++ b/tests/winButton.test @@ -8,13 +8,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winButton.test,v 1.9 2002/10/08 20:21:23 hobbs Exp $ +# RCS: @(#) $Id: winButton.test,v 1.10 2003/04/01 21:07:00 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands proc bogusTrace args { @@ -146,5 +143,5 @@ test winbutton-1.9 {TkpComputeButtonGeometry procedure} {pcOnly} { # cleanup deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/winClipboard.test b/tests/winClipboard.test index 593c7da..59822f6 100644 --- a/tests/winClipboard.test +++ b/tests/winClipboard.test @@ -10,17 +10,12 @@ # Copyright (c) 1998-2000 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winClipboard.test,v 1.11 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: winClipboard.test,v 1.12 2003/04/01 21:07:00 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::bytestring - # Note that these tests may fail if another application is grabbing the # clipboard (e.g. an X server) @@ -81,5 +76,5 @@ test winClipboard-2.2 {TkSelUpdateClipboard reentrancy problem} {pcOnly testclip } [list "more data in string" "new data"] # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/winDialog.test b/tests/winDialog.test index 9f49f28..d3881d2 100644 --- a/tests/winDialog.test +++ b/tests/winDialog.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # Copyright (c) 1998-1999 ActiveState Corporation. # -# RCS: @(#) $Id: winDialog.test,v 1.9 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: winDialog.test,v 1.10 2003/04/01 21:07:00 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint testwinevent [llength [info commands testwinevent]] @@ -323,5 +320,5 @@ test winDialog-9.8 {Tk_ChooseDirectoryObjCmd:\ catch {testwinevent debug 0} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/winFont.test b/tests/winFont.test index de0f546..6104e52 100644 --- a/tests/winFont.test +++ b/tests/winFont.test @@ -10,13 +10,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winFont.test,v 1.8 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: winFont.test,v 1.9 2003/04/01 21:07:01 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands catch {destroy .b} @@ -184,5 +181,5 @@ test winfont-7.4 {AllocFont procedure: extract info from textmetric} {pcOnly} { # cleanup destroy .b -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/winMenu.test b/tests/winMenu.test index 9e79c33..5e76440 100644 --- a/tests/winMenu.test +++ b/tests/winMenu.test @@ -7,13 +7,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winMenu.test,v 1.6 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: winMenu.test,v 1.7 2003/04/01 21:07:01 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands test winMenu-1.1 {GetNewID} {pcOnly} { @@ -1035,7 +1032,7 @@ test winMenu-34.1 {TkpMenuInit called at boot time} {emptyTest pcOnly} {} {} # cleanup deleteWindows -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/winSend.test b/tests/winSend.test index 5a9640b..d95e102 100644 --- a/tests/winSend.test +++ b/tests/winSend.test @@ -7,17 +7,12 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winSend.test,v 1.4 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: winSend.test,v 1.5 2003/04/01 21:07:02 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands -namespace import -force tcltest::interpreter - # Compute a script that will load Tk into a child interpreter. foreach pkg [info loaded] { @@ -407,6 +402,6 @@ while {[llength $newInterps] != [llength $currentInterps]} { } # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/winWm.test b/tests/winWm.test index 7bf9810..cb39e46 100644 --- a/tests/winWm.test +++ b/tests/winWm.test @@ -9,13 +9,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winWm.test,v 1.9 2002/07/25 21:35:23 pspjuth Exp $ +# RCS: @(#) $Id: winWm.test,v 1.10 2003/04/01 21:07:02 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # Measure the height of a single menu line @@ -272,5 +269,5 @@ test winWm-6.2 {deiconify on an already mapped toplevel # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/window.test b/tests/window.test index 51bacbc..9d62208 100644 --- a/tests/window.test +++ b/tests/window.test @@ -5,16 +5,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: window.test,v 1.7 2002/11/14 17:30:20 mdejong Exp $ +# RCS: @(#) $Id: window.test,v 1.8 2003/04/01 21:07:02 dgp Exp $ package require tcltest 2.1 -namespace import -force tcltest::configure -namespace import -force tcltest::testsDirectory -namespace import -force tcltest::interpreter -namespace import -force tcltest::makeFile -namespace import -force tcltest::removeFile -configure -testdir [file join [pwd] [file dirname [info script]]] -configure -loadfile [file join [testsDirectory] constraints.tcl] +eval tcltest::configure $argv tcltest::loadTestedCommands update @@ -291,7 +285,7 @@ test window-5.1 {Tk_MakeWindowExist procedure, stacking order and menubars} \ } {} # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/winfo.test b/tests/winfo.test index 3f9a1c1..71925ae 100644 --- a/tests/winfo.test +++ b/tests/winfo.test @@ -6,13 +6,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: winfo.test,v 1.9 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: winfo.test,v 1.10 2003/04/01 21:07:03 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands # eatColors -- @@ -372,5 +369,5 @@ test winfo-14.4 {mapped at idle time} { deleteWindows # cleanup -::tcltest::cleanupTests +cleanupTests return diff --git a/tests/wm.test b/tests/wm.test index 3cffdb2..a744409 100644 --- a/tests/wm.test +++ b/tests/wm.test @@ -7,17 +7,14 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: wm.test,v 1.22 2003/03/12 00:25:41 mdejong Exp $ +# RCS: @(#) $Id: wm.test,v 1.23 2003/04/01 21:07:04 dgp Exp $ # This file tests window manager interactions that work across # platforms. Window manager tests that only work on a specific # platform should be placed in unixWm.test or winWm.test. 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] +eval tcltest::configure $argv tcltest::loadTestedCommands wm deiconify . @@ -1787,7 +1784,7 @@ test wm-deletion-epoch-1.1 {Deletion epoch on multiple displays} {altDisplay} { deleteWindows -tcltest::cleanupTests +cleanupTests return diff --git a/tests/xmfbox.test b/tests/xmfbox.test index 7e5a1c1..ca3858a 100644 --- a/tests/xmfbox.test +++ b/tests/xmfbox.test @@ -10,13 +10,10 @@ # Contributions from Don Porter, NIST, 2002. (not subject to US copyright) # All rights reserved. # -# RCS: @(#) $Id: xmfbox.test,v 1.7 2002/07/13 20:28:36 dgp Exp $ +# RCS: @(#) $Id: xmfbox.test,v 1.8 2003/04/01 21:07:05 dgp Exp $ 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] +eval tcltest::configure $argv tcltest::loadTestedCommands set testPWD [pwd] @@ -142,7 +139,7 @@ test xmfbox-2.6 {tk::MotifFDialog_ActivateFList, ~ in file names} {unixOnly} { # cleanup cleanup -::tcltest::cleanupTests +cleanupTests return |