exec : management of macro and macrofile.

[scilab.git] / scilab / modules / functions / tests / unit_tests / exec.tst

diff --git a/scilab/modules/functions/tests/unit_tests/exec.tst b/scilab/modules/functions/tests/unit_tests/exec.tst
index 37676c0..45caeeb 100644 (file)
--- a/scilab/modules/functions/tests/unit_tests/exec.tst
+++ b/scilab/modules/functions/tests/unit_tests/exec.tst
@@ -13,40 +13,43 @@ tab_ref = [
 "حريات وحقوق",
 "תוכנית"];
 
-str_exec = 'disp(''OK'');';
-
-for i = 1 : size(tab_ref,'*')
-  mkdir(TMPDIR + filesep() + tab_ref(i));
-  fd = mopen(TMPDIR + filesep() + tab_ref(i) + filesep() + tab_ref(i) + '.sce','wt');
-  mputl(str_exec,fd);
-  mclose(fd);
-  exec(TMPDIR + filesep() + tab_ref(i) + filesep() + tab_ref(i) + '.sce');
-  mdelete(TMPDIR + filesep() + tab_ref(i) + filesep() + tab_ref(i) + '.sce');
-  rmdir(TMPDIR + filesep() + tab_ref(i));
-end  
+str_exec = "disp(''OK'');";
+
+for i = 1 : size(tab_ref,"*")
+    mkdir(TMPDIR + filesep() + tab_ref(i));
+    fd = mopen(TMPDIR + filesep() + tab_ref(i) + filesep() + tab_ref(i) + ".sce","wt");
+    mputl(str_exec,fd);
+    mclose(fd);
+    exec(TMPDIR + filesep() + tab_ref(i) + filesep() + tab_ref(i) + ".sce");
+    mdelete(TMPDIR + filesep() + tab_ref(i) + filesep() + tab_ref(i) + ".sce");
+    rmdir(TMPDIR + filesep() + tab_ref(i));
+end
 
 // create a script file
-mputl('a=1;b=2',TMPDIR+'/myscript')
+mputl("a=1;b=2",TMPDIR+"/myscript");
 // execute it
-exec(TMPDIR+'/myscript')
-if isdef('a')<> %t then pause,end
-if isdef('b')<> %t then pause,end
-if a <> 1 then pause,end
-if b <> 2 then pause,end
+exec(TMPDIR+"/myscript")
+if isdef("a")<> %t then pause,end
+if isdef("b")<> %t then pause,end
+assert_checkequal(a, 1);
+assert_checkequal(b, 2);
 
 
 // create a function
-deff('y=foo(x)','a=x+1;y=a^2');
+deff("y=foo(x)","a=x+1;y=a^2");
 clear a b
 // call the function
 k = foo(1);
-if isdef('k')<> %t then pause,end
-if isdef('a')<> %f then pause,end
-if k <> 4 then pause,end
-
-x=4; //create x to make it known by the script foo
+if isdef("k")<> %t then pause,end
+if isdef("a")<> %f then pause,end
+assert_checkequal(k, 4);
 clear k y
-exec(foo);
-if isdef('y')<> %t then pause,end
-if y <> 25 then pause,end
+
+// create a function and call this body as a script
+deff("script()","a=x+1;y=a^2");
+x=4; //create x to make it known by script
+exec(script);
+if isdef("y")<> %t then pause,end
+if isdef("a")<> %t then pause,end
+assert_checkequal(y, 25);