diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/chan.test | 30 | ||||
| -rw-r--r-- | tests/chanio.test | 4 | ||||
| -rw-r--r-- | tests/io.test | 4 | ||||
| -rw-r--r-- | tests/ioCmd.test | 46 | ||||
| -rw-r--r-- | tests/pid.test | 2 | ||||
| -rw-r--r-- | tests/trace.test | 2 |
6 files changed, 44 insertions, 44 deletions
diff --git a/tests/chan.test b/tests/chan.test index 4155c36..d818a62 100644 --- a/tests/chan.test +++ b/tests/chan.test @@ -26,10 +26,10 @@ test chan-1.2 {chan command general syntax} -body { test chan-2.1 {chan command: blocked subcommand} -body { chan blocked foo bar -} -returnCodes error -result "wrong # args: should be \"chan blocked channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan blocked channel\"" test chan-3.1 {chan command: close subcommand} -body { chan close foo bar zet -} -returnCodes error -result "wrong # args: should be \"chan close channelId ?direction?\"" +} -returnCodes error -result "wrong # args: should be \"chan close channel ?direction?\"" test chan-3.2 {chan command: close subcommand} -setup { set chan [open [info script] r] } -body { @@ -46,7 +46,7 @@ test chan-3.3 {chan command: close subcommand} -setup { } -returnCodes error -result "Half-close of write-side not possible, side not opened or already closed" test chan-4.1 {chan command: configure subcommand} -body { chan configure -} -returnCodes error -result "wrong # args: should be \"chan configure channelId ?-option value ...?\"" +} -returnCodes error -result "wrong # args: should be \"chan configure channel ?-option value ...?\"" test chan-4.2 {chan command: [Bug 800753]} -body { chan configure stdout -eofchar Ā } -returnCodes error -match glob -result {bad value*} @@ -69,19 +69,19 @@ test chan-5.1 {chan command: copy subcommand} -body { test chan-6.1 {chan command: eof subcommand} -body { chan eof foo bar -} -returnCodes error -result "wrong # args: should be \"chan eof channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan eof channel\"" test chan-7.1 {chan command: event subcommand} -body { chan event foo -} -returnCodes error -result "wrong # args: should be \"chan event channelId event ?script?\"" +} -returnCodes error -result "wrong # args: should be \"chan event channel event ?script?\"" test chan-8.1 {chan command: flush subcommand} -body { chan flush foo bar -} -returnCodes error -result "wrong # args: should be \"chan flush channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan flush channel\"" test chan-9.1 {chan command: gets subcommand} -body { chan gets -} -returnCodes error -result "wrong # args: should be \"chan gets channelId ?varName?\"" +} -returnCodes error -result "wrong # args: should be \"chan gets channel ?varName?\"" test chan-10.1 {chan command: names subcommand} -body { chan names foo bar @@ -89,23 +89,23 @@ test chan-10.1 {chan command: names subcommand} -body { test chan-11.1 {chan command: puts subcommand} -body { chan puts foo bar foo bar -} -returnCodes error -result "wrong # args: should be \"chan puts ?-nonewline? ?channelId? string\"" +} -returnCodes error -result "wrong # args: should be \"chan puts ?-nonewline? ?channel? string\"" test chan-12.1 {chan command: read subcommand} -body { chan read -} -returnCodes error -result "wrong # args: should be \"chan read channelId ?numChars?\" or \"chan read ?-nonewline? channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan read channel ?numChars?\" or \"chan read ?-nonewline? channel\"" test chan-13.1 {chan command: seek subcommand} -body { chan seek foo bar foo bar -} -returnCodes error -result "wrong # args: should be \"chan seek channelId offset ?origin?\"" +} -returnCodes error -result "wrong # args: should be \"chan seek channel offset ?origin?\"" test chan-14.1 {chan command: tell subcommand} -body { chan tell foo bar -} -returnCodes error -result "wrong # args: should be \"chan tell channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan tell channel\"" test chan-15.1 {chan command: truncate subcommand} -body { chan truncate foo bar foo bar -} -returnCodes error -result "wrong \# args: should be \"chan truncate channelId ?length?\"" +} -returnCodes error -result "wrong \# args: should be \"chan truncate channel ?length?\"" test chan-15.2 {chan command: truncate subcommand} -setup { set file [makeFile {} testTruncate] set f [open $file w+] @@ -124,13 +124,13 @@ test chan-15.2 {chan command: truncate subcommand} -setup { # TIP 287: chan pending test chan-16.1 {chan command: pending subcommand} -body { chan pending -} -returnCodes error -result "wrong # args: should be \"chan pending mode channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan pending mode channel\"" test chan-16.2 {chan command: pending subcommand} -body { chan pending stdin -} -returnCodes error -result "wrong # args: should be \"chan pending mode channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan pending mode channel\"" test chan-16.3 {chan command: pending subcommand} -body { chan pending stdin stdout stderr -} -returnCodes error -result "wrong # args: should be \"chan pending mode channelId\"" +} -returnCodes error -result "wrong # args: should be \"chan pending mode channel\"" test chan-16.4 {chan command: pending subcommand} -body { chan pending {input output} stdout } -returnCodes error -result "bad mode \"input output\": must be input or output" diff --git a/tests/chanio.test b/tests/chanio.test index 821e8be..c498162 100644 --- a/tests/chanio.test +++ b/tests/chanio.test @@ -5510,10 +5510,10 @@ test chan-io-40.17 {tilde substitution in open} -setup { test chan-io-41.1 {Tcl_FileeventCmd: errors} -constraints fileevent -body { chan event foo -} -returnCodes error -result {wrong # args: should be "chan event channelId event ?script?"} +} -returnCodes error -result {wrong # args: should be "chan event channel event ?script?"} test chan-io-41.2 {Tcl_FileeventCmd: errors} -constraints fileevent -body { chan event foo bar baz q -} -returnCodes error -result {wrong # args: should be "chan event channelId event ?script?"} +} -returnCodes error -result {wrong # args: should be "chan event channel event ?script?"} test chan-io-41.3 {Tcl_FileeventCmd: errors} -constraints fileevent -body { chan event gorp readable } -returnCodes error -result {can not find channel named "gorp"} diff --git a/tests/io.test b/tests/io.test index 72522f7..be9cfb7 100644 --- a/tests/io.test +++ b/tests/io.test @@ -6009,10 +6009,10 @@ test io-40.17 {tilde substitution in open} { test io-41.1 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent foo} msg] $msg -} {1 {wrong # args: should be "fileevent channelId event ?script?"}} +} {1 {wrong # args: should be "fileevent channel event ?script?"}} test io-41.2 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent foo bar baz q} msg] $msg -} {1 {wrong # args: should be "fileevent channelId event ?script?"}} +} {1 {wrong # args: should be "fileevent channel event ?script?"}} test io-41.3 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent gorp readable} msg] $msg } {1 {can not find channel named "gorp"}} diff --git a/tests/ioCmd.test b/tests/ioCmd.test index f1ba830..192322b 100644 --- a/tests/ioCmd.test +++ b/tests/ioCmd.test @@ -30,13 +30,13 @@ testConstraint testchannel [llength [info commands testchannel]] test iocmd-1.1 {puts command} { list [catch {puts} msg] $msg -} {1 {wrong # args: should be "puts ?-nonewline? ?channelId? string"}} +} {1 {wrong # args: should be "puts ?-nonewline? ?channel? string"}} test iocmd-1.2 {puts command} { list [catch {puts a b c d e f g} msg] $msg -} {1 {wrong # args: should be "puts ?-nonewline? ?channelId? string"}} +} {1 {wrong # args: should be "puts ?-nonewline? ?channel? string"}} test iocmd-1.3 {puts command} { list [catch {puts froboz -nonewline kablooie} msg] $msg -} {1 {wrong # args: should be "puts ?-nonewline? ?channelId? string"}} +} {1 {wrong # args: should be "puts ?-nonewline? ?channel? string"}} test iocmd-1.4 {puts command} { list [catch {puts froboz hello} msg] $msg } {1 {can not find channel named "froboz"}} @@ -70,10 +70,10 @@ test iocmd-1.8 {puts command} { test iocmd-2.1 {flush command} { list [catch {flush} msg] $msg -} {1 {wrong # args: should be "flush channelId"}} +} {1 {wrong # args: should be "flush channel"}} test iocmd-2.2 {flush command} { list [catch {flush a b c d e} msg] $msg -} {1 {wrong # args: should be "flush channelId"}} +} {1 {wrong # args: should be "flush channel"}} test iocmd-2.3 {flush command} { list [catch {flush foo} msg] $msg } {1 {can not find channel named "foo"}} @@ -83,10 +83,10 @@ test iocmd-2.4 {flush command} { test iocmd-3.1 {gets command} { list [catch {gets} msg] $msg -} {1 {wrong # args: should be "gets channelId ?varName?"}} +} {1 {wrong # args: should be "gets channel ?varName?"}} test iocmd-3.2 {gets command} { list [catch {gets a b c d e f g} msg] $msg -} {1 {wrong # args: should be "gets channelId ?varName?"}} +} {1 {wrong # args: should be "gets channel ?varName?"}} test iocmd-3.3 {gets command} { list [catch {gets aaa} msg] $msg } {1 {can not find channel named "aaa"}} @@ -107,16 +107,16 @@ test iocmd-3.5 {gets command} { test iocmd-4.1 {read command} { list [catch {read} msg] $msg -} {1 {wrong # args: should be "read channelId ?numChars?" or "read ?-nonewline? channelId"}} +} {1 {wrong # args: should be "read channel ?numChars?" or "read ?-nonewline? channel"}} test iocmd-4.2 {read command} { list [catch {read a b c d e f g h} msg] $msg -} {1 {wrong # args: should be "read channelId ?numChars?" or "read ?-nonewline? channelId"}} +} {1 {wrong # args: should be "read channel ?numChars?" or "read ?-nonewline? channel"}} test iocmd-4.3 {read command} { list [catch {read aaa} msg] $msg } {1 {can not find channel named "aaa"}} test iocmd-4.4 {read command} { list [catch {read -nonewline} msg] $msg -} {1 {wrong # args: should be "read channelId ?numChars?" or "read ?-nonewline? channelId"}} +} {1 {wrong # args: should be "read channel ?numChars?" or "read ?-nonewline? channel"}} test iocmd-4.5 {read command} { list [catch {read -nonew file4} msg] $msg $::errorCode } {1 {can not find channel named "-nonew"} {TCL LOOKUP CHANNEL -nonew}} @@ -136,7 +136,7 @@ test iocmd-4.8 {read command with incorrect combination of arguments} { set x [list [catch {read -nonewline $f 20 z} msg] $msg $::errorCode] close $f set x -} {1 {wrong # args: should be "read channelId ?numChars?" or "read ?-nonewline? channelId"} {TCL WRONGARGS}} +} {1 {wrong # args: should be "read channel ?numChars?" or "read ?-nonewline? channel"} {TCL WRONGARGS}} test iocmd-4.9 {read command} { list [catch {read stdin foo} msg] $msg $::errorCode } {1 {expected non-negative integer but got "foo"} {TCL VALUE NUMBER}} @@ -161,10 +161,10 @@ test iocmd-4.12 {read command} -setup { test iocmd-5.1 {seek command} -returnCodes error -body { seek -} -result {wrong # args: should be "seek channelId offset ?origin?"} +} -result {wrong # args: should be "seek channel offset ?origin?"} test iocmd-5.2 {seek command} -returnCodes error -body { seek a b c d e f g -} -result {wrong # args: should be "seek channelId offset ?origin?"} +} -result {wrong # args: should be "seek channel offset ?origin?"} test iocmd-5.3 {seek command} -returnCodes error -body { seek stdin gugu } -result {expected integer but got "gugu"} @@ -174,20 +174,20 @@ test iocmd-5.4 {seek command} -returnCodes error -body { test iocmd-6.1 {tell command} { list [catch {tell} msg] $msg -} {1 {wrong # args: should be "tell channelId"}} +} {1 {wrong # args: should be "tell channel"}} test iocmd-6.2 {tell command} { list [catch {tell a b c d e} msg] $msg -} {1 {wrong # args: should be "tell channelId"}} +} {1 {wrong # args: should be "tell channel"}} test iocmd-6.3 {tell command} { list [catch {tell aaa} msg] $msg } {1 {can not find channel named "aaa"}} test iocmd-7.1 {close command} { list [catch {close} msg] $msg -} {1 {wrong # args: should be "close channelId ?direction?"}} +} {1 {wrong # args: should be "close channel ?direction?"}} test iocmd-7.2 {close command} { list [catch {close a b c d e} msg] $msg -} {1 {wrong # args: should be "close channelId ?direction?"}} +} {1 {wrong # args: should be "close channel ?direction?"}} test iocmd-7.3 {close command} { list [catch {close aaa} msg] $msg } {1 {can not find channel named "aaa"}} @@ -216,10 +216,10 @@ proc expectedOpts {got extra} { } test iocmd-8.1 {fconfigure command} -returnCodes error -body { fconfigure -} -result {wrong # args: should be "fconfigure channelId ?-option value ...?"} +} -result {wrong # args: should be "fconfigure channel ?-option value ...?"} test iocmd-8.2 {fconfigure command} -returnCodes error -body { fconfigure a b c d e f -} -result {wrong # args: should be "fconfigure channelId ?-option value ...?"} +} -result {wrong # args: should be "fconfigure channel ?-option value ...?"} test iocmd-8.3 {fconfigure command} -returnCodes error -body { fconfigure a b } -result {can not find channel named "a"} @@ -397,10 +397,10 @@ test iocmd-8.23 {fconfigure -profile badprofile} -body { test iocmd-9.1 {eof command} { list [catch {eof} msg] $msg $::errorCode -} {1 {wrong # args: should be "eof channelId"} {TCL WRONGARGS}} +} {1 {wrong # args: should be "eof channel"} {TCL WRONGARGS}} test iocmd-9.2 {eof command} { list [catch {eof a b} msg] $msg $::errorCode -} {1 {wrong # args: should be "eof channelId"} {TCL WRONGARGS}} +} {1 {wrong # args: should be "eof channel"} {TCL WRONGARGS}} test iocmd-9.3 {eof command} { catch {close file100} list [catch {eof file100} msg] $msg $::errorCode @@ -410,10 +410,10 @@ test iocmd-9.3 {eof command} { test iocmd-10.1 {fblocked command} { list [catch {fblocked} msg] $msg -} {1 {wrong # args: should be "fblocked channelId"}} +} {1 {wrong # args: should be "fblocked channel"}} test iocmd-10.2 {fblocked command} { list [catch {fblocked a b c d e f g} msg] $msg -} {1 {wrong # args: should be "fblocked channelId"}} +} {1 {wrong # args: should be "fblocked channel"}} test iocmd-10.3 {fblocked command} { list [catch {fblocked file1000} msg] $msg } {1 {can not find channel named "file1000"}} diff --git a/tests/pid.test b/tests/pid.test index 3f62457..5abbe1f 100644 --- a/tests/pid.test +++ b/tests/pid.test @@ -47,7 +47,7 @@ test pid-1.3 {pid command} -constraints pidDefined -setup { } -result {} test pid-1.4 {pid command} pidDefined { list [catch {pid a b} msg] $msg -} {1 {wrong # args: should be "pid ?channelId?"}} +} {1 {wrong # args: should be "pid ?channel?"}} test pid-1.5 {pid command} pidDefined { list [catch {pid gorp} msg] $msg } {1 {can not find channel named "gorp"}} diff --git a/tests/trace.test b/tests/trace.test index 2b16e2f..6dfd556 100644 --- a/tests/trace.test +++ b/tests/trace.test @@ -1714,7 +1714,7 @@ test trace-21.12 {bug 2438181} -setup { trace add execution set2 leave {puts one two three #;} } -body { set2 a hello -} -returnCodes 1 -result {wrong # args: should be "puts ?-nonewline? ?channelId? string"} +} -returnCodes 1 -result {wrong # args: should be "puts ?-nonewline? ?channel? string"} proc factorial {n} { if {$n != 1} { return [expr {$n * [factorial [expr {$n -1 }]]}] } |