From 6a7b90646b797c70bd11bff435d4b3a69c14879e Mon Sep 17 00:00:00 2001 From: Cedric Delamarre Date: Wed, 12 Feb 2020 16:35:53 +0100 Subject: [PATCH] [data_structures] test fixed Change-Id: I40f89b4125c4757517370d2959a1b7f8c3c9ebf1 --- .../tests/unit_tests/struct_display.dia.ref | 21 ++++++++++---------- .../tests/unit_tests/struct_display.tst | 14 ++++++------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/scilab/modules/data_structures/tests/unit_tests/struct_display.dia.ref b/scilab/modules/data_structures/tests/unit_tests/struct_display.dia.ref index cf7144e..38f3bd7 100644 --- a/scilab/modules/data_structures/tests/unit_tests/struct_display.dia.ref +++ b/scilab/modules/data_structures/tests/unit_tests/struct_display.dia.ref @@ -9,7 +9,7 @@ // <-- CLI SHELL MODE --> // <-- ENGLISH IMPOSED --> oldDepth = xmlGetValues("//general/body/environment","container_disp_max_depth"); -setPreferencesValue("//general/body/environment", ["container_disp_max_depth"; "3"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth"; "3"]); // ---------------------------------------------------------------- clear s s.f = [%i/%s, %s/(1-%s), 1/(1-%s)^2]; @@ -19,7 +19,7 @@ s.b = rand(1,5)<0.5; s.iL = $-4:2:$; s.fun = linspace; s.L = list(rand(2,3),{},(1-%z)^3,,%pi, %t, "abcd"); -s.lib = corelib; +//s.lib = corelib; s.tlist = tlist(["myTlist" "bool" "int" "num" "txt" "list"],.. rand(3,4,2)<0.5, int8((rand(3,5)-0.5)*200), .. grand(3,4,"uin",-100,100), ["This" "is" "a" "test"], list(%pi,"number")); @@ -44,7 +44,6 @@ s (5) = 3.1415927 (6) = %t (7) = "abcd" - lib: corelib library with 16 functions @ SCI\modules\core\macros\ tlist: [myTlist] tlist with fields: bool: [3x4x2 boolean] int: [3x5 int8] @@ -82,14 +81,14 @@ s.t.b.r = %e; s.t.L2 = list("Hello", list(1-%z+%z^2, list(-4,%t))); s.t.b.s.a = "Level 3"; s.t.b.s.p = (1-%z)^3; -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"0"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"0"]); s s = root = "Hello 0" L: list with 3 elements. t: struct with fields: - [a, r, tl, b, L2] -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"1"]); + ["a", "r", "tl", "b", "L2"] +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"1"]); s s = root = "Hello 0" @@ -103,9 +102,9 @@ s tl: [myTlist] tlist with fields: [a, b, c] b: struct with fields: - [a, r, s] + ["a", "r", "s"] L2: list with 2 elements. -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"2"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"2"]); s s = root = "Hello 0" @@ -126,11 +125,11 @@ s a = "Level 2" r = 2.7182818 s: struct with fields: - [a, p] + ["a", "p"] L2: list: (1) = "Hello" (2) : list with 2 elements. -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"3"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"3"]); s s = root = "Hello 0" @@ -163,4 +162,4 @@ s (1) = 1-%z+%z^2 (2) : list with 2 elements. // ---------------------------------------------------------------- -setPreferencesValue("//general/body/environment", ["container_disp_max_depth"; oldDepth]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth"; oldDepth]); diff --git a/scilab/modules/data_structures/tests/unit_tests/struct_display.tst b/scilab/modules/data_structures/tests/unit_tests/struct_display.tst index 67d08e5..4054421 100644 --- a/scilab/modules/data_structures/tests/unit_tests/struct_display.tst +++ b/scilab/modules/data_structures/tests/unit_tests/struct_display.tst @@ -12,7 +12,7 @@ // <-- ENGLISH IMPOSED --> oldDepth = xmlGetValues("//general/body/environment","container_disp_max_depth"); -setPreferencesValue("//general/body/environment", ["container_disp_max_depth"; "3"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth"; "3"]); // ---------------------------------------------------------------- clear s @@ -23,7 +23,7 @@ s.b = rand(1,5)<0.5; s.iL = $-4:2:$; s.fun = linspace; s.L = list(rand(2,3),{},(1-%z)^3,,%pi, %t, "abcd"); -s.lib = corelib; +//s.lib = corelib; s.tlist = tlist(["myTlist" "bool" "int" "num" "txt" "list"],.. rand(3,4,2)<0.5, int8((rand(3,5)-0.5)*200), .. grand(3,4,"uin",-100,100), ["This" "is" "a" "test"], list(%pi,"number")); @@ -47,14 +47,14 @@ s.t.L2 = list("Hello", list(1-%z+%z^2, list(-4,%t))); s.t.b.s.a = "Level 3"; s.t.b.s.p = (1-%z)^3; -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"0"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"0"]); s -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"1"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"1"]); s -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"2"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"2"]); s -setPreferencesValue("//general/body/environment", ["container_disp_max_depth";"3"]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth";"3"]); s // ---------------------------------------------------------------- -setPreferencesValue("//general/body/environment", ["container_disp_max_depth"; oldDepth]); +xmlSetValues("//general/body/environment", ["container_disp_max_depth"; oldDepth]); -- 1.7.9.5