summaryrefslogtreecommitdiffstats
path: root/tests/choosedir.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/choosedir.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/choosedir.test')
-rw-r--r--tests/choosedir.test18
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/choosedir.test b/tests/choosedir.test
index fb6e62d..3a2932b 100644
--- a/tests/choosedir.test
+++ b/tests/choosedir.test
@@ -32,12 +32,12 @@ proc PressButton {btn} {
proc EnterDirsByKey {parent dirs} {
global tk_strictMotif
- if {$parent == "."} {
+ if {$parent eq "."} {
set w .__tk_choosedir
} else {
set w $parent.__tk_choosedir
}
- upvar ::tk::dialog::file::__tk_choosedir data
+ upvar 1 ::tk::dialog::file::__tk_choosedir data
foreach dir $dirs {
$data(ent) delete 0 end
@@ -50,19 +50,19 @@ proc EnterDirsByKey {parent dirs} {
proc SendButtonPress {parent btn type} {
global tk_strictMotif
- if {$parent == "."} {
+ if {$parent eq "."} {
set w .__tk_choosedir
} else {
set w $parent.__tk_choosedir
}
- upvar ::tk::dialog::file::__tk_choosedir data
+ upvar 1 ::tk::dialog::file::__tk_choosedir data
set button $data($btn\Btn)
- if ![winfo ismapped $button] {
+ if {![winfo ismapped $button]} {
update
}
- if {$type == "mouse"} {
+ if {$type eq "mouse"} {
PressButton $button
} else {
event generate $w <Enter>
@@ -105,7 +105,6 @@ test choosedir-1.6 {tk_chooseDirectory command} -constraints unix -body {
tk_chooseDirectory -parent foo.bar
} -returnCodes error -result {bad window path name "foo.bar"}
-
test choosedir-2.1 {tk_chooseDirectory command, cancel gives null} -constraints {
unix notAqua
} -body {
@@ -113,7 +112,6 @@ test choosedir-2.1 {tk_chooseDirectory command, cancel gives null} -constraints
tk_chooseDirectory -title "Press Cancel" -parent $parent
} -result {}
-
test choosedir-3.1 {tk_chooseDirectory -mustexist 1} -constraints {
unix notAqua
} -body {
@@ -132,7 +130,6 @@ test choosedir-3.2 {tk_chooseDirectory -mustexist 0} -constraints {
-parent $parent -mustexist 0
} -result $fake
-
test choosedir-4.1 {tk_chooseDirectory command, initialdir} -constraints {
unix notAqua
} -body {
@@ -150,14 +147,13 @@ test choosedir-4.2 {tk_chooseDirectory command, initialdir} -constraints {
test choosedir-4.3 {tk_chooseDirectory command, {} initialdir} -constraints {
unix notAqua
} -body {
- catch {unset ::tk::dialog::file::__tk_choosedir}
+ unset -nocomplain ::tk::dialog::file::__tk_choosedir
ToPressButton $parent ok
tk_chooseDirectory \
-title "Press OK" \
-parent $parent -initialdir ""
} -result [pwd]
-
test choosedir-5.1 {tk_chooseDirectory, handles {} entry text} -constraints {
unix notAqua
} -body {