summaryrefslogtreecommitdiff
path: root/tk/tests/textDisp.test
diff options
context:
space:
mode:
Diffstat (limited to 'tk/tests/textDisp.test')
-rw-r--r--tk/tests/textDisp.test36
1 files changed, 26 insertions, 10 deletions
diff --git a/tk/tests/textDisp.test b/tk/tests/textDisp.test
index d6b460f46a3..95d3e90ff29 100644
--- a/tk/tests/textDisp.test
+++ b/tk/tests/textDisp.test
@@ -3,17 +3,16 @@
#
# Copyright (c) 1994 The Regents of the University of California.
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+# All rights reserved.
#
# RCS: @(#) $Id$
-if {[string compare test [info procs test]] == 1} {
- source defs
- if {$testConfig(fonts) == 0} {
- puts "skipping font-sensitive tests"
- }
+if {[lsearch [namespace children] ::tcltest] == -1} {
+ source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
+if {$::tcltest::testConfig(fonts) == 0} {
+ puts "skipping font-sensitive tests"
}
# The procedure below is used as the scrolling command for the text;
@@ -1794,10 +1793,10 @@ foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
.t configure -wrap none
test textDisp-17.1 {TkTextScanCmd procedure} {
list [catch {.t scan a b} msg] $msg
-} {1 {wrong # args: should be ".t scan mark|dragto x y"}}
+} {1 {wrong # args: should be ".t scan mark x y" or ".t scan dragto x y ?gain?"}}
test textDisp-17.2 {TkTextScanCmd procedure} {
list [catch {.t scan a b c d} msg] $msg
-} {1 {wrong # args: should be ".t scan mark|dragto x y"}}
+} {1 {expected integer but got "b"}}
test textDisp-17.3 {TkTextScanCmd procedure} {
list [catch {.t scan stupid b 20} msg] $msg
} {1 {expected integer but got "b"}}
@@ -2866,3 +2865,20 @@ foreach i [winfo children .] {
catch {destroy $i}
}
option clear
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+
+