summaryrefslogtreecommitdiffstats
path: root/tests/select.test
diff options
context:
space:
mode:
authorandreask <andreask>2013-01-22 19:30:43 (GMT)
committerandreask <andreask>2013-01-22 19:30:43 (GMT)
commit48c9fcb7281cc6aa076113db874c7ae0e105795d (patch)
tree7187940ff056462bfa41705a2ce04d0ed07d424e /tests/select.test
parent41f5d19540b0b3f053da352e1569c9a4ed019dd5 (diff)
downloadtk-contrib_patrick_fradin_code_cleanup.zip
tk-contrib_patrick_fradin_code_cleanup.tar.gz
tk-contrib_patrick_fradin_code_cleanup.tar.bz2
Contribution by Patrick Fradin <patrick.fradin@planar.com>contrib_patrick_fradin_code_cleanup
Quoting his mail: <pre> ========================================================== Hi Jeff, I spent some of my time to contribute to the TclTk community ! I'm in late for Christmas gift but like we said in French : "Mieux vaut tard que jamais". ;-) I've use TclDevKit 5.3.0 tclchecker to analyse TclTk code in Tcl and Tk library directories (library, tools and tests) to correct a lot of warnings and few errors. (encapsulate some expr, use 'chan xxx' instead of fconfigure, fileevent...) I've made some improvements too : Examples : - Use 'lassign' instead of many 'lindex' of 'foreach/break' loop. - Use 'in' or 'ni' operators instead of 'lsearch -exact' or to factorise some eq/ne && / || tests. - Use 'eq' or 'ne' to tests strings instead of '==' or '!='. - Use 'unset -nocomplain' to avoid 'catch {unset...}'. - Remove some useless catch around 'destroy' calls. - Use expand {*} instead of 'eval'. Don't touch a lot of code because I don't know all structs and lists. I think it could be a greater improvement to reduce 'eval' calls. Due to previous experience, I dot not change any indentation ! ;-) ========================================================== </pre>
Diffstat (limited to 'tests/select.test')
-rw-r--r--tests/select.test46
1 files changed, 23 insertions, 23 deletions
diff --git a/tests/select.test b/tests/select.test
index 77bfb2e..7ea661e 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -19,8 +19,8 @@ tcltest::loadTestedCommands
global longValue selValue selInfo
-set selValue {}
-set selInfo {}
+set selValue ""
+set selInfo ""
proc handler {type offset count} {
global selValue selInfo
@@ -29,7 +29,7 @@ proc handler {type offset count} {
if {$numBytes <= 0} {
return ""
}
- string range $selValue $offset [expr $numBytes+$offset]
+ string range $selValue $offset [expr {$numBytes + $offset}]
}
proc errIncrHandler {type offset count} {
@@ -48,10 +48,10 @@ proc errIncrHandler {type offset count} {
if {$numBytes <= 0} {
return ""
}
- string range $selValue $offset [expr $numBytes+$offset]
+ string range $selValue $offset [expr {$numBytes + $offset}]
}
-proc errHandler args {
+proc errHandler {args} {
error "selection handler aborted"
}
@@ -63,7 +63,7 @@ proc badHandler {path type offset count} {
if {$numBytes <= 0} {
return ""
}
- string range $selValue $offset [expr $numBytes+$offset]
+ string range $selValue $offset [expr {$numBytes + $offset}]
}
proc reallyBadHandler {path type offset count} {
global selValue selInfo pass
@@ -79,20 +79,20 @@ proc reallyBadHandler {path type offset count} {
if {$numBytes <= 0} {
return ""
}
- string range $selValue $offset [expr $numBytes+$offset]
+ string range $selValue $offset [expr {$numBytes + $offset}]
}
# Eliminate any existing selection on the screen. This is needed in case
# there is a selection in some other application, in order to prevent races
# from causing false errors in the tests below.
-selection clear .
+selection clear -displayof .
after 1500
# common setup code
-proc setup {{path .f1} {display {}}} {
- catch {destroy $path}
- if {$display == {}} {
+proc setup {{path .f1} {display ""}} {
+ destroy $path
+ if {$display eq ""} {
frame $path
} else {
toplevel $path -screen $display
@@ -743,7 +743,7 @@ test select-6.18 {Tk_SelectionCmd procedure} -returnCodes error -body {
selection get -selectionfoo foo
} -result {bad option "-selectionfoo": must be -displayof, -selection, or -type}
test select-6.19 {Tk_SelectionCmd procedure} -body {
- catch { destroy .f2 }
+ destroy .f2
selection get -displayof .f2
} -returnCodes error -result {bad window path name ".f2"}
test select-6.20 {Tk_SelectionCmd procedure} -returnCodes error -body {
@@ -788,7 +788,7 @@ test select-6.28 {Tk_SelectionCmd procedure} -returnCodes error -body {
selection handle . foo bar baz blat
} -result {wrong # args: should be "selection handle ?-option value ...? window command"}
test select-6.29 {Tk_SelectionCmd procedure} -body {
- catch { destroy .f2 }
+ destroy .f2
selection handle .f2 dummy
} -returnCodes error -result {bad window path name ".f2"}
# selection own
@@ -953,25 +953,25 @@ test select-10.1 {ConvertSelection procedure, race with selection clear} -constr
lappend x [gets $fd]
}
set fd [open "|[list [interpreter] -geometry +0+0 -name tktest]" r+]
- puts $fd "puts foo; [loadTkCommand]; flush stdout"
- flush $fd
- gets $fd
- fileevent $fd readable [list Ready $fd]
+ chan puts $fd "puts foo; [loadTkCommand]; flush stdout"
+ chan flush $fd
+ chan gets $fd
+ chan event $fd readable [list Ready $fd]
set selValue "Just a simple test"
set selInfo ""
selection handle .f1 {handler STRING}
update
- puts $fd {puts "[catch {selection get} msg]:$msg"; puts **DONE**; flush stdout}
- flush $fd
+ chan puts $fd {puts "[catch {selection get} msg]:$msg"; puts **DONE**; flush stdout}
+ chan flush $fd
after 200
selection own .
- set x {}
+ set x ""
vwait [namespace which -variable x]
- puts $fd {exit}
- flush $fd
+ chan puts $fd {exit}
+ chan flush $fd
# Don't understand why, but the [loadTkCommand] above causes
# a "broken pipe" error when Tk was actually [load]ed in the child.
- catch {close $fd}
+ catch {chan close $fd}
lappend x $selInfo
} -result {{1:PRIMARY selection doesn't exist or form "STRING" not defined} {}}
test select-10.2 {ConvertSelection procedure} -constraints unix -setup {