Index: tests/info-method.test =================================================================== diff -u -rdf2936cf5ecc9a2d5473804c9b5e49b67fc02f50 -rd79efb10b92ad2045196990af50bc042e60b88f4 --- tests/info-method.test (.../info-method.test) (revision df2936cf5ecc9a2d5473804c9b5e49b67fc02f50) +++ tests/info-method.test (.../info-method.test) (revision d79efb10b92ad2045196990af50bc042e60b88f4) @@ -155,17 +155,17 @@ :public object method foo args {;} } - ? {lsort [MC info methods -methodtype scripted -callprotection public]} "foo" - ? {lsort [MC info methods -methodtype scripted -callprotection protected]} "bar1 bar2" - ? {lsort [MC info methods -methodtype scripted -callprotection all]} "bar1 bar2 foo" + ? {lsort [MC info methods -type scripted -callprotection public]} "foo" + ? {lsort [MC info methods -type scripted -callprotection protected]} "bar1 bar2" + ? {lsort [MC info methods -type scripted -callprotection all]} "bar1 bar2 foo" ::nsf::method::property ::MC foo call-protected true ::nsf::method::property ::MC bar2 call-protected false - ? {lsort [MC info methods -methodtype scripted -callprotection public]} "bar2" - ? {lsort [MC info methods -methodtype scripted -callprotection protected]} "bar1 foo" - ? {lsort [MC info methods -methodtype scripted -callprotection all]} "bar1 bar2 foo" + ? {lsort [MC info methods -type scripted -callprotection public]} "bar2" + ? {lsort [MC info methods -type scripted -callprotection protected]} "bar1 foo" + ? {lsort [MC info methods -type scripted -callprotection all]} "bar1 bar2 foo" ::nx::configure defaultMethodCallProtection false } @@ -677,14 +677,14 @@ # test "info method parameters" # ? {nx::Object info method parameters "info lookup methods"} \ - "-callprotection -incontext:switch -methodtype -nomixins:switch -path:switch -source pattern:optional" + "-callprotection -incontext:switch -type -nomixins:switch -path:switch -source pattern:optional" ? {nx::Object info method syntax "info lookup methods"} \ - "/cls/ info lookup methods ?-callprotection all|public|protected|private? ?-incontext? ?-methodtype all|scripted|builtin|alias|forwarder|object|setter|nsfproc? ?-nomixins? ?-path? ?-source all|application|baseclasses? ?/pattern/?" + "/cls/ info lookup methods ?-callprotection all|public|protected|private? ?-incontext? ?-type all|scripted|builtin|alias|forwarder|object|setter|nsfproc? ?-nomixins? ?-path? ?-source all|application|baseclasses? ?/pattern/?" ? {o info object method parameters "foo b"} "x:int y:upper" ? {nx::Object info method parameters ::nx::Object::slot::__info::lookup::methods} \ - "-callprotection -incontext:switch -methodtype -nomixins:switch -path:switch -source pattern:optional" + "-callprotection -incontext:switch -type -nomixins:switch -path:switch -source pattern:optional" ? {o info object method parameters "::o::foo::b"} "x:int y:upper" ? {nx::Object info method registrationhandle "info"} "::nsf::classes::nx::Object::info"