summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2006-08-26 13:00:38 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2006-08-26 13:00:38 (GMT)
commit8d05e9798827f58abf7ac5d5d28d2b03ede92daa (patch)
tree3df61a5d622e226e99dba583252d97dab5356aea /tests
parentccfa5605f3ee0ddba99ef360e7c3bc5414558987 (diff)
downloadtcl-8d05e9798827f58abf7ac5d5d28d2b03ede92daa.zip
tcl-8d05e9798827f58abf7ac5d5d28d2b03ede92daa.tar.gz
tcl-8d05e9798827f58abf7ac5d5d28d2b03ede92daa.tar.bz2
bugfix, docs clarification and new tests for 'namespace upvar' [Bug 1546833]
Diffstat (limited to 'tests')
-rw-r--r--tests/upvar.test118
1 files changed, 106 insertions, 12 deletions
diff --git a/tests/upvar.test b/tests/upvar.test
index 134e0c1..2b8bbab 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: upvar.test,v 1.12 2006/04/06 18:19:28 dgp Exp $
+# RCS: @(#) $Id: upvar.test,v 1.13 2006/08/26 13:00:39 msofer Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -414,6 +414,7 @@ catch {unset a}
# assume that the behaviour of variables once the link is established has
# already been tested above.
#
+#
# Clear out any namespaces called test_ns_*
catch {namespace delete {expand}[namespace children :: test_ns_*]}
@@ -422,34 +423,127 @@ namespace eval test_ns_0 {
variable x test_ns_0
}
-namespace eval test_ns_1 {
- variable x test_ns_1
-}
-
-namespace eval test_ns_2 {}
-
set x test_global
test upvar-NS-1.1 {nsupvar links to correct variable} \
-body {
- namespace eval test_ns_2 {
+ namespace eval test_ns_1 {
namespace upvar ::test_ns_0 x w
set w
}
} \
- -result {test_ns_0}
+ -result {test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
test upvar-NS-1.2 {nsupvar links to correct variable} \
-body {
- namespace eval test_ns_2 {
+ namespace eval test_ns_1 {
proc a {} {
namespace upvar ::test_ns_0 x w
set w
}
- return [a][rename a {}]
+ return [a]
+ }
+ } \
+ -result {test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.3 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ } \
+ -result {namespace "test_ns_0" does not exist} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.4 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
+ }
+ } \
+ -result {namespace "test_ns_0" does not exist} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.5 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {}
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ } \
+ -result {can't read "w": no such variable} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.6 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {}
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
}
} \
- -result {test_ns_0}
+ -result {can't read "w": no such variable} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.7 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {
+ variable x test_ns_1::test_ns_0
+ }
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ } \
+ -result {test_ns_1::test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.8 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {
+ variable x test_ns_1::test_ns_0
+ }
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
+ }
+ } \
+ -result {test_ns_1::test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.9 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ variable x test_ns_1
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
+ }
+ } \
+ -result {namespace "test_ns_0" does not exist} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
# cleanup
::tcltest::cleanupTests