Index: tests/methods.test =================================================================== diff -u -r714fdeeeeca44ee6f77d93349a0afec4c4b139cc -r85ee1fdb043ed3f82fd272cc004c476c40861fdb --- tests/methods.test (.../methods.test) (revision 714fdeeeeca44ee6f77d93349a0afec4c4b139cc) +++ tests/methods.test (.../methods.test) (revision 85ee1fdb043ed3f82fd272cc004c476c40861fdb) @@ -66,10 +66,10 @@ } C property -accessor public s0 C property -accessor protected s1 -? {c1 s0 0} 0 -? {::nsf::dispatch c1 s1 1} 1 +? {c1 s0 assign 0} 0 +? {::nsf::dispatch c1 s1 assign 1} 1 C object property -accessor public {s3 ""} -? {C s3 3} 3 +? {C s3 assign 3} 3 # create a fresh object (different from c1) C create c2 @@ -93,9 +93,9 @@ nx::test case class-level-setter { ? {c2 plain_setter 1} {::c2: unable to dispatch method 'plain_setter'} #? {c2 plain_setter 1} 1 - ? {c2 public_setter 2} "2" - ? {catch {c2 protected_setter 3}} 1 - ? {::nsf::dispatch c2 protected_setter 4} "4" + ? {c2 public_setter assign 2} "2" + ? {catch {c2 protected_setter assign 3}} 1 + ? {::nsf::dispatch c2 protected_setter assign 4} "4" } # class level alias .... @@ -128,9 +128,9 @@ nx::test case class-object-level-setter { ? {C plain_object_setter 1} {method 'plain_object_setter' unknown for ::C; consider '::C create plain_object_setter 1' instead of '::C plain_object_setter 1'} #? {C plain_object_setter 1} "1" - ? {C public_object_setter 2} "2" - ? {catch {C protected_object_setter 3}} 1 - ? {::nsf::dispatch C protected_object_setter 4} "4" + ? {C public_object_setter assign 2} "2" + ? {catch {C protected_object_setter assign 3}} 1 + ? {::nsf::dispatch C protected_object_setter assign 4} "4" } # class level alias .... @@ -163,9 +163,9 @@ nx::test case object-level-setter { ? {c1 plain_object_setter 1} {::c1: unable to dispatch method 'plain_object_setter'} #? {c1 plain_object_setter 1} "1" - ? {c1 public_object_setter 2} "2" - ? {catch {c1 protected_object_setter 3}} 1 - ? {::nsf::dispatch c1 protected_object_setter 4} "4" + ? {c1 public_object_setter assign 2} "2" + ? {catch {c1 protected_object_setter assign 3}} 1 + ? {::nsf::dispatch c1 protected_object_setter assign 4} "4" } # object level alias .... @@ -282,16 +282,16 @@ } C create c1 -a 1 - ? {c1 a} 1 + ? {c1 a get} 1 ? {c1 cget -b} b1 ? {c1 cget -c} c1 ? {c1 d} "::c1: unable to dispatch method 'd'" - ? {C A 2} 2 - ? {C A} 2 + ? {C A assign 2} 2 + ? {C A get} 2 ? {C B} {method 'B' unknown for ::C; consider '::C create B ' instead of '::C B '} #? {C B} B2 - ? {C C} C2 + ? {C C get} C2 ? {C D} "method 'D' unknown for ::C; consider '::C create D ' instead of '::C D '" nx::Object create o { @@ -303,10 +303,10 @@ :object property -accessor public {c c1} :object property -accessor protected {d d1} } - ? {o a 2} 2 + ? {o a assign 2} 2 ? {o b} {::o: unable to dispatch method 'b'} #? {o b} b1 - ? {o c} c1 + ? {o c get} c1 ? {o d} "::o: unable to dispatch method 'd'" } @@ -347,11 +347,11 @@ :property -accessor public a:int :create c1 } - ? {C x 1} 1 - ? {C x} 1 + ? {C x assign 1} 1 + ? {C x get} 1 ? {lsort [C info methods]} "a" ? {lsort [C info object methods]} "x" - ? {c1 a b} {expected integer but got "b" for parameter "a"} + ? {c1 a assign b} {expected integer but got "b" for parameter "value"} set s(C) [C serialize] set s(c1) [c1 serialize] @@ -370,10 +370,10 @@ ? {nsf::object::exists c1} 1 # tests should work as again - ? {C x} 1 + ? {C x get} 1 ? {lsort [C info methods]} "a" ? {lsort [C info object methods]} "x" - ? {c1 a b} {expected integer but got "b" for parameter "a"} + ? {c1 a assign b} {expected integer but got "b" for parameter "value"} } # @@ -434,7 +434,7 @@ } # dispatch methods without current object - ? ::o::a "method ::o::a not dispatched on valid object" + ? ::o::a {wrong # args: use "::o ::o::a assign|get"} ? ::o::b "::o2" ? ::o::foo "no current object; command called outside the context of a Next Scripting method" ? ::o::x "no current object; x called outside the context of a Next Scripting method"