summaryrefslogtreecommitdiffstats
path: root/tests/xmfbox.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/xmfbox.test')
-rw-r--r--tests/xmfbox.test107
1 files changed, 41 insertions, 66 deletions
diff --git a/tests/xmfbox.test b/tests/xmfbox.test
index f50329c..b60bf48 100644
--- a/tests/xmfbox.test
+++ b/tests/xmfbox.test
@@ -1,4 +1,4 @@
-# xmfbox.test --
+# xmfbox.test --
#
# This file is a Tcl script to test the file dialog that's used
# when the tk_strictMotif flag is set. Because the file dialog
@@ -10,104 +10,89 @@
# Contributions from Don Porter, NIST, 2002. (not subject to US copyright)
# All rights reserved.
-package require tcltest 2.2
-namespace import ::tcltest::*
-tcltest::configure {*}$argv
+package require tcltest 2.1
+eval tcltest::configure $argv
tcltest::loadTestedCommands
set testPWD [pwd]
+catch {unset foo}
+
catch {unset data foo}
proc cleanup {} {
global testPWD
set err0 [catch {
- cd $testPWD
+ cd $testPWD
} msg0]
set err1 [catch {
- if [file exists ./~nosuchuser1] {
- file delete ./~nosuchuser1
- }
+ if [file exists ./~nosuchuser1] {
+ file delete ./~nosuchuser1
+ }
} msg1]
set err2 [catch {
- if [file exists ./~nosuchuser2] {
- file delete ./~nosuchuser2
- }
+ if [file exists ./~nosuchuser2] {
+ file delete ./~nosuchuser2
+ }
} msg2]
set err3 [catch {
- if [file exists ./~nosuchuser3] {
- file delete ./~nosuchuser3
- }
+ if [file exists ./~nosuchuser3] {
+ file delete ./~nosuchuser3
+ }
} msg3]
set err4 [catch {
- if [file exists ./~nosuchuser4] {
- file delete ./~nosuchuser4
- }
+ if [file exists ./~nosuchuser4] {
+ file delete ./~nosuchuser4
+ }
} msg4]
if {$err0 || $err1 || $err2 || $err3 || $err4} {
- error [list $msg0 $msg1 $msg2 $msg3 $msg4]
+ error [list $msg0 $msg1 $msg2 $msg3 $msg4]
}
catch {unset foo}
- destroy .foo
+ catch {destroy .foo}
}
-# ----------------------------------------------------------------------
-
-test xmfbox-1.1 {tk::MotifFDialog_Create, -parent switch} -constraints {
- unix
-} -setup {
+test xmfbox-1.1 {tk::MotifFDialog_Create, -parent switch} unix {
catch {unset foo}
-} -body {
set x [tk::MotifFDialog_Create foo open {-parent .}]
-} -cleanup {
- destroy $x
-} -result {.foo}
+ catch {destroy $x}
+ set x
+} .foo
-test xmfbox-1.2 {tk::MotifFDialog_Create, -parent switch} -constraints {
- unix
-} -setup {
+test xmfbox-1.2 {tk::MotifFDialog_Create, -parent switch} unix {
catch {unset foo}
- deleteWindows
-} -body {
toplevel .bar
wm geometry .bar +0+0
set x [tk::MotifFDialog_Create foo open {-parent .bar}]
-} -cleanup {
- destroy $x
- destroy .bar
-} -result {.bar.foo}
+ catch {destroy $x}
+ catch {destroy .bar}
+ set x
+} .bar.foo
-
-test xmfbox-2.1 {tk::MotifFDialog_InterpFilter, ~ in dir names} -constraints {
- unix
-} -body {
+test xmfbox-2.1 {tk::MotifFDialog_InterpFilter, ~ in dir names} unix {
cleanup
file mkdir ./~nosuchuser1
set x [tk::MotifFDialog_Create foo open {}]
$::tk::dialog::file::foo(fEnt) delete 0 end
$::tk::dialog::file::foo(fEnt) insert 0 [pwd]/~nosuchuser1
set kk [tk::MotifFDialog_InterpFilter $x]
-} -result "$testPWD/~nosuchuser1 *"
+} [list $testPWD/~nosuchuser1 *]
-test xmfbox-2.2 {tk::MotifFDialog_InterpFilter, ~ in file names} -constraints {
- unix
-} -body {
+test xmfbox-2.2 {tk::MotifFDialog_InterpFilter, ~ in file names} unix {
cleanup
close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
set x [tk::MotifFDialog_Create foo open {}]
$::tk::dialog::file::foo(fEnt) delete 0 end
$::tk::dialog::file::foo(fEnt) insert 0 [pwd]/~nosuchuser1
set kk [tk::MotifFDialog_InterpFilter $x]
-} -result "$testPWD ./~nosuchuser1"
+} [list $testPWD ./~nosuchuser1]
-test xmfbox-2.3 {tk::MotifFDialog_Update, ~ in file names} -constraints {
- unix
-} -body {
+test xmfbox-2.3 {tk::MotifFDialog_Update, ~ in file names} unix {
cleanup
close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
set x [tk::MotifFDialog_Create foo open {}]
@@ -116,21 +101,17 @@ test xmfbox-2.3 {tk::MotifFDialog_Update, ~ in file names} -constraints {
tk::MotifFDialog_InterpFilter $x
tk::MotifFDialog_Update $x
$::tk::dialog::file::foo(fList) get end
-} -result {~nosuchuser1}
+} ~nosuchuser1
-test xmfbox-2.4 {tk::MotifFDialog_LoadFile, ~ in file names} -constraints {
- unix
-} -body {
+test xmfbox-2.4 {tk::MotifFDialog_LoadFile, ~ in file names} unix {
cleanup
close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
set x [tk::MotifFDialog_Create foo open {}]
set i [lsearch [$::tk::dialog::file::foo(fList) get 0 end] ~nosuchuser1]
expr {$i >= 0}
-} -result 1
+} 1
-test xmfbox-2.5 {tk::MotifFDialog_BrowseFList, ~ in file names} -constraints {
- unix
-} -body {
+test xmfbox-2.5 {tk::MotifFDialog_BrowseFList, ~ in file names} unix {
cleanup
close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
set x [tk::MotifFDialog_Create foo open {}]
@@ -139,11 +120,9 @@ test xmfbox-2.5 {tk::MotifFDialog_BrowseFList, ~ in file names} -constraints {
$::tk::dialog::file::foo(fList) selection set $i
tk::MotifFDialog_BrowseFList $x
$::tk::dialog::file::foo(sEnt) get
-} -result "$testPWD/~nosuchuser1"
+} $testPWD/~nosuchuser1
-test xmfbox-2.6 {tk::MotifFDialog_ActivateFList, ~ in file names} -constraints {
- unix
-} -body {
+test xmfbox-2.6 {tk::MotifFDialog_ActivateFList, ~ in file names} unix {
cleanup
close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
set x [tk::MotifFDialog_Create foo open {}]
@@ -154,13 +133,9 @@ test xmfbox-2.6 {tk::MotifFDialog_ActivateFList, ~ in file names} -constraints {
tk::MotifFDialog_ActivateFList $x
list $::tk::dialog::file::foo(selectPath) \
$::tk::dialog::file::foo(selectFile) $tk::Priv(selectFilePath)
-} -result "$testPWD ~nosuchuser1 $testPWD/~nosuchuser1"
+} [list $testPWD ~nosuchuser1 $testPWD/~nosuchuser1]
# cleanup
cleanup
cleanupTests
return
-
-# Local variables:
-# mode: tcl
-# End: