Update test in fileio.

Change-Id: I356bef19e76c0f17b4e254483924175fce845ff6

diff --git a/scilab/modules/fileio/tests/nonreg_tests/bug_8836.dia.ref b/scilab/modules/fileio/tests/nonreg_tests/bug_8836.dia.ref
index 8546c96..ba79641 100644 (file)
--- a/scilab/modules/fileio/tests/nonreg_tests/bug_8836.dia.ref
+++ b/scilab/modules/fileio/tests/nonreg_tests/bug_8836.dia.ref
@@ -14,6 +14,6 @@
 //
 // <-- Short Description -->
 // fileparts crashed scilab when matrix of strings was passed as input argument.
-//
-if execstr("fileparts(ls(""SCI/modules/fileio/macros/*.sci""))", "errcatch") <> 999 then bugmes();quit;end
-if lasterror() <> msprintf(_("%s: Wrong size for input argument #%d: A string expected.\n"), "fileparts", 1) then bugmes();quit;end
+// Following the commit: https://codereview.scilab.org/#/c/11620/, fileparts 
+// manages the matrix of strings.
+assert_checktrue(execstr("fileparts(ls(""SCI/modules/fileio/macros/*.sci""))", "errcatch") == 0);

diff --git a/scilab/modules/fileio/tests/nonreg_tests/bug_8836.tst b/scilab/modules/fileio/tests/nonreg_tests/bug_8836.tst
index decd4e6..1175c48 100644 (file)
--- a/scilab/modules/fileio/tests/nonreg_tests/bug_8836.tst
+++ b/scilab/modules/fileio/tests/nonreg_tests/bug_8836.tst
@@ -14,7 +14,7 @@
 //
 // <-- Short Description -->
 // fileparts crashed scilab when matrix of strings was passed as input argument.
-//
+// Following the commit: https://codereview.scilab.org/#/c/11620/, fileparts 
+// manages the matrix of strings.
 
-if execstr("fileparts(ls(""SCI/modules/fileio/macros/*.sci""))", "errcatch") <> 999 then pause, end
-if lasterror() <> msprintf(_("%s: Wrong size for input argument #%d: A string expected.\n"), "fileparts", 1) then pause, end
\ No newline at end of file
+assert_checktrue(execstr("fileparts(ls(""SCI/modules/fileio/macros/*.sci""))", "errcatch") == 0);

diff --git a/scilab/modules/fileio/tests/nonreg_tests/bug_9821.dia.ref b/scilab/modules/fileio/tests/nonreg_tests/bug_9821.dia.ref
index 7a904d3..ab6145e 100644 (file)
--- a/scilab/modules/fileio/tests/nonreg_tests/bug_9821.dia.ref
+++ b/scilab/modules/fileio/tests/nonreg_tests/bug_9821.dia.ref
@@ -12,4 +12,6 @@
 //
 // <-- Short Description -->
 // getrelativename does not manage matrix of strings
-assert_checkequal(getrelativefilename([SCI+'/bin',SCI+'/bin'], [SCI+'/ACKNOWLEDGMENTS',SCI+'/ACKNOWLEDGMENTS']),["../ACKNOWLEDGMENTS", "../ACKNOWLEDGMENTS"]);
+computed = getrelativefilename([SCI+'/bin',SCI+'/bin'], [SCI+'/ACKNOWLEDGMENTS',SCI+'/ACKNOWLEDGMENTS']);
+expected = pathconvert(["../ACKNOWLEDGMENTS", "../ACKNOWLEDGMENTS"], %f);
+assert_checkequal(computed,expected);

diff --git a/scilab/modules/fileio/tests/nonreg_tests/bug_9821.tst b/scilab/modules/fileio/tests/nonreg_tests/bug_9821.tst
index 1e7d384..e050e23 100644 (file)
--- a/scilab/modules/fileio/tests/nonreg_tests/bug_9821.tst
+++ b/scilab/modules/fileio/tests/nonreg_tests/bug_9821.tst
@@ -13,4 +13,6 @@
 // <-- Short Description -->
 // getrelativename does not manage matrix of strings
 
-assert_checkequal(getrelativefilename([SCI+'/bin',SCI+'/bin'], [SCI+'/ACKNOWLEDGMENTS',SCI+'/ACKNOWLEDGMENTS']),["../ACKNOWLEDGMENTS", "../ACKNOWLEDGMENTS"]);
+computed = getrelativefilename([SCI+'/bin',SCI+'/bin'], [SCI+'/ACKNOWLEDGMENTS',SCI+'/ACKNOWLEDGMENTS']);
+expected = pathconvert(["../ACKNOWLEDGMENTS", "../ACKNOWLEDGMENTS"], %f);
+assert_checkequal(computed,expected);

diff --git a/scilab/modules/fileio/tests/unit_tests/getrelativefilename.dia.ref b/scilab/modules/fileio/tests/unit_tests/getrelativefilename.dia.ref
index 2553355..debd08c 100644 (file)
--- a/scilab/modules/fileio/tests/unit_tests/getrelativefilename.dia.ref
+++ b/scilab/modules/fileio/tests/unit_tests/getrelativefilename.dia.ref
@@ -40,7 +40,7 @@ assert_checkequal(getrelativefilename([__dir12,__dir12], [__file12,__file12]), [
 // Error messages
 errmsg1 = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "getrelativefilename", 2);
 assert_checkerror("getrelativefilename()", errmsg1);
-errmsg2 = msprintf(_("%s: Wrong type for input argument #%d: Matrix of strings expected.\n"), "getrelativefilename", 1);
+errmsg2 = msprintf(_("%s: Wrong type for input argument #%d: A matrix of strings expected.\n"), "getrelativefilename", 1);
 assert_checkerror("getrelativefilename([],[])", errmsg2);
 errmsg3 = msprintf(_("%s: Incompatible input arguments #%d and #%d: Same size expected.\n"), "getrelativefilename", 1, 2);
 assert_checkerror("getrelativefilename([__dir1,__dir1], __file1)", errmsg3);

diff --git a/scilab/modules/fileio/tests/unit_tests/getrelativefilename.tst b/scilab/modules/fileio/tests/unit_tests/getrelativefilename.tst
index a1ddcf4..7232142 100644 (file)
--- a/scilab/modules/fileio/tests/unit_tests/getrelativefilename.tst
+++ b/scilab/modules/fileio/tests/unit_tests/getrelativefilename.tst
@@ -54,7 +54,7 @@ assert_checkequal(getrelativefilename([__dir12,__dir12], [__file12,__file12]), [
 errmsg1 = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"), "getrelativefilename", 2);
 assert_checkerror("getrelativefilename()", errmsg1);
 
-errmsg2 = msprintf(_("%s: Wrong type for input argument #%d: Matrix of strings expected.\n"), "getrelativefilename", 1);
+errmsg2 = msprintf(_("%s: Wrong type for input argument #%d: A matrix of strings expected.\n"), "getrelativefilename", 1);
 assert_checkerror("getrelativefilename([],[])", errmsg2);
 
 errmsg3 = msprintf(_("%s: Incompatible input arguments #%d and #%d: Same size expected.\n"), "getrelativefilename", 1, 2);