From eb7d2bd43b707216e95b7b40c57aa8385be2ca6b Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Wed, 5 Mar 2014 12:37:43 +0100
Subject: [PATCH] scilab: add tests in arrays_global test (double management)

---
 .../test-suite/scilab/arrays_global_runme.sci | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/Examples/test-suite/scilab/arrays_global_runme.sci b/Examples/test-suite/scilab/arrays_global_runme.sci
index 01771a0b6..24af3377c 100644
--- a/Examples/test-suite/scilab/arrays_global_runme.sci
+++ b/Examples/test-suite/scilab/arrays_global_runme.sci
@@ -1,13 +1,18 @@
 exec("swigtest.start", -1);
 
-function testArray(arrayName, arraySetFunc, arrayGetFunc, values)
+function testArray(arrayName, arraySetFunc, arrayGetFunc, in_values, ..
+  expected_out_values)
   try
-    arraySetFunc(values);
+    arraySetFunc(in_values);
   catch
     swigtesterror("error in " + arrayName + "_set()");
   end
   try
-    if arrayGetFunc() <> values then
+    out_values = arrayGetFunc();
+    if type(out_values) <> type(expected_out_values) then
+      swigtesterror("wrong values type returned from " + arrayName + "_get()");
+    end
+    if out_values <> expected_out_values then
       swigtesterror("wrong values returned from " + arrayName + "_get()");
     end
   catch
@@ -15,19 +20,23 @@ function testArray(arrayName, arraySetFunc, arrayGetFunc, values)
   end
 endfunction
 
-// TODO: fix error in array_c_set
-//testArray("array_c", array_c_set, array_c_get, ['a', 'b']);
-
-testArray("array_sc", array_sc_set, array_sc_get, int8([-10, 20]));
-testArray("array_s", array_s_set, array_s_get, int16([-10, 20]));
-testArray("array_us", array_us_set, array_us_get, uint16([10, 20]));
-testArray("array_i", array_i_set, array_i_get, int32([-10, 20]));
-testArray("array_ui", array_ui_set, array_ui_get, uint32([10, 20]));
-testArray("array_l", array_l_set, array_l_get, int32([-10, 20]));
-testArray("array_ul", array_ul_set, array_ul_get, uint32([10, 20]));
-//testArray("array_ll", array_l_set, array_ll_get, int32([-10, 20]));
-testArray("array_f", array_f_set, array_f_get, [-10.5, 20.4]);
-testArray("array_d", array_d_set, array_d_get, [-10.5, 20.4]);
+m = [10, 20];
+um = [-10, 20];
+testArray("array_c", array_c_set, array_c_get, ['ab'], ['ab']);
+testArray("array_sc", array_sc_set, array_sc_get, m, m);
+testArray("array_sc", array_sc_set, array_sc_get, int8(m), m);
+testArray("array_uc", array_uc_set, array_uc_get, uint8(um), uint8(um));
+testArray("array_s", array_s_set, array_s_get, m, m);
+testArray("array_s", array_s_set, array_s_get, int16(m), m);
+testArray("array_us", array_us_set, array_us_get, uint16(um), uint16(um));
+testArray("array_i", array_i_set, array_i_get, m, m);
+testArray("array_i", array_i_set, array_i_get, int32(m), m);
+testArray("array_ui", array_ui_set, array_ui_get, uint32(um), uint32(um));
+testArray("array_l", array_l_set, array_l_get, m, m);
+testArray("array_l", array_l_set, array_l_get, int32(m), m);
+testArray("array_ul", array_ul_set, array_ul_get, uint32(um), uint32(um));
+testArray("array_f", array_f_set, array_f_get, [-10.5, 20.4], [-10.5, 20.4]);
+testArray("array_d", array_d_set, array_d_get, [-10.5, 20.4], [-10.5, 20.4]);
 
 if array_const_i_get() <> [10, 20] then swigtesterror(); end