diff --git a/Examples/test-suite/php4/abstract_inherit_runme.php4 b/Examples/test-suite/php4/abstract_inherit_runme.php4 index 358d2741f..27cfb3818 100644 --- a/Examples/test-suite/php4/abstract_inherit_runme.php4 +++ b/Examples/test-suite/php4/abstract_inherit_runme.php4 @@ -3,7 +3,7 @@ require "tests.php4"; require "abstract_inherit.php"; -check::classes(array(foo,bar,spam)); +check::classes(array(foo,bar,spam,nrfilter_i,nrrcfilter_i,nrrcfilterpro_i,nrrcfilterpri_i)); // This constructor attempt should fail as there isn't one //$spam=new Spam(); diff --git a/Examples/test-suite/php4/arrays_global_runme.php4 b/Examples/test-suite/php4/arrays_global_runme.php4 index 07d3be6ef..d3e4c9d6f 100644 --- a/Examples/test-suite/php4/arrays_global_runme.php4 +++ b/Examples/test-suite/php4/arrays_global_runme.php4 @@ -4,11 +4,9 @@ require "tests.php4"; require "arrays_global.php"; -// No new functions -check::functions(array()); -// No new classes -check::classes(array(simplestruct)); -check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i)); +check::functions(array(test_a,test_b)); +check::classes(array(simplestruct,material)); +check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i,beginstring_fix44a,beginstring_fix44b,beginstring_fix44c,beginstring_fix44d,beginstring_fix44e,beginstring_fix44f,chitmat,hitmat_val,hitmat)); check::set(array_c,"hac"); check::equal("ha",check::get(array_c,"ha"),"set array_c"); diff --git a/Examples/test-suite/php4/arrays_global_twodim_runme.php4 b/Examples/test-suite/php4/arrays_global_twodim_runme.php4 index 799dfdc2d..dc426a848 100644 --- a/Examples/test-suite/php4/arrays_global_twodim_runme.php4 +++ b/Examples/test-suite/php4/arrays_global_twodim_runme.php4 @@ -4,11 +4,9 @@ require "tests.php4"; require "arrays_global_twodim.php"; -// No new functions check::functions(array(fn_taking_arrays,get_2d_array)); -// No new classes -check::classes(array(simplestruct)); -check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i)); +check::classes(array(simplestruct,material)); +check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i,chitmat,hitmat_val,hitmat)); $a1=array(10,11,12,13); $a2=array(14,15,16,17); $a=array($a1,$a2); diff --git a/Examples/test-suite/php4/class_ignore_runme.php4 b/Examples/test-suite/php4/class_ignore_runme.php4 index 2a202fe1b..d430c01f3 100644 --- a/Examples/test-suite/php4/class_ignore_runme.php4 +++ b/Examples/test-suite/php4/class_ignore_runme.php4 @@ -4,11 +4,9 @@ require "tests.php4"; require "class_ignore.php"; -// No new functions check::functions(array(do_blah)); -// No new classes -check::classes(array(bar)); -// now new vars +check::classes(array(bar,boo,far,hoo)); +// No new vars check::globals(array()); $bar=new bar(); diff --git a/Examples/test-suite/php4/conversion_ns_template_runme.php4 b/Examples/test-suite/php4/conversion_ns_template_runme.php4 index 3493a3521..0fd12cbed 100644 --- a/Examples/test-suite/php4/conversion_ns_template_runme.php4 +++ b/Examples/test-suite/php4/conversion_ns_template_runme.php4 @@ -3,7 +3,7 @@ require "tests.php4"; require "conversion_ns_template.php"; -check::classes(array("foo_one","bar_one")); +check::classes(array("foo_one","bar_one","hi")); // this is too hard, I'm not sure what to test for, check::done();