0023607: Spelling corrections in OCCT tests

diff --git a/tests/3rdparty/export/end b/tests/3rdparty/export/end
index d01915a..b2b3c13 100644 (file)
--- a/tests/3rdparty/export/end
+++ b/tests/3rdparty/export/end
@@ -1,12 +1,12 @@
 vexport ${aFile} ${format}
 
 if { [file exists ${aFile}] } {
-    puts "Export to ${format} file was done."
+    puts "The file has been exported to ${format}."
     set filesize [file size ${aFile}]
 # Check if difference of size is more 5%
     if { $filesize < $size && [expr 1.*($size - $filesize)/$size] > 0.05 } {
-       puts "Error: Export to ${format} file was done but file has a different size ($filesize instead of $size)."
+       puts "Error: The file has been exported to ${format}, but the result has a different size ($filesize instead of $size)."
     }
 } else {
-    puts " Faulty: Export to${format}  file was not done."
+    puts "Error: Impossible to export file to ${format}."
 }

diff --git a/tests/blend/end b/tests/blend/end
index 41f314c..96a3654 100644 (file)
--- a/tests/blend/end
+++ b/tests/blend/end
@@ -12,11 +12,11 @@ if { [isdraw result] } {
    }
 
    if { $square > 0 } {
-      puts "The expected square is $square"
+      puts "The expected area is $square"
    }
    #check of change of square is < 1%
    if { ($square != 0 && [expr 1.*abs($square - $m)/$square] > 0.01) || ($square == 0 && $m != 0) } {
-      puts "Error : The square of result shape is $m"
+      puts "Error : The area of the resulting shape is $m"
    }
    if { $m > 0 } {
       clear
@@ -26,7 +26,7 @@ if { [isdraw result] } {
       xwd $imagedir/${test_image}.png
    }
 } else {
-   puts "Error : The blend can not be build."
+   puts "Error : The blend cannot be build."
 }
 
 # to end a test script

diff --git a/tests/boolean/end b/tests/boolean/end
index bc8b9ae..08623c2 100755 (executable)
--- a/tests/boolean/end
+++ b/tests/boolean/end
@@ -29,16 +29,16 @@ if { [isdraw result] } {
       }
       #check of change of square is < 1%
       if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-        puts "Error : The $prop of result shape is $m"
+        puts "Error : The $prop of the resulting shape is $m"
       }
       
       if { [info exists nbsh_v ] } {
        set arr_v [explode result v]
        set nb_v [ llength $arr_v ]
         if { $nb_v != $nbsh_v } {
-           puts "Error : Result shape is WRONG because it must contain $nbsh_v vertexes instead of $nb_v"
+           puts "Error : The resulting shape is WRONG because it must contain $nbsh_v vertexes instead of $nb_v"
         } else {
-           puts "Result shape contains $nb_v vertexes"
+           puts "The resulting shape contains $nb_v vertexes"
         }
         
       }
@@ -47,9 +47,9 @@ if { [isdraw result] } {
        set arr_e [explode result e]
        set nb_e [ llength $arr_e ]
         if { $nb_e != $nbsh_e } {
-           puts "Error : Result shape is WRONG because it must contain $nbsh_e edges instead of $nb_e"
+           puts "Error : The resulting shape is WRONG because it must contain $nbsh_e edges instead of $nb_e"
         } else {
-           puts "Result shape contains $nb_e edges"
+           puts "The resulting shape contains $nb_e edges"
         }
       }
    } else {
@@ -70,7 +70,7 @@ if { [isdraw result] } {
    fit
    xwd $imagedir/${test_image}.png
 } else {
-   puts "Error : The $command can not be build."
+   puts "Error : The $command cannot be built."
 }
 
 # to end a test script

diff --git a/tests/draft/end b/tests/draft/end
index ecd3b92..eefd975 100755 (executable)
--- a/tests/draft/end
+++ b/tests/draft/end
@@ -5,15 +5,15 @@ if { [isdraw result] } {
    set ch [checkshape result]
    puts $ch
    if { $m == 0 } {
-       puts "Error : The depouille is not valid. The square is 0."
+       puts "Error : The skin is not valid. The area is 0."
    }
 
    if { $square > 0 } {
-      puts "The expected square is $square"
+      puts "The expected area is $square"
    }
    #check of change of square is < 1%
    if { ($square != 0 && [expr 1.*abs($square - $m)/$square] > 0.01) || ($square == 0 && $m != 0) } {
-      puts "Error : The square of result shape is $m"
+      puts "Error : The area of the resulting shape is $m"
    }
    if { [string compare $ch "This shape seems to be valid"] == 0 } {
       #check if tolerance is less 1.
@@ -26,7 +26,7 @@ if { [isdraw result] } {
          regexp {Tolerance +MAX=([-0-9.+eE]+)} [tolerance result] full tol
       }
       if { $tol > 1. } {
-         puts "Error: The tolerance of result shape is too big ($tol)."
+         puts "Error: The tolerance of the resulting shape is too big ($tol)."
       }
    }
 
@@ -38,7 +38,7 @@ if { [isdraw result] } {
       xwd $imagedir/${test_image}.png
    }
 } else {
-   puts "Error : The depouille can not be build."
+   puts "Error : The skin cannot be built."
 }
 
 # to end a test script

diff --git a/tests/feat/end b/tests/feat/end
index cec8e5c..521ad62 100755 (executable)
--- a/tests/feat/end
+++ b/tests/feat/end
@@ -9,15 +9,15 @@ if { [isdraw result] } {
    #check if result is valid
    puts [checkshape result]
    if { $m == 0 } {
-       puts "Error : The feat is not valid. The square is 0."
+       puts "Error : The feat grid is not valid. The area is 0."
    }
 
    if { $square > 0 } {
-      puts "The expected square is $square"
+      puts "The expected area is $square"
    }
    #check of change of square is < 1%
    if { ($square != 0 && [expr 1.*abs($square - $m)/$square] > 0.01) || ($square == 0 && $m != 0) } {
-      puts "Error : The square of result shape is $m"
+      puts "Error : The area of the resulting shape is $m"
    }
    if { $m > 0 } {
       clear
@@ -27,7 +27,7 @@ if { [isdraw result] } {
       xwd $imagedir/${test_image}.png
    } 
 } else {
-   puts "Error : The feat can not be build."
+   puts "Error : The feat grid cannot be built."
 }
 
 # to end a test script

diff --git a/tests/geometry/end b/tests/geometry/end
index 4f9627f..f5cd448 100755 (executable)
--- a/tests/geometry/end
+++ b/tests/geometry/end
@@ -2,7 +2,7 @@ proc comparison { x1 x1_o prop } {
     set precision 0.0000001
     if { ( abs($x1) > $precision ) || ( abs($x1_o) > $precision ) } {
        if { ($x1_o != 0 && [expr 1.*abs($x1_o - $x1)/$x1_o] > 0.01) || ($x1_o == 0 && $x1 != 0) } {
-           puts "Error : The $prop of result shape is $x1 and expected $prop is $x1_o"
+           puts "Error : The $prop of the resulting shape is $x1 and the expected $prop is $x1_o"
        }
     }
 }
@@ -74,7 +74,7 @@ if { [isdraw result] } {
            }
            #check of change of length is < 1%
            if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-               puts "Error : The $prop of result shape is $m"
+               puts "Error : The $prop of the resulting shape is $m"
            }
        } else {
            if { $m != 0 } {
@@ -83,7 +83,7 @@ if { [isdraw result] } {
        }
     }  
 } else {
-    puts "Error : The $command can not be build."
+    puts "Error : The $command cannot be built."
 }
 
 $viewer

diff --git a/tests/heal/end b/tests/heal/end
index b1bc29c..35f01fb 100755 (executable)
--- a/tests/heal/end
+++ b/tests/heal/end
@@ -3,7 +3,7 @@ smallview
 if { [isdraw result] } {
    donly result
 } else {
-   puts "Error : result shape is not done."
+   puts "Error : the resulting shape is not done."
 }
 fit
 xwd $imagedir/${test_image}.png

diff --git a/tests/heal/surface_to_revolution_advanced/end b/tests/heal/surface_to_revolution_advanced/end
index d71e3c0..eea980d 100644 (file)
--- a/tests/heal/surface_to_revolution_advanced/end
+++ b/tests/heal/surface_to_revolution_advanced/end
@@ -10,14 +10,14 @@ regexp {Number +of +other +surfaces +- +([-0-9.+eE]+)} $expsh full nb_other_surf
 regexp {Number +of +other +curves +- +([-0-9.+eE]+)} $expsh full nb_curve
 regexp {Number +of +other +pcurves +- +([-0-9.+eE]+)} $expsh full nb_pcurve
 if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0} {
-   puts "Error : shape result is not correct"
+   puts "Error : The resulting shape is not correct"
 }
 regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
 regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
 
 if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-   puts "Error : The square of result shape is $m"
+   puts "Error : The area of the resulting shape is $m"
 } else {
-   puts "Squares of shapes a and result is equal"
+   puts "The areas of the initial and the resulting shape are equal"
 }
 

diff --git a/tests/heal/surface_to_revolution_standard/end b/tests/heal/surface_to_revolution_standard/end
index d71e3c0..09b53a6 100644 (file)
--- a/tests/heal/surface_to_revolution_standard/end
+++ b/tests/heal/surface_to_revolution_standard/end
@@ -10,14 +10,14 @@ regexp {Number +of +other +surfaces +- +([-0-9.+eE]+)} $expsh full nb_other_surf
 regexp {Number +of +other +curves +- +([-0-9.+eE]+)} $expsh full nb_curve
 regexp {Number +of +other +pcurves +- +([-0-9.+eE]+)} $expsh full nb_pcurve
 if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0} {
-   puts "Error : shape result is not correct"
+   puts "Error : The resulting shape is not correct"
 }
 regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
 regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
 
 if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-   puts "Error : The square of result shape is $m"
+   puts "Error : The area of the resulting shape is $m"
 } else {
-   puts "Squares of shapes a and result is equal"
+   puts "The areas the initial and the resulting shape are equal"
 }
 

diff --git a/tests/mesh/end b/tests/mesh/end
index 94892e1..d0ba206 100644 (file)
--- a/tests/mesh/end
+++ b/tests/mesh/end
@@ -49,12 +49,12 @@ if { [string compare $command "mesh"] == 0 } {
 
 # Collect TODO for area
 if { [string compare $bug_area ""] != 0 } {
-# The difference between square of geometry surface and square of mesh triangles should be less rel_tol value.
-# If rel_tol is 100 we suppose the mesh con not be created.
+# The difference between the area of a geometry surface and the area of mesh triangles should be less than rel_tol value.
+# If rel_tol is 100 we suppose that the mesh cannot be created.
     if { $rel_tol == 100 } {
-       puts "TODO $bug_area All:^\\s*Error  : Meshing algo cannot create mesh.\\s*$"
+       puts "TODO $bug_area All:^\\s*Error  : The meshing algorithm cannot create mesh.\\s*$"
     } else {
-       puts "TODO $bug_area All:^\\s*Error   : area by triangles differs from true area by \[-.0-9\]+ %\\s*$"
+       puts "TODO $bug_area All:^\\s*Error   : The area by triangles differs from the actual area by \[-.0-9\]+ %\\s*$"
     }
 }
 
@@ -115,7 +115,7 @@ set nod 0
 # Deflection
 set def 0
 
-# Collect number of triangles, number ofof nodes and deflection.
+# Collect number of triangles, number of nodes and deflection.
 if { [string compare $command "mesh"] != 0 } {
     set full [trinfo res]
     regexp "(\[0-9\]+) +triangles.*\[^0-9]\(\[0-9\]+) +nodes.*deflection +(\[0-9\]|\.+)" $full reg_out tri nod def
@@ -128,7 +128,7 @@ if { [string compare $command "mesh"] != 0 } {
 
 if { $tri == 0 || $nod == 0 } {                                                                     
     puts " "
-    puts "Error  : Meshing algo cannot create mesh."    
+    puts "Error  : The meshing algo cannot create mesh."    
 }             
 
 puts " "
@@ -150,7 +150,7 @@ proc CheckTriArea {shape {eps 0}} {
 puts "\nChecking triangulation area (triarea command)..."
 set rel_err [expr abs([CheckTriArea res $area_eps])]
 if { $rel_err > $rel_tol } {
-    puts "Error   : area by triangles differs from true area by $rel_err %"
+    puts "Error   : area by triangles differs from the actual area by $rel_err %"
 } else {
     if { $rel_tol > 1 && $rel_tol < 100 } {
        puts "Error: Improvement: The current area difference is $rel_err instead of $rel_tol"

diff --git a/tests/mkface/end b/tests/mkface/end
index 3c720d7..ce134a4 100755 (executable)
--- a/tests/mkface/end
+++ b/tests/mkface/end
@@ -12,31 +12,31 @@ if { [isdraw result] } {
 
    if { [info exists MaxFTol ] } {
       if { $MaxFTol != 0 && $maxf > $MaxFTol && [expr 1.*abs($MaxFTol - $maxf)/$MaxFTol] > 0.01 } {
-         puts "Error : Result shape is WRONG. MAX tolerance of FACE should be equal $MaxFTol instead of $maxf"
+         puts "Error : The resulting shape is WRONG. MAX tolerance of a FACE should be equal to $MaxFTol instead of $maxf"
       } elseif { $MaxFTol == 0 && $maxf != 0 } {
-         puts "Error : Result shape is WRONG."
+         puts "Error : The resulting shape is WRONG."
       } else {
-         puts "MAX tolerance of FACE of result shape is equal $maxf"
+         puts "MAX tolerance of a FACE of the resulting shape is equal to $maxf"
       }
    } 
 
    if { [info exists MaxETol ] } {
       if { $MaxETol != 0 && $maxe > $MaxETol && [expr 1.*abs($MaxETol - $maxe)/$MaxETol] > 0.01 } {
-         puts "Error : Result shape is WRONG. MAX tolerance of EDGE should be equal $MaxETol instead of $maxe"
+         puts "Error : The resulting shape is WRONG. MAX tolerance of an EDGE should be equal to $MaxETol instead of $maxe"
       } elseif { $MaxETol == 0 && $maxe != 0 } {
-         puts "Error : Result shape is WRONG."
+         puts "Error : The resulting shape is WRONG."
       } else {
-         puts "MAX tolerance of EDGE of result shape is equal $maxe"
+         puts "MAX tolerance of an EDGE of the resulting shape is equal to $maxe"
       }
    } 
 
    if { [info exists MaxVTol ] } {
       if { $MaxVTol != 0 && $maxv > $MaxVTol && [expr 1.*abs($MaxVTol - $maxv)/$MaxVTol] > 0.01 } {
-         puts "Error : Result shape is WRONG. MAX tolerance of VERTEX should be equal $MaxVTol instead of $maxv"
+         puts "Error : The resulting shape is WRONG. MAX tolerance of VERTEX should be equal to $MaxVTol instead of $maxv"
       } elseif { $MaxVTol == 0 && $maxv != 0 } {
-         puts "Error : Result shape is WRONG."
+         puts "Error : The resulting shape is WRONG."
       } else {
-         puts "MAX tolerance of VERTEX of result shape is equal $maxv"
+         puts "MAX tolerance of a VERTEX of the resulting shape is equal to $maxv"
       }
    } 
 
@@ -47,7 +47,7 @@ if { [isdraw result] } {
    xwd $imagedir/${test_image}.png
 
 } else {
-   puts "Error : The mkface can not be build."
+   puts "Error : The mkface can not be built."
 }
 
 # to end a test script

diff --git a/tests/nproject/end b/tests/nproject/end
index acda873..c0b961f 100755 (executable)
--- a/tests/nproject/end
+++ b/tests/nproject/end
@@ -17,7 +17,7 @@ if { [isdraw result] } {
       }
       #check of change of length is < 1%
       if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-        puts "Error : The $prop of result shape is $m"
+        puts "Error : The $prop of the resulting shape is $m"
       }
    } else {
       if { $m != 0 } {
@@ -38,7 +38,7 @@ if { [isdraw result] } {
       xwd $imagedir/${test_image}.png
    }
 } else {
-   puts "Error : The $command can not be build."
+   puts "Error : The $command cannot be built."
 }
 
 # to end a test script

diff --git a/tests/offset/end b/tests/offset/end
index 0bc43fe..0d3158b 100644 (file)
--- a/tests/offset/end
+++ b/tests/offset/end
@@ -34,15 +34,15 @@ if { [isdraw result] && $mist == 0} {
 
        if { $ll_v == 0 } {
            if { $theOff < 0 } {
-               puts [format "Warning : Result shape is empty COMPOUND"]
+               puts [format "Warning : The resulting shape is an empty COMPOUND"]
            } else {
-               puts [format "Error : Result shape is empty COMPOUND"]
+               puts [format "Error : The resulting shape is an empty COMPOUND"]
            }
            puts [whatis result]
            puts [nbshapes result]
            puts [checksection result]
        } else {
-           puts [format "Result shape contains %s wires" $ll_w]
+           puts [format "The resulting shape contains %s wires" $ll_w]
            foreach wire $wire_list {
                puts "Info for $wire:"
                regexp {Tolerance +MAX=([-0-9.+eE]+) +AVG=([-0-9.+eE]+) +MIN=[-0-9.+eE]+} [tolerance $wire] full MaxTol_res AvgTol_res
@@ -51,7 +51,7 @@ if { [isdraw result] && $mist == 0} {
                }
                regexp {nb +alone +Vertices +: +([-0-9.+eE]+)} [checksection $wire] full num
                if { $num != 0 } {
-                   puts [format "Error : $wire is UNclosed wire !!!"]
+                   puts [format "Error : $wire is NOT a closed wire"]
                }
                mkplane res_plane $wire
                set chsh_res_plane [checkshape res_plane]
@@ -65,7 +65,7 @@ if { [isdraw result] && $mist == 0} {
            puts "The expected length is $length"
            #check of change of length is < 1%
            if { ($length != 0 && [expr 1.*abs($length - $m)/$length] > 0.01) || ($length == 0 && $m != 0) } {
-               puts "Error : The length of result shape is $m"
+               puts "Error : The length of the resulting shape is $m"
            }
        } else {
            if { $m != 0 } {
@@ -75,25 +75,25 @@ if { [isdraw result] && $mist == 0} {
        # check for number of vertexes
        if { [info exists nbsh_v ] } {
            if { ($ll_v != $nbsh_v) || ($nbsh_v == 0 && $ll_v != 0) } {
-               puts "Error : Result shape is WRONG because it must contain $nbsh_v vertexes instead of $ll_v"
+               puts "Error : The resulting shape is WRONG because it must contain $nbsh_v vertexes instead of $ll_v"
            } else {
-               puts "Result shape contains $ll_v vertexes"
+               puts "The resulting shape contains $ll_v vertexes"
            }
        }
        # check for number of edges
        if { [info exists nbsh_e ] } {
            if { ($ll_e != $nbsh_e) || ($nbsh_e == 0 && $ll_e != 0) } {
-               puts "Error : Result shape is WRONG because it must contain $nbsh_e edges instead of $ll_e"
+               puts "Error : The resulting shape is WRONG because it must contain $nbsh_e edges instead of $ll_e"
            } else {
-               puts "Result shape contains $ll_e edges"
+               puts "The resulting shape contains $ll_e edges"
            }
        }
        # check for number of wires
        if { [info exists nbsh_w ] } {
            if { ($ll_w != $nbsh_w) || ($nbsh_w == 0 && $ll_w != 0) } {
-               puts "Error : Result shape is WRONG because it must contain $nbsh_w wires instead of $ll_w"
+               puts "Error : The resulting shape is WRONG because it must contain $nbsh_w wires instead of $ll_w"
            } else {
-               puts "Result shape contains $ll_w wires"
+               puts "The resulting shape contains $ll_w wires"
            }
        }
     } else {
@@ -110,7 +110,7 @@ if { [isdraw result] && $mist == 0} {
        foreach ResultFace [ explode result f ]  {
            regexp {Mass +: +([-0-9.+eE]+)} [sprops $ResultFace] full fmass
            if { $fmass < 0 } {
-               puts "Error : Square of face $ResultFace of result shape is negative."
+               puts "Error : The area of face $ResultFace of the resulting shape is negative."
            }
        }
        #check for bsection
@@ -119,7 +119,7 @@ if { [isdraw result] && $mist == 0} {
            if { [ isdraw re ] } {
                regexp {Mass +: +([-0-9.+eE]+)} [lprops $re] full remass 
                if { $remass != 0 } {
-                   puts "Error: bsection of result and s is not equal zero."
+                   puts "Error: bsection of the result and s is not equal to zero."
                }
            }
        }
@@ -129,7 +129,7 @@ if { [isdraw result] && $mist == 0} {
        }
        #check of change of volume is < 1%
        if { ($volume > 0 && [expr 1.*abs($volume - $m)/$volume] > 0.01) || ($volume == 0 && $m != 0 && $sm != $m) } {
-           puts "Error : The volume of result shape is $m"
+           puts "Error : The volume of the resulting shape is $m"
        }
     }
     if { $m > 0 } {
@@ -140,7 +140,7 @@ if { [isdraw result] && $mist == 0} {
        xwd $imagedir/${test_image}.png
     } 
 } else {
-    puts "Error : The offset can not be build."
+    puts "Error : The offset cannot be built."
 }
 
 # to end a test script

diff --git a/tests/pipe/end b/tests/pipe/end
index c61ac31..2eb8fa6 100644 (file)
--- a/tests/pipe/end
+++ b/tests/pipe/end
@@ -4,15 +4,15 @@ if { [isdraw result] } {
    #check if result is valid
    puts [checkshape result]
    if { $m == 0 } {
-      puts "Error: The pipe is invalid. The square is 0."
+      puts "Error: The pipe is invalid. The area is 0."
    }
 
    if { $square > 0 } {
-      puts "The expected square is $square"
+      puts "The expected area is $square"
    }
    #check of change of square is < 1%
    if { ($square != 0 && [expr 1.*abs($square - $m)/$square] > 0.01) || ($square == 0 && $m != 0) } {
-      puts "Error : The square of result shape is $m"
+      puts "Error : The area of the resulting shape is $m"
    }
    if { $m > 0 } {
       clear
@@ -22,7 +22,7 @@ if { [isdraw result] } {
       xwd $imagedir/${test_image}.png
    } 
 } else {
-   puts "Error : The pipe can not be build."
+   puts "Error : The pipe cannot be built."
 }
 
 # to end a test script

diff --git a/tests/prism/end b/tests/prism/end
index 1a4349d..3909272 100644 (file)
--- a/tests/prism/end
+++ b/tests/prism/end
@@ -9,7 +9,7 @@ if { [isdraw result] } {
     fit
     xwd $imagedir/${test_image}.png
 } else {
-   puts "Error : The prism can not be build."
+   puts "Error : The prism cannot be built."
 }
 
 # to end a test script

diff --git a/tests/sewing/end b/tests/sewing/end
index 5acdd11..fed8b02 100644 (file)
--- a/tests/sewing/end
+++ b/tests/sewing/end
@@ -42,8 +42,8 @@ if { [isdraw result] } {
       puts "Error : Number of free edges is $index"
     }
 
-    puts "Number of faulties for initial shape is $nb_a."
-    puts "Number of faulties for result shape is $nb_r."
+    puts "Number of faults for the initial shape is $nb_a."
+    puts "Number of faults for the resulting shape is $nb_r."
 
     #if nb_f is empty then it is instaility.
     if { [string compare "$nb_f" ""] == 0 || $nb_f > 0 } {
@@ -51,10 +51,10 @@ if { [isdraw result] } {
       if {[array get env os_type] != ""} {
         set os $env(os_type)
       }
-      puts "TODO #23150 $os: Error : Number of faulties is $nb_f"
+      puts "TODO #23150 $os: Error : Number of faults is $nb_f"
     }
     if { $nb_r > $nb_a } {
-      puts "Error : Number of faulties is $nb_r"
+      puts "Error : Number of faults is $nb_r"
     }
   } else { 
     puts "Error : OPERATION FAILED"
@@ -66,7 +66,7 @@ if { [isdraw result] } {
   fit
   xwd $imagedir/${test_image}.png
 } else {
-  puts "Error : The sewing can not be build."
+  puts "Error : The sewing cannot be built."
 }
 
 puts "TEST COMPLETED"

diff --git a/tests/thrusection/end b/tests/thrusection/end
index e2dbc32..d2f607a 100755 (executable)
--- a/tests/thrusection/end
+++ b/tests/thrusection/end
@@ -16,7 +16,7 @@ if { [isdraw result] } {
       }
       #check of change of square is < 1%
       if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-        puts "Error : The $prop of result shape is $m"
+        puts "Error : The $prop of the resulting shape is $m"
       }
    } else {
       if { $m != 0 } {
@@ -37,7 +37,7 @@ if { [isdraw result] } {
       xwd $imagedir/${test_image}.png
    }
 } else {
-   puts "Error : The $command can not be build."
+   puts "Error : The $command cannot be built."
 }
 
 # to end a test script

diff --git a/tests/xcaf/end b/tests/xcaf/end
index a07a69e..78aebe9 100644 (file)
--- a/tests/xcaf/end
+++ b/tests/xcaf/end
@@ -99,13 +99,13 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     
     ### Verify whether the collors are in document
     if {[eval XFindColor D_First $color1] == "" || [eval XFindColor D_First $color1] == ""} {
-       puts "Error : Color was not added in document or was not found in it after adding"
+       puts "Error : Color was not added in the document or was not found after adding"
        set ErrorCode 2
     }
     
     ### Verify number of colors in document
     if { [llength [XGetAllColors D_First]] != "2" } {
-       puts "Error : XGetAllColors function returns invalid value"
+       puts "Error : XGetAllColors function returns an invalid value"
        set ErrorCode 2
     }
     
@@ -122,40 +122,40 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     eval XSetColor D_First c  $color4c c
     ### Verify number of colors in document
     if { [llength [XGetAllColors D_First]] != "8" } {
-       puts "Error : XGetAllColors function returns invalid value after assigning colors to shapes in document"
+       puts "Error : XGetAllColors function returns an invalid value after assigning colors to shapes in the document"
        set ErrorCode 2
     }
     ### Verify colors of all shapes
     if {[XGetShapeColor D_First [XFindShape D_First b1] s] != $color1name} {
-       puts "Error : Shape b1 has invalid color of surface "
+       puts "Error : Shape b1 has an invalid surface color "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First b2] s] != $color2name} {
-       puts "Error : Shape b2 has invalid color of surface "
+       puts "Error : Shape b2 has an invalid surface color "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First b3] s] != $color3name} {
-       puts "Error : Shape b3 has invalid color of surface "
+       puts "Error : Shape b3 has an invalid surface color "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First c ] s] != $color4name} {
-       puts "Error : Shape c has invalid color of surface "
+       puts "Error : Shape c has an invalid surface color "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First b1] c] != $color1cname} {
-       puts "Error : Shape b1 has invalid color of surface "
+       puts "Error : Shape b1 has an invalid surface color "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First b2] c] != $color2cname} {
-       puts "Error : Shape b2 has invalid color of surface "
+       puts "Error : Shape b2 has an invalid surface color "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First b3] c] != $color3cname} {
-       puts "Error : Shape b3 has invalid color of surface "
+       puts "Error : Shape b3 has an invalid surface color "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First c ] c] != $color4cname} {
-       puts "Error : Shape c has invalid color of surface "
+       puts "Error : Shape c has an invalid surface color
        set ErrorCode 2
     }
     ### Remove some colors from document
@@ -165,16 +165,16 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     XRemoveColor D_First [eval XFindColor D_First $color2c]
     ### Verify number of colors in document
     if { [llength [XGetAllColors D_First]] != "6" } {
-       puts "Error : XGetAllColors function returns invalid value after removing two colors from document"
+       puts "Error : XGetAllColors function returns an invalid value after removing two colors from the document"
        set ErrorCode 2
     }
     ### Verify whether b1 and b2 have the removed colors 
     if {[XGetShapeColor D_First [XFindShape D_First b1] s] != ""} {
-       puts "Error : Color of b1 surface was removed from document however XGetShapeColor function returns value "
+       puts "Error : Color of b1 surface was removed from the document however XGetShapeColor function returns value "
        set ErrorCode 2
     }
     if {[XGetShapeColor D_First [XFindShape D_First b2] c] != ""} {
-       puts "Error : Color of b2 curves was removed from document however XGetShapeColor function returns value "
+       puts "Error : Color of b2 curves was removed from the document however XGetShapeColor function returns value "
        set ErrorCode 2
     }
     ######################### LAYERS VERIFYING ##############################
@@ -193,7 +193,7 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     }
     ### Verify whether the layers was added in document correctly
     if { [XFindLayer D_First L1] == "" || [XFindLayer D_First L2] == "" || [XFindLayer D_First L3] == "" } {
-       puts "Error : Layers was not added in document correctly "
+       puts "Error : Layers were not added in the document correctly "
        set ErrorCode 2
     }
     ### Verify XGetOneLayer function
@@ -212,12 +212,12 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     ### Verify removing layer from document 
     XAddLayer D_First LtoRemove
     if { [llength [XGetAllLayers D_First]] != "4" } {
-       puts "Error : Error occurs during adding layer in document "
+       puts "Error : Error occurs when adding a layer in the document "
        set ErrorCode 2
     }
     XRemoveLayer D_First LtoRemove
     if { [llength [XGetAllLayers D_First]] != "3" } {
-       puts "Error : Error occurs during removing layer from document "
+       puts "Error : Error occurs when removing a layer from the document "
        set ErrorCode 2
     }
     ### Verify interconnection layers and shapes
@@ -276,13 +276,13 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     eval XAddColor D_First $color2
     ### Verify whether the collors are in document
     if {[eval XFindColor D_First $color1] == "" || [eval XFindColor D_First $color1] == ""} {
-       puts "Error : Color was not added in document or was not found in it after adding"
+       puts "Error : Color was not added in the document or was not found after adding"
        set ErrorCode 2
     }   
     
     ### Verify number of colors in document
     if { [llength [XGetAllColors D_First]] != "2" } {
-       puts "Error : XGetAllColors function returns invalid value"
+       puts "Error : XGetAllColors function returns an invalid value"
        set ErrorCode 2
     }
     set list [XGetTopLevelShapes D_First]
@@ -292,11 +292,11 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     }
     foreach {i} $list {
        if {[XGetShapeColor D_First $i s] != $color1name} {
-           puts [format "Error : Shape  located on label %s has invalid color of surface " $i]
+           puts [format "Error : Shape  located on label %s has an invalid surface color " $i]
            set ErrorCode 2
        }
        if {[XGetShapeColor D_First $i c] != $color1cname} {
-           puts [format "Error : Shape  located on label %s has invalid color of curves " $i]
+           puts [format "Error : Shape  located on label %s has an invalid curves color " $i]
            set ErrorCode 2
        }
     }
@@ -304,14 +304,14 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     XRemoveColor D_First [eval XFindColor D_First $color1c]
     ### Verify number of colors in document
     if { [llength [XGetAllColors D_First]] != "2" } {
-       puts "Error : XGetAllColors function returns invalid value after removing colors from document"
+       puts "Error : XGetAllColors function returns an invalid value after removing colors from the document"
        set ErrorCode 2
     }
     
     ### Verify shapes have the removed colors of curves
     foreach {i} $list {
        if {[XGetShapeColor D_First $i c] != ""} {
-           puts "Error : Color of curves was removed from document however XGetShapeColor function returns value "
+           puts "Error : Curves color was removed from the document however XGetShapeColor function returns value "
            set ErrorCode 2
        }
     }
@@ -322,7 +322,7 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     XAddLayer D_First L3
     ### Verify amount layers in document
     if { [llength [XGetAllLayers D_First]] != "3" } {
-       puts "Error : Error occurs during adding layers in document  "
+       puts "Error : Error occurs when adding layers in the document  "
        set ErrorCode 2
     }
     if { [llength [XGetLayerLabels D_First]] != "3" } {
@@ -330,9 +330,9 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
        set ErrorCode 2
     }
     
-    ### Verify whether the layers was added in document correctly
+    ### Verify whether the layers were added in the document correctly
     if { [XFindLayer D_First L1] == "" || [XFindLayer D_First L2] == "" || [XFindLayer D_First L3] == "" } {
-       puts "Error : Layers was not added in document correctly "
+       puts "Error : Layers were not added in the document correctly "
        set ErrorCode 2
     }
     
@@ -353,12 +353,12 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     ### Verify removing layer from document 
     XAddLayer D_First LtoRemove
     if { [llength [XGetAllLayers D_First]] != "4" } {
-       puts "Error : Error occurs during adding layer in document "
+       puts "Error : Error occurs when adding a layer in the document "
        set ErrorCode 2
     }
     XRemoveLayer D_First LtoRemove
     if { [llength [XGetAllLayers D_First]] != "3" } {
-       puts "Error : Error occurs during removing layer from document "
+       puts "Error : Error occurs when removing a layer from the document "
        set ErrorCode 2
     }
     ### Verify interconnection layers and shapes
@@ -387,7 +387,7 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } {
     set list [XGetTopLevelShapes D_First]
     foreach {i} $list {
        set str [XLabelInfo D_First $i]
-       if {[regexp "Assembly" $str] || [regexp "This Shape don't used" $str]} {
+       if {[regexp "Assembly" $str] || [regexp "This Shape is not used" $str]} {
            XUnSetLayer D_First $i L1
            XUnsetColor D_First $i c
            XUnsetColor D_First $i s
@@ -729,7 +729,7 @@ if {[regexp "FACES" $CompareDocumentsMode]} {
     puts "Faces First: [llength $faces_list_First]"
     puts "Faces Second: [llength $faces_list_Second]"
     if {[llength $faces_list_First] != [llength $faces_list_Second]} {
-       puts "Error : number of faces is wrong"
+       puts "Error : The number of faces is wrong"
        set ErrorCode 2
     }
 }
@@ -738,7 +738,7 @@ if {[regexp "VOLUME_EXACTLY" $CompareDocumentsMode] || [regexp "ALL" $CompareDoc
     puts "DocLabels First: $DocLabels_First"
     puts "DocLabels Second: $DocLabels_Second"
     if {[string compare $DocLabels_First $DocLabels_Second] != 0} {
-       puts "Error : DocLabels is wrong"
+       puts "Error : DocLabels are wrong"
        set ErrorCode 2
     }
     puts "DocVolume First: $DocVolume_First"
@@ -751,10 +751,10 @@ if {[regexp "VOLUME_EXACTLY" $CompareDocumentsMode] || [regexp "ALL" $CompareDoc
            set diff 0
        }
        if {[expr $diff > 5]} {
-           puts [format "Error : Volumes' difference is %f%s" $diff "%"]
+           puts [format "Error : The difference between volumes is %f%s" $diff "%"]
            set ErrorCode 2
        } else {
-           puts [format "Volumes' difference is %f%s - OK" $diff "%"] 
+           puts [format "The difference between volumes is %f%s - OK" $diff "%"] 
        }
     }
 } elseif {[regexp "VOLUME" $CompareDocumentsMode]} {
@@ -769,10 +769,10 @@ if {[regexp "VOLUME_EXACTLY" $CompareDocumentsMode] || [regexp "ALL" $CompareDoc
            set diff 0
        }
        if {[expr $diff > 5]} {
-           puts [format "Error : Volumes' difference is %f%s" $diff "%"]
+           puts [format "Error : The difference between volumes is %f%s" $diff "%"]
            set ErrorCode 2
        } else {
-           puts [format "Volumes' difference is %f%s - OK" $diff "%"] 
+           puts [format "The difference between volumes is %f%s - OK" $diff "%"] 
        }
     }
     puts "nbClosedShells First: $nbClosedShells_First"
@@ -787,14 +787,14 @@ if {[regexp "COLORS" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsMo
     puts "DocAllColors First: $DocAllColors_First"
     puts "DocAllColors Second: $DocAllColors_Second"
     if {[llength $DocAllColors_Second] == 0 && [llength $DocAllColors_First] != 0} {
-       puts "Warning : There are no colors in D_Second although in D_First they are present"
+       puts "Warning : There are no colors in D_Second although they are present in D_First"
        if {[expr $ErrorCode == 0]} { 
            set ErrorCode 1     
        }
     }
     if {[regexp "COLORS_EXACTLY" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsMode]} {
        if {[string compare $DocAllColors_First $DocAllColors_Second] != 0} {
-           puts "Error : Compared documents have different set of colors"
+           puts "Error : Compared documents have a different set of colors"
            set ErrorCode 2
        }
     }
@@ -803,9 +803,9 @@ if {[regexp "COLORS" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsMo
     if {[string compare $DocShapeLabels_First $DocShapeLabels_Second] != 0} {
        if {[regexp "ALL" $CompareDocumentsMode]} {
            set ErrorCode 2
-           puts "Error : Compared documents have different number of toplevel shape."
+           puts "Error : Compared documents have a different number of toplevel shapes "
        } else { 
-           puts "Warning : Compared documents have different number of toplevel shapes "
+           puts "Warning : Compared documents have a different number of toplevel shapes "
            if {[expr $ErrorCode == 0]} { 
                set ErrorCode 1
            }
@@ -820,9 +820,9 @@ if { [regexp "LAYERS" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsM
     if {[string compare $DocLayers_First $DocLayers_Second] != 0} {
        if {[regexp "LAYERS_EXACTLY" $CompareDocumentsMode]} {
            set ErrorCode 2
-           puts "Error : Compared documents have different set of LAYERS names"
+           puts "Error : Compared documents have a different set of LAYERS names"
        } else { 
-           puts "Warning : Compared documents have different set of LAYERS names"
+           puts "Warning : Compared documents have a different set of LAYERS names"
            if {[expr $ErrorCode == 0]} { 
                set ErrorCode 1 
            }
@@ -832,10 +832,10 @@ if { [regexp "LAYERS" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsM
     puts "DocLayerLabels Second: $DocLayerLabels_Second"
     if {[string compare $DocLayerLabels_First $DocLayerLabels_Second] != 0} {
        if {[regexp "LAYERS_EXACTLY" $CompareDocumentsMode]} {
-           puts [format "Error : Compared documents have different set of LAYERS labels"]
+           puts [format "Error : Compared documents have a different set of LAYERS labels"]
            set ErrorCode 2
        } else {
-           puts [format "Warning : Compared documents have different set of LAYERS labels"]
+           puts [format "Warning : Compared documents have a different set of LAYERS labels"]
            if {[expr $ErrorCode == 0]} { 
                set ErrorCode 1 
            }
@@ -889,7 +889,7 @@ if { [regexp "LAYERS" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsM
                puts [format " DocLayer_First(%s) = %s " $i $DocLayer_First]
                puts [format "DocLayer_Second(%s) = %s " $i $DocLayer_Second]
                puts [format "DocLayer_Second(%s) = %s " $NewLabel $DocLayer_Second]
-               puts [format "Error : Compared documents have different LAYERS for shape located on %s label" $i]
+               puts [format "Error : Compared documents have different LAYERS for the shape located on %s label" $i]
                set ErrorCode 2
            }
        }
@@ -931,7 +931,7 @@ if {[expr $ErrorCode == 2]} {
 } elseif {[expr $ErrorCode == 1]} { 
     puts "WARNING OCCURS DURING TEST"
 } elseif {[expr $ErrorCode != 0]} {
-    puts "Error : wrong value of ErrorCode."
+    puts "Error : a wrong value of ErrorCode."
 }
 
 puts "TEST COMPLETED"