diff options
Diffstat (limited to 'tests/appendComp.test')
| -rw-r--r-- | tests/appendComp.test | 281 |
1 files changed, 136 insertions, 145 deletions
diff --git a/tests/appendComp.test b/tests/appendComp.test index f85c3ba..14e9567 100644 --- a/tests/appendComp.test +++ b/tests/appendComp.test @@ -1,28 +1,27 @@ # Commands covered: append lappend # -# This file contains a collection of tests for one or more of the Tcl built-in -# commands. Sourcing this file into Tcl runs the tests and generates output -# for errors. No output means no errors were found. +# This file contains a collection of tests for one or more of the Tcl +# built-in commands. Sourcing this file into Tcl runs the tests and +# generates output for errors. No output means no errors were found. # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. # -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 namespace import -force ::tcltest::* } catch {unset x} - -test appendComp-1.1 {append command} -setup { - unset -nocomplain x -} -body { + +test appendComp-1.1 {append command} { + catch {unset x} proc foo {} {append ::x 1 2 abc "long string"} list [foo] $x -} -result {{12abclong string} {12abclong string}} +} {{12abclong string} {12abclong string}} test appendComp-1.2 {append command} { proc foo {} { set x "" @@ -53,29 +52,29 @@ test appendComp-2.1 {long appends} { foo } 1 -test appendComp-3.1 {append errors} -returnCodes error -body { +test appendComp-3.1 {append errors} { proc foo {} {append} - foo -} -result {wrong # args: should be "append varName ?value ...?"} -test appendComp-3.2 {append errors} -returnCodes error -body { + list [catch {foo} msg] $msg +} {1 {wrong # args: should be "append varName ?value value ...?"}} +test appendComp-3.2 {append errors} { proc foo {} { set x "" append x(0) 44 } - foo -} -result {can't set "x(0)": variable isn't array} -test appendComp-3.3 {append errors} -returnCodes error -body { + list [catch {foo} msg] $msg +} {1 {can't set "x(0)": variable isn't array}} +test appendComp-3.3 {append errors} { proc foo {} { - unset -nocomplain x + catch {unset x} append x } - foo -} -result {can't read "x": no such variable} + list [catch {foo} msg] $msg +} {1 {can't read "x": no such variable}} test appendComp-4.1 {lappend command} { proc foo {} { global x - unset -nocomplain x + catch {unset x} lappend x 1 2 abc "long string" } list [foo] $x @@ -133,34 +132,34 @@ test appendComp-4.8 {lappend command} { } foo } "\\{ abc" -test appendComp-4.9 {lappend command} -returnCodes error -body { +test appendComp-4.9 {lappend command} { proc foo {} { set x " \{" - lappend x abc + list [catch {lappend x abc} msg] $msg } foo -} -result {unmatched open brace in list} -test appendComp-4.10 {lappend command} -returnCodes error -body { +} {1 {unmatched open brace in list}} +test appendComp-4.10 {lappend command} { proc foo {} { set x " \{" - lappend x abc + list [catch {lappend x abc} msg] $msg } foo -} -result {unmatched open brace in list} -test appendComp-4.11 {lappend command} -returnCodes error -body { +} {1 {unmatched open brace in list}} +test appendComp-4.11 {lappend command} { proc foo {} { set x "\{\{\{" - lappend x abc + list [catch {lappend x abc} msg] $msg } foo -} -result {unmatched open brace in list} -test appendComp-4.12 {lappend command} -returnCodes error -body { +} {1 {unmatched open brace in list}} +test appendComp-4.12 {lappend command} { proc foo {} { set x "x \{\{\{" - lappend x abc + list [catch {lappend x abc} msg] $msg } foo -} -result {unmatched open brace in list} +} {1 {unmatched open brace in list}} test appendComp-4.13 {lappend command} { proc foo {} { set x "x\{\{\{" @@ -206,50 +205,45 @@ test appendComp-4.20 {lappend command} { foo } {abc} -test appendComp-5.1 {long lappends} -setup { - unset -nocomplain x - proc check {var size} { - set l [llength $var] - if {$l != $size} { - return "length mismatch: should have been $size, was $l" +proc check {var size} { + set l [llength $var] + if {$l != $size} { + return "length mismatch: should have been $size, was $l" + } + for {set i 0} {$i < $size} {set i [expr $i+1]} { + set j [lindex $var $i] + if {$j != "item $i"} { + return "element $i should have been \"item $i\", was \"$j\"" } - for {set i 0} {$i < $size} {incr i} { - set j [lindex $var $i] - if {$j ne "item $i"} { - return "element $i should have been \"item $i\", was \"$j\"" - } - } - return ok } -} -body { + return ok +} +test appendComp-5.1 {long lappends} { + catch {unset x} set x "" for {set i 0} {$i < 300} {set i [expr $i+1]} { lappend x "item $i" } check $x 300 -} -cleanup { - unset -nocomplain x - catch {rename check ""} -} -result ok +} ok -test appendComp-6.1 {lappend errors} -returnCodes error -body { +test appendComp-6.1 {lappend errors} { proc foo {} {lappend} - foo -} -result {wrong # args: should be "lappend varName ?value ...?"} -test appendComp-6.2 {lappend errors} -returnCodes error -body { + list [catch {foo} msg] $msg +} {1 {wrong # args: should be "lappend varName ?value value ...?"}} +test appendComp-6.2 {lappend errors} { proc foo {} { set x "" lappend x(0) 44 } - foo -} -result {can't set "x(0)": variable isn't array} + list [catch {foo} msg] $msg +} {1 {can't set "x(0)": variable isn't array}} -test appendComp-7.1 {lappendComp-created var and error in trace on that var} -setup { - catch {rename foo ""} - unset -nocomplain x -} -body { +test appendComp-7.1 {lappendComp-created var and error in trace on that var} { proc bar {} { global x + catch {rename foo ""} + catch {unset x} trace variable x w foo proc foo {} {global x; unset x} catch {lappend x 1} @@ -260,103 +254,100 @@ test appendComp-7.1 {lappendComp-created var and error in trace on that var} -se list [info exists x] [catch {set x} msg] $msg } bar -} -result {0 1 {can't read "x": no such variable}} -test appendComp-7.2 {lappend var triggers read trace, index var} -setup { - unset -nocomplain ::result -} -body { +} {0 1 {can't read "x": no such variable}} +test appendComp-7.2 {lappend var triggers read trace, index var} {bug-3057639} { proc bar {} { + catch {unset myvar} + catch {unset ::result} trace variable myvar r foo proc foo {args} {append ::result $args} lappend myvar a - return $::result + list [catch {set ::result} msg] $msg } bar -} -result {myvar {} r} -constraints {bug-3057639} -test appendComp-7.3 {lappend var triggers read trace, stack var} -setup { - unset -nocomplain ::result - unset -nocomplain ::myvar -} -body { +} {0 {myvar {} r}} +test appendComp-7.3 {lappend var triggers read trace, stack var} {bug-3057639} { proc bar {} { + catch {unset ::myvar} + catch {unset ::result} trace variable ::myvar r foo proc foo {args} {append ::result $args} lappend ::myvar a - return $::result + list [catch {set ::result} msg] $msg } bar -} -result {::myvar {} r} -constraints {bug-3057639} -test appendComp-7.4 {lappend var triggers read trace, array var} -setup { - unset -nocomplain ::result -} -body { - # The behavior of read triggers on lappend changed in 8.0 to not trigger - # them. Maybe not correct, but been there a while. +} {0 {::myvar {} r}} +test appendComp-7.4 {lappend var triggers read trace, array var} {bug-3057639} { + # The behavior of read triggers on lappend changed in 8.0 to + # not trigger them. Maybe not correct, but been there a while. proc bar {} { + catch {unset myvar} + catch {unset ::result} trace variable myvar r foo proc foo {args} {append ::result $args} lappend myvar(b) a - return $::result + list [catch {set ::result} msg] $msg } bar -} -result {myvar b r} -constraints {bug-3057639} -test appendComp-7.5 {lappend var triggers read trace, array var} -setup { - unset -nocomplain ::result -} -body { - # The behavior of read triggers on lappend changed in 8.0 to not trigger - # them. Maybe not correct, but been there a while. +} {0 {myvar b r}} +test appendComp-7.5 {lappend var triggers read trace, array var} { + # The behavior of read triggers on lappend changed in 8.0 to + # not trigger them. Maybe not correct, but been there a while. proc bar {} { + catch {unset myvar} + catch {unset ::result} trace variable myvar r foo proc foo {args} {append ::result $args} lappend myvar(b) a b - return $::result + list [catch {set ::result} msg] $msg } bar -} -result {myvar b r} -test appendComp-7.6 {lappend var triggers read trace, array var exists} -setup { - unset -nocomplain ::result -} -body { +} {0 {myvar b r}} +test appendComp-7.6 {lappend var triggers read trace, array var exists} {bug-3057639} { proc bar {} { + catch {unset myvar} + catch {unset ::result} set myvar(0) 1 trace variable myvar r foo proc foo {args} {append ::result $args} lappend myvar(b) a - return $::result + list [catch {set ::result} msg] $msg } bar -} -result {myvar b r} -constraints {bug-3057639} -test appendComp-7.7 {lappend var triggers read trace, array stack var} -setup { - unset -nocomplain ::myvar - unset -nocomplain ::result -} -body { +} {0 {myvar b r}} +test appendComp-7.7 {lappend var triggers read trace, array stack var} {bug-3057639} { proc bar {} { + catch {unset ::myvar} + catch {unset ::result} trace variable ::myvar r foo proc foo {args} {append ::result $args} lappend ::myvar(b) a - return $::result + list [catch {set ::result} msg] $msg } bar -} -result {::myvar b r} -constraints {bug-3057639} -test appendComp-7.8 {lappend var triggers read trace, array stack var} -setup { - unset -nocomplain ::myvar - unset -nocomplain ::result -} -body { +} {0 {::myvar b r}} +test appendComp-7.8 {lappend var triggers read trace, array stack var} { proc bar {} { + catch {unset ::myvar} + catch {unset ::result} trace variable ::myvar r foo proc foo {args} {append ::result $args} lappend ::myvar(b) a b - return $::result + list [catch {set ::result} msg] $msg } bar -} -result {::myvar b r} -test appendComp-7.9 {append var does not trigger read trace} -setup { - unset -nocomplain ::result -} -body { +} {0 {::myvar b r}} +test appendComp-7.9 {append var does not trigger read trace} { proc bar {} { + catch {unset myvar} + catch {unset ::result} trace variable myvar r foo proc foo {args} {append ::result $args} append myvar a info exists ::result } bar -} -result {0} +} {0} test appendComp-8.1 {defer error to runtime} -setup { interp create slave @@ -372,24 +363,25 @@ test appendComp-8.1 {defer error to runtime} -setup { interp delete slave } -result {} -# New tests for bug 3057639 to show off the more consistent behaviour of -# lappend in both direct-eval and bytecompiled code paths (see append.test for -# the direct-eval variants). lappend now behaves like append. 9.0/1 lappend - -# 9.2/3 append. -# Note also the tests above now constrained by bug-3057639, these changed -# behaviour with the triggering of read traces in bc mode gone. +# New tests for bug 3057639 to show off the more consistent behaviour +# of lappend in both direct-eval and bytecompiled code paths (see +# append.test for the direct-eval variants). lappend now behaves like +# append. 9.0/1 lappend - 9.2/3 append. + +# Note also the tests above now constrained by bug-3057639, these +# changed behaviour with the triggering of read traces in bc mode +# gone. -# Going back to the tests below. The direct-eval tests are ok before and after -# patch (no read traces run for lappend, append). The compiled tests are -# failing for lappend (9.0/1) before the patch, showing how it invokes read -# traces in the compiled path. The append tests are good (9.2/3). After the -# patch the failues are gone. +# Going back to the tests below. The direct-eval tests are ok before +# and after patch (no read traces run for lappend, append). The +# compiled tests are failing for lappend (9.0/1) before the patch, +# showing how it invokes read traces in the compiled path. The append +# tests are good (9.2/3). After the patch the failues are gone. -test appendComp-9.0 {bug 3057639, lappend compiled, read trace on non-existing array variable element} -setup { - unset -nocomplain myvar +test appendComp-9.0 {bug 3057639, lappend compiled, read trace on non-existing array variable element} { + catch {unset myvar} array set myvar {} -} -body { proc nonull {var key val} { upvar 1 $var lvar if {![info exists lvar($key)]} { @@ -401,21 +393,22 @@ test appendComp-9.0 {bug 3057639, lappend compiled, read trace on non-existing a lappend ::myvar(key) "new value" } list [catch { foo } msg] $msg -} -result {0 {{new value}}} -test appendComp-9.1 {bug 3057639, lappend direct eval, read trace on non-existing env element} -setup { - unset -nocomplain ::env(__DUMMY__) -} -body { +} {0 {{new value}}} + + +test appendComp-9.1 {bug 3057639, lappend direct eval, read trace on non-existing env element} { + catch {unset ::env(__DUMMY__)} proc foo {} { lappend ::env(__DUMMY__) "new value" } list [catch { foo } msg] $msg -} -cleanup { - unset -nocomplain ::env(__DUMMY__) -} -result {0 {{new value}}} -test appendComp-9.2 {bug 3057639, append compiled, read trace on non-existing array variable element} -setup { - unset -nocomplain myvar +} {0 {{new value}}} + + + +test appendComp-9.2 {bug 3057639, append compiled, read trace on non-existing array variable element} { + catch {unset myvar} array set myvar {} -} -body { proc nonull {var key val} { upvar 1 $var lvar if {![info exists lvar($key)]} { @@ -427,18 +420,21 @@ test appendComp-9.2 {bug 3057639, append compiled, read trace on non-existing ar append ::myvar(key) "new value" } list [catch { foo } msg] $msg -} -result {0 {new value}} -test appendComp-9.3 {bug 3057639, append direct eval, read trace on non-existing env element} -setup { - unset -nocomplain ::env(__DUMMY__) -} -body { +} {0 {new value}} + + +test appendComp-9.3 {bug 3057639, append direct eval, read trace on non-existing env element} { + catch {unset ::env(__DUMMY__)} proc foo {} { append ::env(__DUMMY__) "new value" } list [catch { foo } msg] $msg -} -cleanup { - unset -nocomplain ::env(__DUMMY__) -} -result {0 {new value}} - +} {0 {new value}} + + + + + catch {unset i x result y} catch {rename foo ""} catch {rename bar ""} @@ -448,8 +444,3 @@ catch {rename bar {}} # cleanup ::tcltest::cleanupTests return - -# Local Variables: -# mode: tcl -# fill-column: 78 -# End: |