jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scilab: fix li_std_container_typemaps test for scilab 6

Browse source
This commit is contained in:
Simon Marchetto 2014-06-06 11:15:41 +02:00
commit 2b5551919e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/test-suite/scilab/li_std_container_typemaps_runme.sci
View file

@ -17,6 +17,7 @@ function [classAPtr_list, classAPtr1, classAPtr2] = testCreateContainerPtr(conta
if ~exists('classAPtr_list') | (size(classAPtr_list) <> 2) then if ~exists('classAPtr_list') | (size(classAPtr_list) <> 2) then
swigtesterror(func); swigtesterror(func);
end end
checkequal(ClassA_a_get(classAPtr_list(1)), value1, "ClassA_a_get(classAPtr_list(1))"); checkequal(ClassA_a_get(classAPtr_list(1)), value1, "ClassA_a_get(classAPtr_list(1))");
checkequal(ClassA_a_get(classAPtr_list(2)), value2, "ClassA_a_get(classAPtr_list(2))"); checkequal(ClassA_a_get(classAPtr_list(2)), value2, "ClassA_a_get(classAPtr_list(2))");
endfunction endfunction
@ -58,9 +59,9 @@ function testContainerType(container, value_type, value1, value2, ..
expected_returned_container, expected_accumulate_value) expected_returned_container, expected_accumulate_value)
// test container of basic type returned from fonction // test container of basic type returned from fonction
func = msprintf("ret_%s_%s", value_type, container); func = msprintf("ret_%s_%s", value_type, container);
if value_type = "string" then if value_type == "string" then
cmd = msprintf("c = %s(''%s'', ''%s'');", func, value1, value2); cmd = msprintf("c = %s(''%s'', ''%s'');", func, value1, value2);
elseif value_type = "bool" then elseif value_type == "bool" then
cmd = msprintf("c = %s(%s, %s);", func, "%"+string(value1), "%"+string(value2)); cmd = msprintf("c = %s(%s, %s);", func, "%"+string(value1), "%"+string(value2));
else else
cmd = msprintf("c = %s(%d, %d);", func, value1, value2); cmd = msprintf("c = %s(%d, %d);", func, value1, value2);