Scicos tests: improve Annotation

Change-Id: I1f81833785cc4dc46b8431a79cc64d59b3f481ad

diff --git a/scilab/modules/scicos/tests/unit_tests/model/Annotation.dia.ref b/scilab/modules/scicos/tests/unit_tests/model/Annotation.dia.ref
index 7fad281..5d470f2 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/Annotation.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/model/Annotation.dia.ref
@@ -4,7 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
-// <-- TEST WITH GRAPHIC -->
+// <-- CLI SHELL MODE -->
 loadXcosLibs();
 scicos_log("TRACE");
 p = funcprot();
@@ -52,10 +52,28 @@ o.void
 o.gui
  ans  =
  TEXT_f
+// Redefine gca() to prevent graphic display
+p = funcprot();
+funcprot(0);
+function a = gca()
+    a.font_style = 6;
+    a.font_size = 1;
+    a.font_color = -1;
+endfunction
+funcprot(p);
 // Modify it
 o = TEXT_f("set", o)
 Xcos info:    objectCreated( 2 , ANNOTATION )
 Xcos info:    objectCloned( 1 , 2 , ANNOTATION )
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , DESCRIPTION ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , FONT ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , FONT_SIZE ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , UID ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , STYLE ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , GEOMETRY ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , PARENT_DIAGRAM ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , PARENT_BLOCK ) : NO_CHANGES
+Xcos trace:   propertyUpdated( 2 , ANNOTATION , RELATED_TO ) : NO_CHANGES
 Xcos trace:   propertyUpdated( 2 , ANNOTATION , GEOMETRY ) : NO_CHANGES
 Xcos debug:   propertyUpdated( 2 , ANNOTATION , GEOMETRY ) : SUCCESS
 Xcos debug:   propertyUpdated( 2 , ANNOTATION , DESCRIPTION ) : SUCCESS
@@ -70,7 +88,6 @@ Graphics:
           sz = [3,4]
           exprs = ["newText";"3";"4"]
           style = ""
-close;
 o.graphics
  ans  =
 orig = [0,0]

diff --git a/scilab/modules/scicos/tests/unit_tests/model/Annotation.tst b/scilab/modules/scicos/tests/unit_tests/model/Annotation.tst
index ea9b910..098341f 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/Annotation.tst
+++ b/scilab/modules/scicos/tests/unit_tests/model/Annotation.tst
@@ -5,7 +5,7 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
-// <-- TEST WITH GRAPHIC -->
+// <-- CLI SHELL MODE -->
 
 loadXcosLibs();
 scicos_log("TRACE");
@@ -32,9 +32,18 @@ o.model
 o.void
 o.gui
 
+// Redefine gca() to prevent graphic display
+p = funcprot();
+funcprot(0);
+function a = gca()
+    a.font_style = 6;
+    a.font_size = 1;
+    a.font_color = -1;
+endfunction
+funcprot(p);
+
 // Modify it
 o = TEXT_f("set", o)
-close;
 o.graphics
 o.model
 o.void