Update lists of expected function, classes, and globals to match what we get

with PHP5.  There are no longer any warnings about these.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11771 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2009-12-04 03:54:24 +00:00
commit 8461ba43ff
8 changed files with 21 additions and 22 deletions

View file

@ -5,7 +5,7 @@ require "arrays_global.php";
check::functions(array(test_a,test_b,new_simplestruct,new_material)); check::functions(array(test_a,test_b,new_simplestruct,new_material));
check::classes(array(arrays_global,SimpleStruct,Material)); check::classes(array(arrays_global,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::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,simplestruct_double_field));
// The size of array_c is 2, but the last byte is \0, so we can only store a // The size of array_c is 2, but the last byte is \0, so we can only store a
// single byte string in it. // single byte string in it.
check::set(array_c,"Z"); check::set(array_c,"Z");

View file

@ -5,7 +5,7 @@ require "arrays_global_twodim.php";
check::functions(array(fn_taking_arrays,get_2d_array,new_simplestruct,new_material)); check::functions(array(fn_taking_arrays,get_2d_array,new_simplestruct,new_material));
check::classes(array(arrays_global_twodim,SimpleStruct,Material)); check::classes(array(arrays_global_twodim,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)); 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,simplestruct_double_field));
$a1=array(10,11,12,13); $a1=array(10,11,12,13);
$a2=array(14,15,16,17); $a2=array(14,15,16,17);
$a=array($a1,$a2); $a=array($a1,$a2);

View file

@ -4,8 +4,7 @@ require "arrays.php";
check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func)); check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func));
check::classes(array(arrays,SimpleStruct,ArrayStruct,CartPoseData_t)); check::classes(array(arrays,SimpleStruct,ArrayStruct,CartPoseData_t));
// No new vars check::globals(array(simplestruct_double_field,arraystruct_array_c,arraystruct_array_sc,arraystruct_array_uc,arraystruct_array_s,arraystruct_array_us,arraystruct_array_i,arraystruct_array_ui,arraystruct_array_l,arraystruct_array_ul,arraystruct_array_ll,arraystruct_array_f,arraystruct_array_d,arraystruct_array_struct,arraystruct_array_structpointers,arraystruct_array_ipointers,arraystruct_array_enum,arraystruct_array_enumpointers,arraystruct_array_const_i,cartposedata_t_p));
check::globals(array());
$ss=new simplestruct(); $ss=new simplestruct();
check::classname(simplestruct,$ss); check::classname(simplestruct,$ss);

View file

@ -3,12 +3,12 @@
require "tests.php"; require "tests.php";
require "arrays_scope.php"; require "arrays_scope.php";
// No new functions // New functions
check::functions(array(new_bar,bar_blah)); check::functions(array(new_bar,bar_blah));
// No new classes // New classes
check::classes(array(arrays_scope,Bar)); check::classes(array(arrays_scope,Bar));
// now new vars // New vars
check::globals(array()); check::globals(array(bar_adata,bar_bdata,bar_cdata));
$bar=new bar(); $bar=new bar();

View file

@ -3,12 +3,12 @@
require "tests.php"; require "tests.php";
require "cpp_static.php"; require "cpp_static.php";
// No new functions // New functions
check::functions(array()); check::functions(array(staticfunctiontest_static_func,staticfunctiontest_static_func_2,staticfunctiontest_static_func_3));
// No new classes // New classes
check::classes(array(StaticMemberTest,StaticFunctionTest)); check::classes(array(StaticMemberTest,StaticFunctionTest));
// now new vars // New vars
check::globals(array()); check::globals(array(staticmembertest_static_int));
check::done(); check::done();
?> ?>

View file

@ -3,7 +3,7 @@ require "tests.php";
require "enum_scope_template.php"; require "enum_scope_template.php";
check::classes(array("enum_scope_template", "TreeInt")); check::classes(array("enum_scope_template", "TreeInt"));
check::functions("chops"); check::functions(array("chops","treeint_chops"));
check::equal(0,TreeInt_Oak,"0==TreeInt_Oak"); check::equal(0,TreeInt_Oak,"0==TreeInt_Oak");
check::equal(1,TreeInt_Fir,"1==TreeInt_Fir"); check::equal(1,TreeInt_Fir,"1==TreeInt_Fir");
check::equal(2,TreeInt_Cedar,"2==TreeInt_Cedar"); check::equal(2,TreeInt_Cedar,"2==TreeInt_Cedar");

View file

@ -3,11 +3,11 @@
require "tests.php"; require "tests.php";
require "ignore_parameter.php"; require "ignore_parameter.php";
// No new functions // New functions
check::functions(array(jaguar,lotus,tvr,ferrari)); check::functions(array(jaguar,lotus,tvr,ferrari,sportscars_daimler,sportscars_astonmartin,sportscars_bugatti,sportscars_lamborghini));
// No new classes // New classes
check::classes(array(sportscars,minicooper,morrisminor,fordanglia,austinallegro)); check::classes(array(ignore_parameter,SportsCars,MiniCooper,MorrisMinor,FordAnglia,AustinAllegro));
// now new vars // No new vars
check::globals(array()); check::globals(array());
check::equal(jaguar(2,3.4),"hello",'jaguar(2,3.4)=="hello"'); check::equal(jaguar(2,3.4),"hello",'jaguar(2,3.4)=="hello"');

View file

@ -3,14 +3,14 @@ require "tests.php";
require "li_carrays.php"; require "li_carrays.php";
// Check functions. // Check functions.
check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_setitem)); check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_setitem,doublearray_getitem,doublearray_setitem,doublearray_cast,doublearray_frompointer,xyarray_getitem,xyarray_setitem,xyarray_cast,xyarray_frompointer,delete_abarray,abarray_getitem,abarray_setitem));
// Check classes. // Check classes.
// NB An "li_carrays" class is created as a mock namespace. // NB An "li_carrays" class is created as a mock namespace.
check::classes(array(li_carrays,doubleArray,AB,XY,XYArray)); check::classes(array(li_carrays,doubleArray,AB,XY,XYArray));
// No new global variables. // Check global variables.
check::globals(array()); check::globals(array(xy_x,xy_y,globalxyarray,ab_a,ab_b,globalabarray));
$d = new doubleArray(10); $d = new doubleArray(10);