Index: tests/slottest.xotcl =================================================================== diff -u -rbf9bae94d157de9bbd4c398f6a3a9a4d93626025 -r73eb4eccd33d1a940e2d2ca6dccc2f74216f0576 --- tests/slottest.xotcl (.../slottest.xotcl) (revision bf9bae94d157de9bbd4c398f6a3a9a4d93626025) +++ tests/slottest.xotcl (.../slottest.xotcl) (revision 73eb4eccd33d1a940e2d2ca6dccc2f74216f0576) @@ -1,18 +1,8 @@ package require XOTcl; xotcl::use xotcl1 package require xotcl::test -proc ? {cmd expected} { - set t [Test new -cmd $cmd -count 100] - $t expected $expected - $t run -} +Test parameter count 1000 -proc t {cmd expected {txt ""}} { - set t [Test new -cmd $cmd -msg $txt] - $t expected $expected - $t run -} - # what's new: # - slots instances are manager objects for slot values # - generalization of slots to have different kind of domains and managers @@ -116,7 +106,7 @@ ? {O superclass} "::xotcl::Object" Class O2 -superclass O -#t {O2 superclass O} "superclass 1" +#? {O2 superclass O} "superclass 1" ? {O superclass} "::xotcl::Object" ::xotcl::Slot method slot {object name property} { @@ -178,22 +168,22 @@ Object o1 o1 set i 0 ::xotcl::alias o1 Incr -objscope ::incr -t {o1 incr i} 1 "method incr" -t {o1 Incr i} 1002 "aliased tcl incr" -t {o1 incr i} 2003 "method incr" -t {o1 Incr i} 3004 "aliased tcl incr" +? {o1 incr i} 1 "method incr" +? {o1 Incr i} 1002 "aliased tcl incr" +? {o1 incr i} 2003 "method incr" +? {o1 Incr i} 3004 "aliased tcl incr" ::xotcl::alias ::xotcl::Object Set -objscope ::set -t {o1 set i 1} 1 "method set" -t {o1 set i} 1 "method set" -t {o1 Set i 1} 1 "aliased tcl set" -t {o1 Set i} 1 "aliased tcl set" +? {o1 set i 1} 1 "method set" +? {o1 set i} 1 "method set" +? {o1 Set i 1} 1 "aliased tcl set" +? {o1 Set i} 1 "aliased tcl set" ::xotcl::alias o1 Set -objscope ::set -t {o1 Set i 1} 1 "aliased object tcl set" -t {o1 Set i} 1 "aliased object tcl set" +? {o1 Set i 1} 1 "aliased object tcl set" +? {o1 Set i} 1 "aliased object tcl set" ::xotcl::Object instforward SSet -earlybinding -objscope ::set -t {o1 SSet i 1} 1 "forward earlybinding tcl set" -t {o1 SSet i} 1 "forward earlybinding tcl set" +? {o1 SSet i 1} 1 "forward earlybinding tcl set" +? {o1 SSet i} 1 "forward earlybinding tcl set" #exit o1 set z 100 @@ -203,29 +193,29 @@ ? {o1 get z 101} 101 ? {o1 get z} "101" -t {o1 get z} 101 "get value via new parametercmd get" -t {o1 get z 124} 124 "set value via new parametercmd get" +? {o1 get z} 101 "get value via new parametercmd get" +? {o1 get z 124} 124 "set value via new parametercmd get" o1 forward zz -earlybinding ::xotcl::setinstvar %self %proc ? {o1 zz 123} 123 ? {o1 zz} 123 -t {o1 zz} 123 "parametercmd forward earlybinding setinstvar" -t {o1 zz 124} 124 "parametercmd forward earlybinding setinstvar" +? {o1 zz} 123 "parametercmd forward earlybinding setinstvar" +? {o1 zz 124} 124 "parametercmd forward earlybinding setinstvar" o1 forward z2 -earlybinding -objscope ::set %proc -t {o1 z2 111} 111 "parametercmd forward earlybinding tcl set" -t {o1 z2} 111 "parametercmd forward earlybinding tcl set" +? {o1 z2 111} 111 "parametercmd forward earlybinding tcl set" +? {o1 z2} 111 "parametercmd forward earlybinding tcl set" o1 forward z3 -objscope ::set %proc -t {o1 z3 111} 111 "parametercmd forward tcl set" -t {o1 z3} 111 "parametercmd forward tcl set" +? {o1 z3 111} 111 "parametercmd forward tcl set" +? {o1 z3} 111 "parametercmd forward tcl set" o1 set y 11 o1 parametercmd y -t {o1 y} 11 "parametercmd" -t {o1 y 1} 1 "parametercmd" +? {o1 y} 11 "parametercmd" +? {o1 y 1} 1 "parametercmd" #Class C -parameter {a {b 10} {c "Hello World"}} #C copy V @@ -282,8 +272,8 @@ ? {c2 c} "Hello World" -t {c2 a} 1 "new indirect parametercmd" -t {c2 a 1} 1 "new indirect parametercmd" +? {c2 a} 1 "new indirect parametercmd" +? {c2 a 1} 1 "new indirect parametercmd" ::xotcl::Slot mixin add ::xotcl::Slot::Optimizer @@ -298,8 +288,8 @@ ? {c3 b} 10 ? {c3 c} "Hello World" -t {c3 a} 1 "new indirect parametercmd optimized" -t {c3 a 1} 1 "new indirect parametercmd optimized" +? {c3 a} 1 "new indirect parametercmd optimized" +? {c3 a 1} 1 "new indirect parametercmd optimized" ####### nasty names Class create D -slots { @@ -526,8 +516,8 @@ o1 forward x -earlybinding ::xotcl::setinstvar %self %proc ? [list o1 x] 42 ? [list o1 x 41] 41 -t {o1 x} "get parametercmd via forward (earlybinding)" -t {o1 x 41} "set parametercmd via forward (earlybinding)" +? {o1 x} "get parametercmd via forward (earlybinding)" +? {o1 x 41} "set parametercmd via forward (earlybinding)" #obj forward Mixin -default {getter setter} mixin %1 %self o1 forward z -default {getter setter} %self @@ -536,34 +526,34 @@ o1 myfset y 102 ? {o1 myfset y} 102 -t {o1 myfset y} "get instvar value via forward" -t {o1 myfset y 122} "set instvar value via forward" +? {o1 myfset y} "get instvar value via forward" +? {o1 myfset y 122} "set instvar value via forward" o1 forward myfdset -earlybinding -objscope set o1 myfdset y 103 ? {o1 myfdset y} 103 -t {o1 myfdset y} "get instvar value via forward -earlybinding" -t {o1 myfdset y 123} "set instvar value via forward -earlybinding" +? {o1 myfdset y} "get instvar value via forward -earlybinding" +? {o1 myfdset y 123} "set instvar value via forward -earlybinding" ::xotcl::alias o1 myset -objscope ::set o1 myset x 101 ? {o1 myset x} 101 -t {o1 myset x} "get instvar value via set alias" -t {o1 myset x 123} "set instvar value via set alias" +? {o1 myset x} "get instvar value via set alias" +? {o1 myset x 123} "set instvar value via set alias" -t {p1 age} "slot read" +? {p1 age} "slot read" Class P -parameter {age {s -setter sets}} P instproc sets {var value} { my set $var $value } P create p2 -age 345 -s 567 -t {p2 age} "parametercmd read" -t {::xotcl::setinstvar p2 age} "via setinstvar" -t {p2 s} "parameter read with setter" +? {p2 age} "parametercmd read" +? {::xotcl::setinstvar p2 age} "via setinstvar" +? {p2 s} "parameter read with setter"