Remove globals check in the php test-suite.
It was done mainly to check in the "flat" function structure. Not needed since the class structure is adopted now.
This commit is contained in:
parent
b38e6d9584
commit
05c25a71d6
17 changed files with 0 additions and 30 deletions
|
|
@ -5,7 +5,6 @@ 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,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");
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ 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,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);
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ 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));
|
||||||
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));
|
|
||||||
|
|
||||||
$ss=new simplestruct();
|
$ss=new simplestruct();
|
||||||
check::classname(simplestruct,$ss);
|
check::classname(simplestruct,$ss);
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "arrays_scope.php";
|
||||||
check::functions(array(new_bar,bar_blah));
|
check::functions(array(new_bar,bar_blah));
|
||||||
// New classes
|
// New classes
|
||||||
check::classes(array(arrays_scope,Bar));
|
check::classes(array(arrays_scope,Bar));
|
||||||
// New vars
|
|
||||||
check::globals(array(bar_adata,bar_bdata,bar_cdata));
|
|
||||||
|
|
||||||
$bar=new bar();
|
$bar=new bar();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "cpp_basic.php";
|
||||||
check::functions(array(foo_func1,foo_func2,foo___str__,foosubsub___str__,bar_test,bar_testfoo,get_func1_ptr,get_func2_ptr,test_func_ptr,fl_window_show));
|
check::functions(array(foo_func1,foo_func2,foo___str__,foosubsub___str__,bar_test,bar_testfoo,get_func1_ptr,get_func2_ptr,test_func_ptr,fl_window_show));
|
||||||
// New classes
|
// New classes
|
||||||
check::classes(array(cpp_basic,Foo,FooSub,FooSubSub,Bar,Fl_Window));
|
check::classes(array(cpp_basic,Foo,FooSub,FooSubSub,Bar,Fl_Window));
|
||||||
// New vars
|
|
||||||
check::globals(array(foo_num,foo_func_ptr,bar_fptr,bar_fref,bar_fval,bar_cint,bar_global_fptr,bar_global_fref,bar_global_fval));
|
|
||||||
|
|
||||||
$f = new Foo(3);
|
$f = new Foo(3);
|
||||||
$f->func_ptr = get_func1_ptr();
|
$f->func_ptr = get_func1_ptr();
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "cpp_static.php";
|
||||||
check::functions(array(staticfunctiontest_static_func,staticfunctiontest_static_func_2,staticfunctiontest_static_func_3,is_python_builtin));
|
check::functions(array(staticfunctiontest_static_func,staticfunctiontest_static_func_2,staticfunctiontest_static_func_3,is_python_builtin));
|
||||||
// New classes
|
// New classes
|
||||||
check::classes(array(StaticMemberTest,StaticFunctionTest,cpp_static,StaticBase,StaticDerived));
|
check::classes(array(StaticMemberTest,StaticFunctionTest,cpp_static,StaticBase,StaticDerived));
|
||||||
// New vars
|
|
||||||
check::globals(array(staticmembertest_static_int,staticbase_statty,staticderived_statty));
|
|
||||||
|
|
||||||
check::done();
|
check::done();
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "director_basic.php";
|
||||||
check::functions(array(foo_ping,foo_pong,foo_get_self,a_f,a_rg,a1_ff,myclass_method,myclass_vmethod,myclass_pmethod,myclass_cmethod,myclass_get_self,myclass_call_pmethod,myclasst_i_method));
|
check::functions(array(foo_ping,foo_pong,foo_get_self,a_f,a_rg,a1_ff,myclass_method,myclass_vmethod,myclass_pmethod,myclass_cmethod,myclass_get_self,myclass_call_pmethod,myclasst_i_method));
|
||||||
// No new classes
|
// No new classes
|
||||||
check::classes(array(Foo,A,A1,Bar,MyClass,MyClassT_i));
|
check::classes(array(Foo,A,A1,Bar,MyClass,MyClassT_i));
|
||||||
// now new vars
|
|
||||||
check::globals(array(bar_x));
|
|
||||||
|
|
||||||
class PhpFoo extends Foo {
|
class PhpFoo extends Foo {
|
||||||
function ping() {
|
function ping() {
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "director_frob.php";
|
||||||
check::functions(array(alpha_abs_method,bravo_abs_method,charlie_abs_method,ops_opint,ops_opintstarstarconst,ops_opintamp,ops_opintstar,ops_opconstintintstar,prims_ull,prims_callull,corecallbacks_on3dengineredrawn,corecallbacks_on3dengineredrawn2));
|
check::functions(array(alpha_abs_method,bravo_abs_method,charlie_abs_method,ops_opint,ops_opintstarstarconst,ops_opintamp,ops_opintstar,ops_opconstintintstar,prims_ull,prims_callull,corecallbacks_on3dengineredrawn,corecallbacks_on3dengineredrawn2));
|
||||||
// No new classes
|
// No new classes
|
||||||
check::classes(array(Alpha,Bravo,Charlie,Delta,Ops,Prims,corePoint3d,coreCallbacks_On3dEngineRedrawnData,coreCallbacksOn3dEngineRedrawnData,coreCallbacks));
|
check::classes(array(Alpha,Bravo,Charlie,Delta,Ops,Prims,corePoint3d,coreCallbacks_On3dEngineRedrawnData,coreCallbacksOn3dEngineRedrawnData,coreCallbacks));
|
||||||
// now new vars
|
|
||||||
check::globals(array(corecallbacks_on3dengineredrawndata__eye,corecallbacks_on3dengineredrawndata__at,corecallbackson3dengineredrawndata__eye,corecallbackson3dengineredrawndata__at));
|
|
||||||
|
|
||||||
$foo = new Bravo();
|
$foo = new Bravo();
|
||||||
$s = $foo->abs_method();
|
$s = $foo->abs_method();
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ require "director_protected.php";
|
||||||
|
|
||||||
check::functions(array(foo_pong,foo_s,foo_q,foo_ping,foo_pang,foo_used,foo_cheer,bar_create,bar_callping,bar_callcheer,bar_cheer,bar_pong,bar_used,bar_ping,bar_pang,a_draw,b_draw));
|
check::functions(array(foo_pong,foo_s,foo_q,foo_ping,foo_pang,foo_used,foo_cheer,bar_create,bar_callping,bar_callcheer,bar_cheer,bar_pong,bar_used,bar_ping,bar_pang,a_draw,b_draw));
|
||||||
check::classes(array(Foo,Bar,PrivateFoo,A,B,AA,BB));
|
check::classes(array(Foo,Bar,PrivateFoo,A,B,AA,BB));
|
||||||
check::globals(array(bar_a));
|
|
||||||
|
|
||||||
class FooBar extends Bar {
|
class FooBar extends Bar {
|
||||||
protected function ping() {
|
protected function ping() {
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "director_string.php";
|
||||||
check::functions(array(a_get_first,a_call_get_first,a_string_length,a_process_text,a_call_process_func,stringvector_size,stringvector_is_empty,stringvector_clear,stringvector_push,stringvector_pop,stringvector_capacity,stringvector_reserve));
|
check::functions(array(a_get_first,a_call_get_first,a_string_length,a_process_text,a_call_process_func,stringvector_size,stringvector_is_empty,stringvector_clear,stringvector_push,stringvector_pop,stringvector_capacity,stringvector_reserve));
|
||||||
// No new classes
|
// No new classes
|
||||||
check::classes(array(A,StringVector));
|
check::classes(array(A,StringVector));
|
||||||
// now new vars
|
|
||||||
check::globals(array(a,a_call,a_m_strings,stringvector));
|
|
||||||
|
|
||||||
class B extends A {
|
class B extends A {
|
||||||
function get_first() {
|
function get_first() {
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,6 @@ exit(0);
|
||||||
check::functions(array(millisecondsleep,foo_stop,foo_run,foo_do_foo));
|
check::functions(array(millisecondsleep,foo_stop,foo_run,foo_do_foo));
|
||||||
// No new classes
|
// No new classes
|
||||||
check::classes(array(director_thread,Foo));
|
check::classes(array(director_thread,Foo));
|
||||||
// now new vars
|
|
||||||
check::globals(array(foo_val));
|
|
||||||
|
|
||||||
class Derived extends Foo {
|
class Derived extends Foo {
|
||||||
function do_foo() {
|
function do_foo() {
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "director_unroll.php";
|
||||||
check::functions(array(foo_ping,foo_pong));
|
check::functions(array(foo_ping,foo_pong));
|
||||||
// No new classes
|
// No new classes
|
||||||
check::classes(array(Foo,Bar));
|
check::classes(array(Foo,Bar));
|
||||||
// now new vars
|
|
||||||
check::globals(array(bar));
|
|
||||||
|
|
||||||
class MyFoo extends Foo {
|
class MyFoo extends Foo {
|
||||||
function ping() {
|
function ping() {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ require "exception_order.php";
|
||||||
|
|
||||||
check::functions(array(a_foo,a_bar,a_foobar,a_barfoo,is_python_builtin));
|
check::functions(array(a_foo,a_bar,a_foobar,a_barfoo,is_python_builtin));
|
||||||
check::classes(array(A,E1,E2,E3,exception_order,ET_i,ET_d));
|
check::classes(array(A,E1,E2,E3,exception_order,ET_i,ET_d));
|
||||||
check::globals(array(efoovar,foovar,cfoovar,a_sfoovar,a_foovar,a_efoovar));
|
|
||||||
|
|
||||||
$a = new A();
|
$a = new A();
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ require "grouping.php";
|
||||||
check::functions(array("test1","test2","do_unary","negate"));
|
check::functions(array("test1","test2","do_unary","negate"));
|
||||||
check::equal(5,test1(5),"5==test1(5)");
|
check::equal(5,test1(5),"5==test1(5)");
|
||||||
check::resource(test2(7),"_p_int","_p_int==test2(7)");
|
check::resource(test2(7),"_p_int","_p_int==test2(7)");
|
||||||
check::globals(array(test3));
|
|
||||||
|
|
||||||
//check::equal(37,test3_get(),'37==test3_get()');
|
//check::equal(37,test3_get(),'37==test3_get()');
|
||||||
check::equal(37,check::get("test3"),'37==get(test3)');
|
check::equal(37,check::get("test3"),'37==get(test3)');
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,6 @@ check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_se
|
||||||
// NB An "li_carrays_cpp" class is created as a mock namespace.
|
// NB An "li_carrays_cpp" class is created as a mock namespace.
|
||||||
check::classes(array(li_carrays_cpp,doubleArray,AB,XY,XYArray,shortArray));
|
check::classes(array(li_carrays_cpp,doubleArray,AB,XY,XYArray,shortArray));
|
||||||
|
|
||||||
// Check global variables.
|
|
||||||
check::globals(array(xy_x,xy_y,globalxyarray,ab_a,ab_b,globalabarray));
|
|
||||||
|
|
||||||
$d = new doubleArray(10);
|
$d = new doubleArray(10);
|
||||||
|
|
||||||
$d->setitem(0, 7);
|
$d->setitem(0, 7);
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,6 @@ check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_se
|
||||||
// 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,shortArray));
|
check::classes(array(li_carrays,doubleArray,AB,XY,XYArray,shortArray));
|
||||||
|
|
||||||
// Check global variables.
|
|
||||||
check::globals(array(xy_x,xy_y,globalxyarray,ab_a,ab_b,globalabarray));
|
|
||||||
|
|
||||||
$d = new doubleArray(10);
|
$d = new doubleArray(10);
|
||||||
|
|
||||||
$d->setitem(0, 7);
|
$d->setitem(0, 7);
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require "threads_exception.php";
|
||||||
check::functions(array(test_simple,test_message,test_hosed,test_unknown,test_multi,is_python_builtin));
|
check::functions(array(test_simple,test_message,test_hosed,test_unknown,test_multi,is_python_builtin));
|
||||||
// Check classes.
|
// Check classes.
|
||||||
check::classes(array(Exc,Test,threads_exception));
|
check::classes(array(Exc,Test,threads_exception));
|
||||||
// Chek globals.
|
|
||||||
check::globals(array(exc_code,exc_msg));
|
|
||||||
|
|
||||||
$t = new Test();
|
$t = new Test();
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue