Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Experiment with wrapping [::tcltest::test] |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | amg-array-enum-c-api |
Files: | files | file ages | folders |
SHA1: |
297167a9bf14ae2b193a3d997269ca73 |
User & Date: | andy 2016-12-02 20:50:54 |
Context
2016-12-02
| ||
21:00 | Merge trunk check-in: 4ab23eded7 user: andy tags: amg-array-enum-c-api | |
20:50 | Experiment with wrapping [::tcltest::test] check-in: 297167a9bf user: andy tags: amg-array-enum-c-api | |
2016-12-01
| ||
22:32 | Minor test tweaks, add test for nonexistent arrays check-in: 11cd8e8297 user: andy tags: amg-array-enum-c-api | |
Changes
Changes to tests/array.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # Commands covered: array # # This file contains a collection of tests for one or more of the Tcl # built-in commands. Sourcing this file into Tcl runs the tests and # generates output for errors. No output means no errors were found. # # Copyright (c) 2016 Andy Goth # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. if {[lsearch [namespace children] ::tcltest] < 0} { package require tcltest 2 | < < | | < < | < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | # Commands covered: array # # This file contains a collection of tests for one or more of the Tcl # built-in commands. Sourcing this file into Tcl runs the tests and # generates output for errors. No output means no errors were found. # # Copyright (c) 2016 Andy Goth # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. if {[lsearch [namespace children] ::tcltest] < 0} { package require tcltest 2 } ::tcltest::loadTestedCommands catch {package require -exact Tcltest [info patchlevel]} set namespaces [namespace children] set procs [info procs] set vars [info vars] # [array] subcommand arrayName mode and filter # ------------------ -------------------- --------------- # anymore array required not allowed # donesearch array required not allowed # exists anything optional # get anything optional |
︙ | ︙ | |||
73 74 75 76 77 78 79 | # - (no filter) # - (default) # - -exact # - -glob # - -regexp # - -regexp (with invalid regexp pattern) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < | | | | | | < | | | > > | | > | > > > | | | | > > > | | | < < < < < | > > > > > > > > > > > > > | | | | | | > > > > | | < | | > | | | > > > | | | | | | > > > | | | | < > | > > > | | | | > | | | > > > | | > > | < < < < < < < | < > | > > > | < < > | > > | | | > > > > > > | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | # - (no filter) # - (default) # - -exact # - -glob # - -regexp # - -regexp (with invalid regexp pattern) # oxjoin -- # oxand -- # oxor -- # Joins a list by commas, a connector word, or both, using Oxford comma rules, # matching Tcl's internal algorithm for displaying lists in error messages. proc oxjoin {connector list} { if {[llength $list] > 1} { lset list end "$connector [lindex $list end]" } if {[llength $list] < 3} { join $list " " } else { join $list ", " } } interp alias {} oxand {} oxjoin and interp alias {} oxor {} oxjoin or # samples -- # Produces a list of sample arguments, given a list of parameters. proc samples {params} { lmap param $params {dict get { arrayName a searchId s-1-a ?mode? -exact ?pattern? hello list {hello world} } $param} } # test -- # Wrapper around [::tcltest::test] with additional features: # # - Single-argument design gives a cleaner visual presentation. # - All script execution is performed in a new stack frame. # - Script variables are shared across scripts via a temporary namespace. # - All definition values (except scripts) are [subst]'ed. # # The $def argument is a dict which defines the test. Its possible keys are: # # - name | desc # Test name and description. # # - {scalar name} | {array name} # The name component of the key is the name of a scalar or array variable, and # the value is the initial scalar value or array dictionary value. These # variables are shared across the setup, body, and cleanup scripts. # # - link # Uninitialized variables shared across the setup, body, and cleanup scripts. # # - setup | body | cleanup # The scripts are modified to include variable initialization, linkage, and # finalization and to be executed inside new stack frames. # # - constraints | result | output | errorOutput | returnCodes | match # See tcltest(n) for the purpose of these keys. proc test {def} { # Perform uplevel substitutions, and process scalar and array arguments. set scalars {} set arrays {} dict for {key val} $def { if {$key ni {setup body cleanup}} { dict set def $key [set val [uplevel [list subst $val]]] } if {[llength $key] == 2} { if {[lindex $key 0] eq "scalar"} { dict set scalars [lindex $key 1] $val dict unset def $key } elseif {[lindex $key 0] eq "array"} { dict set arrays [lindex $key 1] $val dict unset def $key } } } # Augment scripts with variable initialization, linkage, and finalization. dict lappend def link {*}[dict keys $scalars] {*}[dict keys $arrays] if {[llength [dict get $def link]]} { # Ensure all three scripts exist, even if empty. foreach key {setup body cleanup} { dict append def $key } # Build variable initialization, linkage, and finalization snippets. set initial [list namespace eval ::TestVar [join [list\ [list variable {*}$scalars]\ {*}[lmap {var val} $arrays {list variable $var}]\ {*}[lmap {var val} $arrays {list array set $var $val}]] \n]] set linkage [join [lmap var [dict get $def link]\ {list variable ::TestVar::$var}] \n] set final [list namespace delete ::TestVar] # Update scripts. dict set def setup $initial\n$linkage\n[dict get $def setup] dict set def body $linkage\n[dict get $def body] dict set def cleanup $linkage\n[dict get $def cleanup]\n$final } dict unset def link # Convert scripts to zero-argument lambda invocations. foreach key {setup body cleanup} { if {[dict exists $def $key]} { dict set def $key [list apply [list {} [dict get $def $key]]] } } # Assemble the Tcltest command. set command [list ::tcltest::test [dict get $def name] [dict get $def desc]] dict unset def name dict unset def desc foreach key {constraints setup body cleanup result output errorOutput returnCodes match} { if {[dict exists $def $key]} { lappend command -$key [dict get $def $key] dict unset def $key } } # Complain if there are any invalid test definition keys. if {[dict size $def]} { error "bad test definition key(s): [oxand [dict keys $def]]" } # Run the Tcltest command. tailcall {*}$command } # Formal parameters for each array subcommand. set params { anymore {arrayName searchId} donesearch {arrayName searchId} exists {arrayName ?mode? ?pattern?} get {arrayName ?mode? ?pattern?} names {arrayName ?mode? ?pattern?} nextelement {arrayName searchId} set {arrayName list} size {arrayName ?mode? ?pattern?} startsearch {arrayName ?mode? ?pattern?} statistics {arrayName} unset {arrayName ?mode? ?pattern?} } # List of array subcommands. set commands [lsort [dict keys $params]] # Ambiguous and unambiguous abbreviations of array subcommands. foreach cmd $commands { for {set i 0} {$i < [string length $cmd] - 1} {incr i} { set abbrev [string range $cmd 0 $i] if {$abbrev in $commands || [llength [lsearch -all $commands $abbrev*]] == 1} { dict lappend abbrevs $cmd $abbrev } else { dict set ambig $abbrev {} } } } set ambig [lsort [dict keys $ambig]] # List of valid array filter mode options. set modes [lsort {-exact -glob -regexp}] # array-1.*: subcommand dispatch. test { name array-1.1 desc {no subcommand} body {array} returnCodes error result {wrong # args: should be "array subcommand ?arg ...?"} } test { name array-1.2 desc {empty subcommand} body {array {}} returnCodes error result {unknown or ambiguous subcommand "": must be [oxor $commands]} } test { name array-1.3 desc {invalid subcommand} body {array BAD&CMD} returnCodes error result {unknown or ambiguous subcommand "BAD&CMD": must be [oxor $commands]} } foreach cmd $ambig { test { name array-1.4.$cmd desc {ambiguous subcommand: \[array $cmd\]} {scalar cmd} $cmd body {array $cmd} returnCodes error result {unknown or ambiguous subcommand "$cmd":\ must be [oxor $commands]} } } foreach cmd $commands { test { name array-1.5.$cmd desc {formal parameter lists: \[array $cmd\]} {scalar cmd} $cmd body {array $cmd} returnCodes error result {wrong # args: should be "array $cmd [dict get $params $cmd]"} } } # array-2.*: common argument parsing. foreach cmd $commands { test { name array-2.1.$cmd desc {too many arguments: \[array $cmd\]} {scalar cmd} $cmd {scalar args} {[lmap param [dict get $params $cmd] {samples $param}]} body {array $cmd {*}$args extra} returnCodes error result {wrong # args: should be "array $cmd [dict get $params $cmd]"} } if {"?mode?" in [dict get $params $cmd]} { test { name array-2.2.$cmd desc {ambiguous mode: \[array $cmd\]"} {scalar cmd} $cmd {array a} {} body {array $cmd a {} {}} returnCodes error result {ambiguous option "": must be [oxor $modes]} } test { name array-2.3.$cmd desc {invalid mode: \[array $cmd\]} {scalar cmd} $cmd {array a} {} body {array $cmd a INVALID {}} returnCodes error result {bad option "INVALID": must be [oxor $modes]} } test { name array-2.4.$cmd desc {invalid regexp: \[array $cmd\]} {scalar cmd} $cmd {array a} {e 1} body {array $cmd a -regexp *} returnCodes error result {couldn't compile regular expression pattern:\ quantifier operand invalid} } } test { name array-2.5.$cmd desc {array trace error during variable lookup: \[array $cmd\]} {scalar cmd} $cmd {scalar args} {[lmap param [dict get $params $cmd] {samples $param}]} link a setup {trace add variable a array {apply {{args} {error $args}}}} body {array $cmd {*}$args} returnCodes error result {can't trace array "a": a {} array} } } foreach cmd {anymore donesearch nextelement startsearch statistics} { test { name array-2.6.$cmd desc {nonexistent array: \[array $cmd\]} {scalar cmd} $cmd {scalar args} {[samples [dict get $params $cmd]]} body {array $cmd {*}$args} returnCodes error result {"a" isn't an array} } } # Cleanup. foreach namespace [namespace children] { if {$namespace ni $namespaces} { namespace delete $namespace } } foreach proc [info procs] { if {$proc ni $procs} { rename $proc {} } } foreach var [info vars] { if {$var ne "vars" && $var ni $vars} { unset $var } } unset -nocomplain var vars ::tcltest::cleanupTests return # vim: set sts=4 sw=4 tw=80 et ft=tcl: # Local Variables: # mode: tcl # End: |