[graphics] fix tests

Change-Id: Ia2829c63f963b8fdc4b1365012f88ea840b4431c

diff --git a/scilab/modules/graphics/macros/TitleLabel.sci b/scilab/modules/graphics/macros/TitleLabel.sci
index 4939434..28e647c 100644 (file)
--- a/scilab/modules/graphics/macros/TitleLabel.sci
+++ b/scilab/modules/graphics/macros/TitleLabel.sci
@@ -48,7 +48,7 @@ function TitleLabel(varargin)
             arginPos = arginPos + 1;
         else
             msg = gettext("%s: Wrong size or type for input argument #%d: string expected.\n")
-            error(msprintf(msg, fname, shift+1));
+            error(msprintf(msg, fname, arginPos+1));
         end
     end
 

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1126.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1126.dia.ref
index 816c045..a64d604 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1126.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1126.dia.ref
@@ -28,6 +28,5 @@ xtitle("new mode is used: 800 x 600 picture ?")
 xend();
 driver("Rec")
  ans  =
- 
- GIF   
-// Then open toto.gif in a image viewer.
+  "GIF"
+// Then open toto.gif in a image viewer. 

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1454.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1454.dia.ref
index daed57f..e003122 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1454.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1454.dia.ref
@@ -16,5 +16,4 @@ M  = 20;
 x = [0:1/fs:M*fs];
 plot2d(x)
 disp('OK');
- 
- OK   
+  "OK"

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1466.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1466.dia.ref
index e719449..03fe2ee 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1466.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1466.dia.ref
@@ -16,8 +16,7 @@ x=linspace(0,2*%pi,500);
 s=sin(10*x);
 driver("PPM")
  ans  =
- 
- Rec   
+  "Rec"
 xinit("testplot.ppm")
 plot2d(x,s)
 // crash here in Scilab 3.0

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1682.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1682.dia.ref
index caccc71..72e0032 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1682.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1682.dia.ref
@@ -21,8 +21,7 @@
 //
 //    Jacques-Deric
 disp ("4.21.51A");
- 
- 4.21.51A   
+  "4.21.51A"
 hf                = scf (1);
 hf.figure_name    = "4.21.51A";
 hf.background     = 32;

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2154.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2154.dia.ref
index 4272c81..1e4dbda 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2154.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2154.dia.ref
@@ -18,13 +18,11 @@ plot3d([xx xx],[yy yy],list([zz zz+4],[4*ones(1,400) 5*ones(1,400)]))
 e=gce();
 e.color_flag // valeur 2 ok
  ans  =
- 
-    2.  
+   2.
 errorNum = execstr("e.color_flag=2", "errcatch"); //message d'erreur : bug
 if (errorNum <> 0) then bugmes();quit;end;
 e.cdata_mapping // valeur direct=ok
  ans  =
- 
- direct   
+  "direct"
 errorNum = execstr("e.cdata_mapping=''direct''", "errcatch"); //message d'erreur : bug
 if (errorNum <> 0) then bugmes();quit;end;

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_7080.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_7080.tst
index fe280cb..b485781 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_7080.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_7080.tst
@@ -21,7 +21,7 @@ f2="barh";
 f3="barhomogenize";
 f4="getColorIndex";
 f13="Sgrayplot";
-f14="TitleLabel";
+f14="title";
 
 //bar
 msgerr11=msprintf(_("%s: Wrong number of input argument(s): %d to %d expected.\n"),f1,1,6);
@@ -59,4 +59,4 @@ assert_checkerror("Sgrayplot(%i,%i,[%i,%i])", msgerr132);
 
 //TitleLabel
 msgerr141=msprintf(gettext("%s: Wrong size or type for input argument #%d: string expected.\n"),f14,1);
-assert_checkerror("TitleLabel(""Scale n°3"",1)",msgerr141);
+assert_checkerror("title(1)",msgerr141);