FileIO tests: fix fullpath

 * Minor fixes & change useless test

Change-Id: I17f7fcf824c1f0296944274b5bb0258ea4b48877

diff --git a/scilab/modules/fileio/tests/unit_tests/fullpath.dia.ref b/scilab/modules/fileio/tests/unit_tests/fullpath.dia.ref
index ba01a6d..9257f77 100644 (file)
--- a/scilab/modules/fileio/tests/unit_tests/fullpath.dia.ref
+++ b/scilab/modules/fileio/tests/unit_tests/fullpath.dia.ref
@@ -9,23 +9,23 @@ ierr = execstr("fullpath();","errcatch");
 assert_checkequal(ierr, 77);
 ierr = execstr("fullpath(''test.sce'',''test.sce'');","errcatch");
 assert_checkequal(ierr, 77);
-assert_checkequal(fullpath('.'), pwd());
+assert_checkequal(fullpath("."), pwd());
 cd(TMPDIR);
-mkdir(TMPDIR+'/niv1');
-mkdir(TMPDIR+'/niv1/niv2');
-mkdir(TMPDIR+'/niv1/niv2/niv3');
-mputl(' ',TMPDIR+'/niv1/test1.txt');
-mputl(' ',TMPDIR+'/niv1/niv2/test2.txt');
-mputl(' ',TMPDIR+'/niv1/niv2/niv3/test3.txt');
-REF3 = TMPDIR + filesep() + 'niv1' + filesep() + 'niv2' + filesep() + 'niv3' + filesep() + 'test3.txt';
-REF2 = TMPDIR + filesep() + 'niv1' + filesep() + 'niv2' + filesep() + 'test2.txt';
-REF1 = TMPDIR + filesep() + 'niv1' + filesep() + 'test1.txt';
-cd(TMPDIR+'/niv1/niv2/niv3');
-r1 = fullpath('../../test1.txt');
+mkdir(TMPDIR+"/niv1");
+mkdir(TMPDIR+"/niv1/niv2");
+mkdir(TMPDIR+"/niv1/niv2/niv3");
+mputl(" ",TMPDIR+"/niv1/test1.txt");
+mputl(" ",TMPDIR+"/niv1/niv2/test2.txt");
+mputl(" ",TMPDIR+"/niv1/niv2/niv3/test3.txt");
+REF3 = TMPDIR + filesep() + "niv1" + filesep() + "niv2" + filesep() + "niv3" + filesep() + "test3.txt";
+REF2 = TMPDIR + filesep() + "niv1" + filesep() + "niv2" + filesep() + "test2.txt";
+REF1 = TMPDIR + filesep() + "niv1" + filesep() + "test1.txt";
+cd(TMPDIR+"/niv1/niv2/niv3");
+r1 = fullpath("../../test1.txt");
 assert_checkequal(r1, REF1);
-r2 = fullpath('../test2.txt');
+r2 = fullpath("../test2.txt");
 assert_checkequal(r2, REF2);
-r3 = fullpath('test3.txt');
+r3 = fullpath("test3.txt");
 assert_checkequal(r3, REF3);
 r1 = fullpath(REF1);
 assert_checkequal(r1, REF1);
@@ -34,5 +34,5 @@ assert_checkequal(r2, REF2);
 r3 = fullpath(REF3);
 assert_checkequal(r3, REF3);
 REF_M = [REF1, REF2, REF3];
-M = ['../../test1.txt', '../test2.txt', 'test3.txt'];
-assert_checkequal(REF_M, REF_M);
+M = ["../../test1.txt", "../test2.txt", "test3.txt"];
+assert_checkequal(REF_M, fullpath(M));

diff --git a/scilab/modules/fileio/tests/unit_tests/fullpath.tst b/scilab/modules/fileio/tests/unit_tests/fullpath.tst
index 92d8d29..0fa40d8 100644 (file)
--- a/scilab/modules/fileio/tests/unit_tests/fullpath.tst
+++ b/scilab/modules/fileio/tests/unit_tests/fullpath.tst
@@ -13,29 +13,29 @@ assert_checkequal(ierr, 77);
 ierr = execstr("fullpath(''test.sce'',''test.sce'');","errcatch");
 assert_checkequal(ierr, 77);
 
-assert_checkequal(fullpath('.'), pwd());
+assert_checkequal(fullpath("."), pwd());
 
 cd(TMPDIR);
-mkdir(TMPDIR+'/niv1');
-mkdir(TMPDIR+'/niv1/niv2');
-mkdir(TMPDIR+'/niv1/niv2/niv3');
-mputl(' ',TMPDIR+'/niv1/test1.txt');
-mputl(' ',TMPDIR+'/niv1/niv2/test2.txt');
-mputl(' ',TMPDIR+'/niv1/niv2/niv3/test3.txt');
+mkdir(TMPDIR+"/niv1");
+mkdir(TMPDIR+"/niv1/niv2");
+mkdir(TMPDIR+"/niv1/niv2/niv3");
+mputl(" ",TMPDIR+"/niv1/test1.txt");
+mputl(" ",TMPDIR+"/niv1/niv2/test2.txt");
+mputl(" ",TMPDIR+"/niv1/niv2/niv3/test3.txt");
 
-REF3 = TMPDIR + filesep() + 'niv1' + filesep() + 'niv2' + filesep() + 'niv3' + filesep() + 'test3.txt';
-REF2 = TMPDIR + filesep() + 'niv1' + filesep() + 'niv2' + filesep() + 'test2.txt';
-REF1 = TMPDIR + filesep() + 'niv1' + filesep() + 'test1.txt';
+REF3 = TMPDIR + filesep() + "niv1" + filesep() + "niv2" + filesep() + "niv3" + filesep() + "test3.txt";
+REF2 = TMPDIR + filesep() + "niv1" + filesep() + "niv2" + filesep() + "test2.txt";
+REF1 = TMPDIR + filesep() + "niv1" + filesep() + "test1.txt";
 
-cd(TMPDIR+'/niv1/niv2/niv3');
+cd(TMPDIR+"/niv1/niv2/niv3");
 
-r1 = fullpath('../../test1.txt');
+r1 = fullpath("../../test1.txt");
 assert_checkequal(r1, REF1);
 
-r2 = fullpath('../test2.txt');
+r2 = fullpath("../test2.txt");
 assert_checkequal(r2, REF2);
 
-r3 = fullpath('test3.txt');
+r3 = fullpath("test3.txt");
 assert_checkequal(r3, REF3);
 
 r1 = fullpath(REF1);
@@ -48,6 +48,6 @@ r3 = fullpath(REF3);
 assert_checkequal(r3, REF3);
 
 REF_M = [REF1, REF2, REF3];
-M = ['../../test1.txt', '../test2.txt', 'test3.txt'];
-assert_checkequal(REF_M, REF_M);
+M = ["../../test1.txt", "../test2.txt", "test3.txt"];
+assert_checkequal(REF_M, fullpath(M));