Adjustment of tests for OCCT 6.9.1:

- de iges_1 L8,P7 - corrected according to changes made in #24682, with minor amendment of number of labels
- heal wire_tails_real A5 - corrected as in master
- offset wire_unclosed_outside_0_025 B4 - correcting according to actual state (looks better)
- de step_3 F1 - corrected according to actual state, see #26597
- de iges_1 N9 - reverted to state before integration of #25593 (zero-area face is created due to self-intersecting wire)

diff --git a/tests/de/iges_1/L8 b/tests/de/iges_1/L8
index 6bf191067a7784c3af04b5ab76c429a1bf296cab..90802a898ac6911b9cdff81d86ca04e2b3a9cfb4 100755 (executable)
--- a/tests/de/iges_1/L8
+++ b/tests/de/iges_1/L8
@@ -1,19 +1,19 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: TPSTAT : Faulty" 
+puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
-
 
 set LinuxDiff 3
 set filename PRO14319.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 64 )  Summary  = 2  ( 64 )
-CHECKSHAPE  : Wires    = 1  ( 7 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 61  ( 61 )   Summary  = 7360  ( 7320 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 61  ( 61 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3632  ( 3603 )
-TOLERANCE   : MaxTol   =   0.3749733839  (   0.3140268243 )  AvgTol   =  0.002809949164  (  0.0005120147149 )
-LABELS      : N0Labels = 61  ( 61 )  N1Labels = 0  ( 788 )  N2Labels = 0  ( 0 )   TotalLabels = 61  ( 849 )   NameLabels = 61  ( 61 )   ColorLabels = 61  ( 849 )   LayerLabels = 0  ( 0 )
+TPSTAT      : Faulties = 1  ( 0 )  Warnings = 3  ( 64 )  Summary  = 4  ( 64 )
+CHECKSHAPE  : Wires    = 3  ( 5 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 61  ( 61 )   Summary  = 7734  ( 7832 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 61  ( 61 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3844  ( 3896 )
+TOLERANCE   : MaxTol   =   0.3140268251  (   0.3140268243 )  AvgTol   =  0.0009762560334  (  0.000488212708 )
+LABELS      : N0Labels = 61  ( 61 )  N1Labels = 0  ( 1081 )  N2Labels = 0  ( 0 )   TotalLabels = 61  ( 1142 )   NameLabels = 61  ( 61 )   ColorLabels = 61  ( 1142 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
 COLORS      : Colors   = CYAN1 GREEN WHITE  ( CYAN1 GREEN WHITE )

diff --git a/tests/de/iges_1/N9 b/tests/de/iges_1/N9
index f5a6ad9109731534fcf14d490a7eccc0498d9950..d338560a11efbea532fed9a2d77e71a8422f5e7d 100644 (file)
--- a/tests/de/iges_1/N9
+++ b/tests/de/iges_1/N9
@@ -8,10 +8,10 @@ set ref_data {
 DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 183 )  Summary  = 3  ( 183 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 97  ( 97 )   Summary  = 2685  ( 2684 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 97  ( 97 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1243  ( 1243 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   Summary  = 2688  ( 2687 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1243  ( 1243 )
 TOLERANCE   : MaxTol   = 0.009955692634  ( 0.009955692464 )  AvgTol   =  0.0008509893784  (  0.0008531522552 )
-LABELS      : N0Labels = 97  ( 97 )  N1Labels = 0  ( 91 )  N2Labels = 0  ( 0 )   TotalLabels = 97  ( 188 )   NameLabels = 97  ( 97 )   ColorLabels = 97  ( 188 )   LayerLabels = 0  ( 0 )
+LABELS      : N0Labels = 97  ( 97 )  N1Labels = 2  ( 102 )  N2Labels = 0  ( 0 )   TotalLabels = 99  ( 199 )   NameLabels = 97  ( 97 )   ColorLabels = 98  ( 199 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
 COLORS      : Colors   = BLACK  ( BLACK )

diff --git a/tests/de/iges_1/P7 b/tests/de/iges_1/P7
index 14d700fef89de8b3c26821e0e73edfd69e3906d5..78f52e6301a45779cc8d08e0f3cafef66a101e1d 100644 (file)
--- a/tests/de/iges_1/P7
+++ b/tests/de/iges_1/P7
@@ -12,7 +12,7 @@ CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   So
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 770  ( 770 )   Summary  = 12751  ( 12759 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 770  ( 770 )   FreeWire = 36  ( 36 )   FreeEdge  = 232 ( 232 )   SharedEdge = 5541  ( 5545 )
 TOLERANCE   : MaxTol   =   0.9845041621  (   0.9845038147 )  AvgTol   =   0.00992720939  (  0.009919874447 )
-LABELS      : N0Labels = 880  ( 880 )  N1Labels = 0  ( 1770 )  N2Labels = 0  ( 0 )   TotalLabels = 880  ( 2650 )   NameLabels = 880  ( 1500 )   ColorLabels = 844  ( 2650 )   LayerLabels = 844  ( 2650 )
+LABELS      : N0Labels = 880  ( 880 )  N1Labels = 0  ( 1771 )  N2Labels = 0  ( 0 )   TotalLabels = 880  ( 2651 )   NameLabels = 880  ( 1500 )   ColorLabels = 844  ( 2651 )   LayerLabels = 844  ( 2651 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
 COLORS      : Colors   = BLACK  ( BLACK )

diff --git a/tests/de/step_3/F1 b/tests/de/step_3/F1
index e41f3d45e724738748c5b3b0bbb8e8cf68800a3d..7fe22dcee5f69df28ac4c086e9e3ab0bb04d6868 100644 (file)
--- a/tests/de/step_3/F1
+++ b/tests/de/step_3/F1
@@ -1,5 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
+puts "TODO CR26597 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -9,12 +9,12 @@ set filename tr9_r0601-ct.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 125  ( 22 )  Summary  = 125  ( 22 )
+TPSTAT      : Faulties = 1  ( 0 )  Warnings = 126  ( 21 )  Summary  = 127  ( 21 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 4252  ( 61 )  Face     = 4252  ( 4252 )   Summary  = 58212  ( 51172 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4252  ( 61 )  Face     = 4252  ( 4252 )   FreeWire = 0  ( 1 )   FreeEdge  = 2854 ( 2854 )   SharedEdge = 20022  ( 20024 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 4251  ( 61 )  Face     = 4251  ( 4252 )   Summary  = 58202  ( 51172 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4251  ( 61 )  Face     = 4251  ( 4252 )   FreeWire = 0  ( 1 )   FreeEdge  = 2854 ( 2854 )   SharedEdge = 20018  ( 20024 )
 TOLERANCE   : MaxTol   =   0.8498047902  (  0.01572488678 )  AvgTol   =  5.25293974e-005  (  2.100507096e-005 )
-LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7107  ( 7169 )  N2Labels = 0  ( 0 )   TotalLabels = 7110  ( 7172 )   NameLabels = 5  ( 5 )   ColorLabels = 7105  ( 7105 )   LayerLabels = 7105  ( 7167 )
+LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7106  ( 7169 )  N2Labels = 0  ( 0 )   TotalLabels = 7109  ( 7172 )   NameLabels = 5  ( 5 )   ColorLabels = 7104  ( 7105 )   LayerLabels = 7104  ( 7167 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
 COLORS      : Colors   = RED WHITE YELLOW  ( RED WHITE YELLOW )

diff --git a/tests/heal/wire_tails_real/A5 b/tests/heal/wire_tails_real/A5
index c0db940674a606a49e112a257c1ffa0886be90d1..065566af8a993f79ae1679bf507115705f12cde4 100644 (file)
--- a/tests/heal/wire_tails_real/A5
+++ b/tests/heal/wire_tails_real/A5
@@ -4,5 +4,5 @@ stepread [locate_data_file bug26261_ca07771-040x.stp] s *
 renamevar s_1 s
 fixshape  r  s  -maxtaila 1  -maxtailw 1e-3
 
-checknbshapes  r  -vertex 25951  -edge 42000  -wire 16519  -face 16205  -shell 51  -solid 1  -compsolid 0  -compound 2
-checklength r 127197.46264592493
+checknbshapes  r  -vertex 25950  -edge 41999  -wire 16519  -face 16205  -shell 51  -solid 1  -compsolid 0  -compound 2
+checklength r 127197.57657573155

diff --git a/tests/offset/wire_unclosed_outside_0_025/B4 b/tests/offset/wire_unclosed_outside_0_025/B4
index 49cfa136ae291903c886273fc916d531134e4a46..31b83ae1539047915763297d8a7b8e86e3499c76 100644 (file)
--- a/tests/offset/wire_unclosed_outside_0_025/B4
+++ b/tests/offset/wire_unclosed_outside_0_025/B4
@@ -2,8 +2,8 @@ puts "TODO OCC25109 ALL: Faulty shapes in variables"
 
 restore [locate_data_file case_3_wire2.brep] s
 
-set length 957.647
-set nbsh_v 86
-set nbsh_e 86
-set nbsh_w 2
+set length 967.791
+set nbsh_v 87
+set nbsh_e 87
+set nbsh_w 1