Index: openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl 8 Dec 2012 17:42:32 -0000 1.9 +++ openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl 27 Oct 2014 16:40:10 -0000 1.10 @@ -23,18 +23,14 @@ } error] ad_proc -callback a_callback { -arg1 arg2 } { this is a test callback } - - set callback_procs [info command ::callback::a_callback::*] + set callback_procs [info commands ::callback::a_callback::*] aa_true "creation of a valid callback contract with '-' body" \ - [expr {[lsearch -exact \ - $callback_procs \ - ::callback::a_callback::contract] >= 0}] + [expr {"::callback::a_callback::contract" in $callback_procs}] ad_proc -callback a_callback_2 { arg1 arg2 } { this is a test callback } {} set callback_procs [info commands ::callback::a_callback_2::*] aa_true "creation of a valid callback contract with no body" \ - [expr {[lsearch -exact \ - $callback_procs \ - ::callback::a_callback_2::contract] >= 0}] + [expr {"::callback::a_callback_2::contract" in $callback_procs}] aa_true "throw error for missing -callback on implementation definition" \ [catch { @@ -52,9 +48,7 @@ } set impl_procs [info commands ::callback::a_callback::impl::*] aa_true "creation of a valid callback implementation" \ - [expr {[lsearch -exact \ - $impl_procs \ - ::callback::a_callback::impl::an_impl] >= 0}] + [expr {"::callback::a_callback::impl::an_impl" in $impl_procs}] } ad_proc -callback a_callback {