Scicos tests: fix script2var, buildouttb and clone_extract

Change-Id: Iff9b3a96fc671f6d32e2ddc9e36434c609241f8a

diff --git a/scilab/modules/scicos/tests/unit_tests/buildouttb.dia.ref b/scilab/modules/scicos/tests/unit_tests/buildouttb.dia.ref
index 50811c3..c4e14a3 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/buildouttb.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/buildouttb.dia.ref
@@ -7,5 +7,8 @@
 // =============================================================================
 //
 // <-- CLI SHELL MODE -->
-refMsg = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "buildouttb", 2);
+res = buildouttb([2 2], 1); // Request a list containing a 2x2 matrix of doubles
+resRef = list([0 0; 0 0]);
+assert_checkequal(res, resRef);
+refMsg = msprintf(_("%s: Wrong number of input argument(s): %d expected."), "buildouttb", 2);
 assert_checkerror("buildouttb()", refMsg);

diff --git a/scilab/modules/scicos/tests/unit_tests/buildouttb.tst b/scilab/modules/scicos/tests/unit_tests/buildouttb.tst
index 3809607..11d93e2 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/buildouttb.tst
+++ b/scilab/modules/scicos/tests/unit_tests/buildouttb.tst
@@ -8,5 +8,11 @@
 //
 // <-- CLI SHELL MODE -->
 
-refMsg = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "buildouttb", 2);
+res = buildouttb([2 2], 1); // Request a list containing a 2x2 matrix of doubles
+
+resRef = list([0 0; 0 0]);
+assert_checkequal(res, resRef);
+
+
+refMsg = msprintf(_("%s: Wrong number of input argument(s): %d expected."), "buildouttb", 2);
 assert_checkerror("buildouttb()", refMsg);

diff --git a/scilab/modules/scicos/tests/unit_tests/model/clone_extract.dia.ref b/scilab/modules/scicos/tests/unit_tests/model/clone_extract.dia.ref
index 03059eb..0d1a541 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/clone_extract.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/model/clone_extract.dia.ref
@@ -4,6 +4,8 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+//
+// <-- CLI SHELL MODE -->
 loadXcosLibs();
 scicos_log("TRACE");
 // Creating a Diagram containing a Link connected to a Block

diff --git a/scilab/modules/scicos/tests/unit_tests/model/clone_extract.tst b/scilab/modules/scicos/tests/unit_tests/model/clone_extract.tst
index ca885d5..fdcfb31 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/clone_extract.tst
+++ b/scilab/modules/scicos/tests/unit_tests/model/clone_extract.tst
@@ -4,6 +4,8 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+//
+// <-- CLI SHELL MODE -->
 
 loadXcosLibs();
 scicos_log("TRACE");

diff --git a/scilab/modules/scicos/tests/unit_tests/script2var.dia.ref b/scilab/modules/scicos/tests/unit_tests/script2var.dia.ref
index b69c3fa..3dc790c 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/script2var.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/script2var.dia.ref
@@ -4,8 +4,11 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+//
+// <-- CLI SHELL MODE -->
 loadXcosLibs();
-%txt=["a=1";
+%txt = [ ...
+"a=1";
 "function r=foo(v)";
 "    r=v;";
 "endfunction";
@@ -13,24 +16,12 @@ loadXcosLibs();
 "c=foo(3)";
 "d=ones(1,1);";
 ""];
-%ll=struct();
-[%ll,%ierr] = script2var(%txt, %ll)
- %ierr  =
- 
-    0.  
- %ll  =
- 
-   d: 1
-   c: 3
-   b: 2
-   a: 1
-[%ll,%ierr] = script2var(%txt, %ll)
- %ierr  =
- 
-    0.  
- %ll  =
- 
-   d: 1
-   c: 3
-   b: 2
-   a: 1
+%ierrRef = 0;
+%llRef = struct("a", 1, "b", 2, "c", 3, "d", 1);
+%ll = struct();
+[%ll, %ierr] = script2var(%txt, %ll);
+assert_checkequal(%ierr, %ierrRef);
+assert_checkequal(%ll, %llRef);
+[%ll, %ierr] = script2var(%txt, %ll);
+assert_checkequal(%ierr, %ierrRef);
+assert_checkequal(%ll, %llRef);

diff --git a/scilab/modules/scicos/tests/unit_tests/script2var.tst b/scilab/modules/scicos/tests/unit_tests/script2var.tst
index 46ddeec..50379ba 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/script2var.tst
+++ b/scilab/modules/scicos/tests/unit_tests/script2var.tst
@@ -4,10 +4,13 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+//
+// <-- CLI SHELL MODE -->
 
 loadXcosLibs();
 
-%txt=["a=1";
+%txt = [ ...
+"a=1";
 "function r=foo(v)";
 "    r=v;";
 "endfunction";
@@ -16,8 +19,14 @@ loadXcosLibs();
 "d=ones(1,1);";
 ""];
 
-%ll=struct();
-[%ll,%ierr] = script2var(%txt, %ll)
+%ierrRef = 0;
+%llRef = struct("a", 1, "b", 2, "c", 3, "d", 1);
 
-[%ll,%ierr] = script2var(%txt, %ll)
+%ll = struct();
+[%ll, %ierr] = script2var(%txt, %ll);
+assert_checkequal(%ierr, %ierrRef);
+assert_checkequal(%ll, %llRef);
 
+[%ll, %ierr] = script2var(%txt, %ll);
+assert_checkequal(%ierr, %ierrRef);
+assert_checkequal(%ll, %llRef);