* tests/filebox.test: A few typo corrections in dkf's recent

        * tests/frame.test:     style upgrade for the test suite.
        * tests/select.test:
        * tests/visual.test:

5 files changed, 17 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 089cfed..9fa4b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-04  Don Porter  <dgp@users.sourceforge.net>
+
+	* tests/filebox.test:	A few typo corrections in dkf's recent
+	* tests/frame.test:	style upgrade for the test suite.
+	* tests/select.test:
+	* tests/visual.test:
+
 2004-06-04  Vince Darley  <vincentdarley@users.sourceforge.net>
 
 	* generic/tkTextIndex.c: 
diff --git a/tests/filebox.test b/tests/filebox.test
index e7e386f..d8da29c 100644
--- a/tests/filebox.test
+++ b/tests/filebox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: filebox.test,v 1.15 2004/05/23 17:34:48 dkf Exp $
+# RCS: @(#) $Id: filebox.test,v 1.16 2004/06/04 19:55:31 dgp Exp $
 #
 
 package require tcltest 2.1
@@ -156,7 +156,7 @@ foreach mode $modes {
         if {[string index $option 0] eq "-"} {
 	    test filebox-1.2-$mode$option "tk_getOpenFile command" -body {
 		tk_getOpenFile $option
-	    } -returnCode error -result "value for \"$option\" missing"
+	    } -returnCodes error -result "value for \"$option\" missing"
         }
     }
 
diff --git a/tests/frame.test b/tests/frame.test
index 41307fe..96ce0a4 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: frame.test,v 1.10 2004/05/23 17:34:48 dkf Exp $
+# RCS: @(#) $Id: frame.test,v 1.11 2004/06/04 19:55:31 dgp Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -273,7 +273,7 @@ test frame-3.3 {TkCreateFrame procedure} -setup {
     .t configure -class
 } -cleanup {
     destroy .t
-} {-class class Class Toplevel Toplevel}
+} -result {-class class Class Toplevel Toplevel}
 test frame-3.4 {TkCreateFrame procedure} {
     catch {destroy .t}
     toplevel .t -width 350 -class NewClass -bg black -visual default -height 90
diff --git a/tests/select.test b/tests/select.test
index d8b67e3..1195661 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.13 2004/05/23 17:34:49 dkf Exp $
+# RCS: @(#) $Id: select.test,v 1.14 2004/06/04 19:55:31 dgp Exp $
 
 #
 # Note: Multiple display selection handling will only be tested if the
@@ -796,7 +796,7 @@ test select-8.1 {TkSelEventProc procedure} -constraints unixOnly -setup {
 test select-9.1 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraint unixOnly -body {
+} -constraints unixOnly -body {
     set selValue "1024"
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
diff --git a/tests/visual.test b/tests/visual.test
index 1eb06bc..31a2f53 100644
--- a/tests/visual.test
+++ b/tests/visual.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: visual.test,v 1.8 2004/05/23 17:34:49 dkf Exp $
+# RCS: @(#) $Id: visual.test,v 1.9 2004/06/04 19:55:31 dgp Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -72,7 +72,7 @@ if {[llength $avail] > 1} {
 tcltest::testConstraint haveOtherVisual [expr {$other ne ""}]
 tcltest::testConstraint havePseudocolorVisual [string match *pseudocolor* $avail]
 tcltest::testConstraint haveMultipleVisuals [expr {[llength $avail] > 1}]
-tktest::testConstraint defaultPseudocolor8 [expr {
+tcltest::testConstraint defaultPseudocolor8 [expr {
     ([winfo visual .] == "pseudocolor") && ([winfo depth .] == 8)
 }]
 
@@ -211,7 +211,7 @@ test visual-6.1 {Tk_GetVisual, no matching visual} {havePseudocolorVisual haveMu
 # These tests are non-portable due to variations in how many colors
 # are already in use on the screen.
 
-if {[tktest::testConstraint defaultPseudocolor8]} {
+if {[tcltest::testConstraint defaultPseudocolor8]} {
     eatColors .t1
 }
 test visual-7.1 {Tk_GetColormap, "new"} {defaultPseudocolor8 nonPortable} {
@@ -262,7 +262,7 @@ test visual-7.6 {Tk_GetColormap, copy from other window} {defaultPseudocolor8 ha
     wm geometry .t1 +0+0
     list [catch {toplevel .t2 -width 400 -height 50 -colormap .t1} msg] $msg
 } {1 {can't use colormap for .t1: incompatible visuals}}
-if {[tktest::testConstraint defaultPseudocolor8]} {
+if {[tcltest::testConstraint defaultPseudocolor8]} {
     catch {destroy .t1}
     catch {destroy .t2}
 }