summaryrefslogtreecommitdiffstats
path: root/tests/clrpick.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/clrpick.test')
-rw-r--r--tests/clrpick.test21
1 files changed, 9 insertions, 12 deletions
diff --git a/tests/clrpick.test b/tests/clrpick.test
index 2259fe7..77dce58 100644
--- a/tests/clrpick.test
+++ b/tests/clrpick.test
@@ -5,18 +5,15 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: clrpick.test,v 1.6 2001/08/01 16:21:12 dgp Exp $
+# RCS: @(#) $Id: clrpick.test,v 1.7 2002/07/14 05:48:46 dgp Exp $
#
-if {[lsearch [namespace children] ::tcltest] == -1} {
- source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Some tests require user interaction on non-unix platform
-
-set ::tcltest::testConfig(nonUnixUserInteraction) \
- [expr {$::tcltest::testConfig(userInteraction) || \
- $::tcltest::testConfig(unixOnly)}]
+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]
+tcltest::loadTestedCommands
test clrpick-1.1 {tk_chooseColor command} {
list [catch {tk_chooseColor -foo} msg] $msg
@@ -140,7 +137,7 @@ set verylongstring $verylongstring$verylongstring
# machines with small color palettes still fail.
# some tests will be skipped if there are no more colors
set numcolors 32
-set ::tcltest::testConfig(colorsLeftover) 1
+testConstraint colorsLeftover 1
set i 0
canvas .c
pack .c -expand 1 -fill both
@@ -158,7 +155,7 @@ while {$i<$numcolors} {
set g [expr $g/256]
set b [expr $b/256]
if {"$color" != "#[format %02x%02x%02x $r $g $b]"} {
- set ::tcltest::testConfig(colorsLeftover) 0
+ testConstraint colorsLeftover 0
}
}
.c delete $i