[output_stream] fix tests

Change-Id: If1c19a2d3635b71d2524ed4e28e182166b6b4b62

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.dia.ref
index 2f5e243..96f2e20 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.dia.ref
@@ -44,4 +44,4 @@ A=[1.7894567d120+%i  1.2345678*%i
 4.2345678d123 -7.7894567d120-2.45*%i];
 if or(string(A)<> ["1.79D+120+%i","%i*1.2345678";"4.23D+123","-7.79D+120-%i*2.45"]) then bugmes();quit;end
 P=1.2345678d-123-1.7894567d88*%s;
-if or(string(P)<>["";"1.23D-123 - 1.789D+88s"] ) then bugmes();quit;end
+if or(string(P)<>"1.23D-123 -1.789D+88s" ) then bugmes();quit;end

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.tst b/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.tst
index 22bf919..53e99bf 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.tst
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_1371.tst
@@ -67,4 +67,4 @@ if or(string(A)<> ["1.79D+120+%i","%i*1.2345678";"4.23D+123","-7.79D+120-%i*2.45
 
 
 P=1.2345678d-123-1.7894567d88*%s;
-if or(string(P)<>["";"1.23D-123 - 1.789D+88s"] ) then pause,end
+if or(string(P)<>"1.23D-123 -1.789D+88s" ) then pause,end

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_14221.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_14221.dia.ref
index cccac15..8840872 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_14221.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_14221.dia.ref
@@ -28,22 +28,13 @@ mprintf("%.1f %% \n", (0:9)')
 9.0 % 
 msprintf("%.1f %% \n", (0:9)')
  ans  =
-!0.0 %   !
-!        !
-!1.0 %   !
-!        !
-!2.0 %   !
-!        !
-!3.0 %   !
-!        !
-!4.0 %   !
-!        !
-!5.0 %   !
-!        !
-!6.0 %   !
-!        !
-!7.0 %   !
-!        !
-!8.0 %   !
-!        !
-!9.0 %   !
+  "0.0 % "
+  "1.0 % "
+  "2.0 % "
+  "3.0 % "
+  "4.0 % "
+  "5.0 % "
+  "6.0 % "
+  "7.0 % "
+  "8.0 % "
+  "9.0 % "

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_15640.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_15640.dia.ref
index 13fd27d..4e84e1e 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_15640.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_15640.dia.ref
@@ -29,9 +29,9 @@ X=testmatrix('magi',4)/3;
 X([2 3 4 7 8 12])=%eps*[2 3 4 7 8 12]/8
  X  = 
    5.3333333   0.6666667   1.          4.3333333
-   0.          3.6666667   3.3333333   2.6666667
-   0.          1.943D-16   2.          4.       
-   0.          2.220D-16   3.331D-16   0.3333333
+   5.551D-17   3.6666667   3.3333333   2.6666667
+   8.327D-17   1.943D-16   2.          4.       
+   1.110D-16   2.220D-16   3.331D-16   0.3333333
 X=[1 2;3 4]
  X  = 
    1.   2.
@@ -42,18 +42,17 @@ exp(%i*%pi*X)
   -1. + 3.674D-16i   1. - 4.899D-16i
 exp(%i*%pi*X/2)
  ans  =
-   0.        + i    -1. + 1.225D-16i
+   6.123D-17 + i    -1. + 1.225D-16i
   -1.837D-16 - i     1. - 2.449D-16i
 exp(%i*%pi*X/4)
  ans  =
-   0.7071068 + 0.7071068i   0. + i         
-  -0.7071068 + 0.7071068i  -1. + 1.225D-16i
+   0.7071068 + 0.7071068i   6.123D-17 + i  
+  -0.7071068 + 0.7071068i  -1.        + 1.225D-16i
 X=[1 20;300 4000]
  X  = 
    1.     20.  
    300.   4000.
 string(X)
  ans  =
-!1    20    !
-!           !
-!300  4000  !
+  "1"    "20"  
+  "300"  "4000"

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_2649.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_2649.dia.ref
index cab609e..6803ab2 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_2649.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_2649.dia.ref
@@ -21,31 +21,19 @@ diary(dia0, 'close');
 diary(dia1, 'close');
 ret = mgetl(TMPDIR+'/my_log_1')
  ret  = 
-!                                       !
-!                                       !
-!a = 1;                             !
-!                                       !
-!                                       !
-!                                       !
-!dia1 = diary(TMPDIR+'/my_log_2');  !
-!                                       !
-!                                       !
-!                                       !
-!b = 1;                             !
-!                                       !
-!                                       !
-!                                       !
-!diary(dia0, 'close');              !
+  ""                                     
+  "a = 1;"                           
+  ""                                     
+  "dia1 = diary(TMPDIR+'/my_log_2');"
+  ""                                     
+  "b = 1;"                           
+  ""                                     
+  "diary(dia0, 'close');"            
 ret = mgetl(TMPDIR+'/my_log_2')
  ret  = 
-!                           !
-!                           !
-!b = 1;                 !
-!                           !
-!                           !
-!                           !
-!diary(dia0, 'close');  !
-!                           !
-!                           !
-!                           !
-!diary(dia1, 'close');  !
+  ""                         
+  "b = 1;"               
+  ""                         
+  "diary(dia0, 'close');"
+  ""                         
+  "diary(dia1, 'close');"

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_3831.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_3831.dia.ref
index 8e6c1b9..9c0c995 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_3831.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_3831.dia.ref
@@ -23,7 +23,7 @@ refSTRING2 = "Trans" + ascii(0) + "ission";
 // no ; to display result
 res = ascii(refASCIICODE2)
  res  = 
- Transission
+  "Transission"
 if length(res) <> length(refSTRING2) then bugmes();quit;end
 if refSTRING2 <> res then bugmes();quit;end
 refASCIICODE3 = [84  114  97  110  115  0  105  115  115  105  111  110];
@@ -31,6 +31,6 @@ refSTRING3 = "Trans" + ascii(0);
 // no ; to display result
 res = ascii(refASCIICODE3)
  res  = 
- Trans
+  "Trans"
 if length(res) <> length(refSTRING3) then bugmes();quit;end
 if refSTRING3 <> res then bugmes();quit;end

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_4073.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_4073.dia.ref
index 6d70fea..82e627e 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_4073.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_4073.dia.ref
@@ -30,13 +30,13 @@ end
 for i = 1 : size(tab_ref,'*')
   disp(tab_ref(i));
 end
- 世界您好
- азеазея
- ハロー・ワールド
- เฮลโลเวิลด์
- حريات وحقوق
- תוכנית
- àéùç
+  "世界您好"
+  "азеазея"
+  "ハロー・ワールド"
+  "เฮลโลเวิลด์"
+  "حريات وحقوق"
+  "תוכנית"
+  "àéùç"
 // =============================================================================
 for i = 1 : size(tab_ref,'*')
   mprintf(tab_ref(i));

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_4689.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_4689.dia.ref
index a556921..e1de2d2 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_4689.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_4689.dia.ref
@@ -17,18 +17,13 @@
 fileout = pathconvert(TMPDIR+"/bug_diary.txt",%F);
 id = diary(fileout);
 disp("Hello world");
- Hello world
+  "Hello world"
 diary(id, 'close');
 mgetl(fileout)
  ans  =
-!                          !
-!                          !
-!disp("Hello world");  !
-!                          !
-!                          !
-!                          !
-! Hello world              !
-!                          !
-!                          !
-!                          !
-!diary(id, 'close');   !
+  ""                        
+  "disp("Hello world");"
+  ""                        
+  "  "Hello world""         
+  ""                        
+  "diary(id, 'close');" 

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_8874.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_8874.dia.ref
index 921b718..8ae4450 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_8874.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_8874.dia.ref
@@ -123,4 +123,4 @@ As
 (  2,  4)        4.000D+00 + 0.000D+00i
 P
  P  = 
-  -1D+00+Infi +(1D+00+Nani)s +(Inf+Nani)s² -(Nan+Nani)s³
+  -1.000D+00+Infi +(1.000D+00+Nani)s +(Inf+Nani)s² -(Nan+Nani)s³

diff --git a/scilab/modules/output_stream/tests/unit_tests/disp.dia.ref b/scilab/modules/output_stream/tests/unit_tests/disp.dia.ref
index 86a53f6..bdd0d9f 100644 (file)
--- a/scilab/modules/output_stream/tests/unit_tests/disp.dia.ref
+++ b/scilab/modules/output_stream/tests/unit_tests/disp.dia.ref
@@ -6,13 +6,13 @@
 // =============================================================================
 // <-- CLI SHELL MODE -->
 disp(3,[1 2]);
-    3.
-    1.    2.
+   3.
+   1.   2.
 disp('A string');
- A string
+  "A string"
 disp("disp test :","høyesterettsjustitiarius");
- disp test :
- høyesterettsjustitiarius
+  "disp test :"
+  "høyesterettsjustitiarius"
 deff('[]=%t_p(l)','disp(l(2),l(3))');
 disp(tlist('t',1,2));
    1.
@@ -25,20 +25,10 @@ text=[ "中文測試"; "азеазеясдвклгхклмвцмзер"; ..
 "כל בני האדם נולדו בני חורין ושווים בערכם ובזכיותיהם. כולם חוננו בתבונה ובמצפון, לפיכך חובה עליהם לנהג איש ברעהו ברוח של אחוה"
 ];
 disp(text);
-!中文測試                                                                  !
-!                                                                      !
-!азеазеясдвклгхклмвцмзер                                               !
-!                                                                      !
-!ድቅስድቅስግጅክልውሽችክልዝ                                                      !
-!                                                                      !
-!すべての人間は、生まれながらにして自由であり、かつ、尊厳と権利と について平等である。人間は、理性と良心とを授けられており、互いに同 胞の精!
-!神をもって行動しなければならない。                                                     !
-!                                                                      !
-!人 人 生 而 自 由, 在 尊 严 和 权 利 上 一 律 平 等。 他 们 赋 有 理 性 和 良 心, 并 应 以 兄 弟 关 系 的!
-! 精 神 相 对 待。                                                           !
-!                                                                      !
-!لد جميع الناس أحرارًا متساوين في الكرامة والحقوق. وقد وهبوا عقلاً وضمي!
-!رًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء                           !
-!                                                                      !
-!כל בני האדם נולדו בני חורין ושווים בערכם ובזכיותיהם. כולם חוננו בתבונה!
-! ובמצפון, לפיכך חובה עליהם לנהג איש ברעהו ברוח של אחוה                !
+  "中文測試"                                                               
+  "азеазеясдвклгхклмвцмзер"                                            
+  "ድቅስድቅስግጅክልውሽችክልዝ"                                                   
+  "すべての人間は、生まれながらにして自由であり、かつ、尊厳と権利と について平等である。人間は、理性と良心とを授けられており、互いに同 胞の精神をもって行動しなければならない。"
+  "人 人 生 而 自 由, 在 尊 严 和 权 利 上 一 律 平 等。 他 们 赋 有 理 性 和 良 心, 并 应 以 兄 弟 关 系 的 精 神 相 对 待。"
+  "لد جميع الناس أحرارًا متساوين في الكرامة والحقوق. وقد وهبوا عقلاً وضميرًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء"
+  "כל בני האדם נולדו בני חורין ושווים בערכם ובזכיותיהם. כולם חוננו בתבונה ובמצפון, לפיכך חובה עליהם לנהג איש ברעהו ברוח של אחוה"