0027481: [Regression to OCCT 6.6.0] Modeling Algorithms - incorrect CUT on two solids

* Test case has been added
* Adjust mesh characteristics in test cases according to changes in issue #27537

diff --git a/tests/bugs/mesh/bug23631 b/tests/bugs/mesh/bug23631
index 3ab080de4261ed06c115a86863c0e3339f2f4e0d..edd27501294d6330029e8da8a90e2c1fde66e63a 100644 (file)
--- a/tests/bugs/mesh/bug23631
+++ b/tests/bugs/mesh/bug23631
@@ -13,7 +13,7 @@ restore [locate_data_file OCC396_f2903.brep] result
 incmesh result 0.01
 triangles result 
 
-checktrinfo result -tri 38 -nod 40
+checktrinfo result -tri 39 -nod 41
 
 vinit
 vdisplay result

diff --git a/tests/bugs/modalg_2/bug264_0 b/tests/bugs/modalg_2/bug264_0
index f150faaeb9f14ce124e9ca82a0fcdb75208d7a43..8346596003b0ac18d7a71846b96d252082a1494b 100755 (executable)
--- a/tests/bugs/modalg_2/bug264_0
+++ b/tests/bugs/modalg_2/bug264_0
@@ -15,6 +15,6 @@ vclear
 isos result 0
 triangles result
 
-checktrinfo result -tri 6 -nod 8
+checktrinfo result -tri 8 -nod 10
 checkprops result -s 1.3135 
 checkview -display result -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_2/bug269_1 b/tests/bugs/modalg_2/bug269_1
index 8b0ebed16487b5dbfc6d3d25fca9d45014f792f5..1f3d16b0e6d96ac9662bae5b43a035475dfb84e6 100755 (executable)
--- a/tests/bugs/modalg_2/bug269_1
+++ b/tests/bugs/modalg_2/bug269_1
@@ -12,7 +12,7 @@ incmesh result 0.01
 #View the result of mesh
 triangles result
 
-checktrinfo result -tri 3657 -nod 1908
+checktrinfo result -tri 3758 -nod 1959
 checkprops result -s 32.9479 
 checkshape result
 checkview -display result -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_2/bug269_3 b/tests/bugs/modalg_2/bug269_3
index 05272046d50590089142dbdbf27ed7ab8cc819e2..a4b71436311d7d8de6972ea07c9a0de2fd52c541 100755 (executable)
--- a/tests/bugs/modalg_2/bug269_3
+++ b/tests/bugs/modalg_2/bug269_3
@@ -12,7 +12,7 @@ incmesh result 0.01
 #View the result of mesh
 triangles result
 
-checktrinfo result -tri 3737 -nod 1952
+checktrinfo result -tri 3972 -nod 2070
 checkprops result -s 36.4284 
 checkshape result
 checkview -display result -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_2/bug287 b/tests/bugs/modalg_2/bug287
index a78f4f090aca30e4fd26c4f206ee15dc94f685ea..143941e983418f71a6d7375876b6e77762afc6b2 100755 (executable)
--- a/tests/bugs/modalg_2/bug287
+++ b/tests/bugs/modalg_2/bug287
@@ -1,6 +1,6 @@
 puts "TODO OCC12345 ALL: Error : The area of result shape is"
-puts "TODO OCC12345 ALL: Error: Number of triangles"
-puts "TODO OCC12345 ALL: Error: Number of nodes"
+#puts "TODO OCC12345 ALL: Error: Number of triangles"
+#puts "TODO OCC12345 ALL: Error: Number of nodes"
 
 puts "========================"
 puts " OCC287 "

diff --git a/tests/bugs/modalg_2/bug291 b/tests/bugs/modalg_2/bug291
index f8e32507a4edc2a71971fda8d4d9a28b84f89222..029a3b432a350e0a356f745dd6cc49fa522613d4 100755 (executable)
--- a/tests/bugs/modalg_2/bug291
+++ b/tests/bugs/modalg_2/bug291
@@ -17,6 +17,6 @@ vfit
 isos result 0
 triangles result
 
-checktrinfo result -tri 1135 -nod 823
+checktrinfo result -tri 1145 -nod 831
 checkprops result -s 376.873 
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_2/bug292 b/tests/bugs/modalg_2/bug292
index 0a0b88b92f9771a46d7b9db36b83059a6d1ce978..f4b2c78c00ad641e3f221f800cb75f298a4033da 100755 (executable)
--- a/tests/bugs/modalg_2/bug292
+++ b/tests/bugs/modalg_2/bug292
@@ -19,6 +19,6 @@ vsetdispmode result 1
 isos result 0
 triangles result
 
-checktrinfo result -tri 6 -nod 8
+checktrinfo result -tri 8 -nod 10
 checkprops result -s 1.3135 
 checkview -display result -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_2/bug347_1 b/tests/bugs/modalg_2/bug347_1
index 33d7eac0038dae12edf779dc777f97b140d6e5dd..87ebc6a2cc70b7f1a632e518f8bdec207948712e 100755 (executable)
--- a/tests/bugs/modalg_2/bug347_1
+++ b/tests/bugs/modalg_2/bug347_1
@@ -14,6 +14,6 @@ vdisplay result
 vfit
 vsetdispmode result 1
 
-checktrinfo result -tri 72 -nod 74
+checktrinfo result -tri 74 -nod 76
 checkprops result -s 314.159 
 checkview -display result -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_2/bug347_2 b/tests/bugs/modalg_2/bug347_2
index d21fc5bced0fc9902ec3108f78dc5d4a9a019aec..4f36eb80e3c4aada2d1cca6db3bb98592cc9e79f 100755 (executable)
--- a/tests/bugs/modalg_2/bug347_2
+++ b/tests/bugs/modalg_2/bug347_2
@@ -14,7 +14,7 @@ vdisplay result
 vfit
 vsetdispmode result 1
 
-checktrinfo result -tri 71 -nod 73
+checktrinfo result -tri 74 -nod 76
 checkprops result -s 100.531 
 checkview -display result -2d -path ${imagedir}/${test_image}.png
 

diff --git a/tests/bugs/modalg_2/bug481 b/tests/bugs/modalg_2/bug481
index c598c82813bff02339b35a9bc96a913f43567e35..c480474a089b072da7dcf6cd54338fde1dab7074 100755 (executable)
--- a/tests/bugs/modalg_2/bug481
+++ b/tests/bugs/modalg_2/bug481
@@ -16,6 +16,6 @@ vdisplay result
 vfit
 vsetdispmode result 1
 
-checktrinfo result -tri 72 -nod 74
+checktrinfo result -tri 74 -nod 76
 checkprops result -s 314.159 
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_6/bug27481 b/tests/bugs/modalg_6/bug27481
new file mode 100644 (file)
index 0000000..654e385
--- /dev/null
+++ b/tests/bugs/modalg_6/bug27481
@@ -0,0 +1,21 @@
+puts "============"
+puts "OCC27481"
+puts "============"
+puts ""
+######################################################
+# Boolean CUT produces wrong result
+######################################################
+
+restore [locate_data_file bug27481_object.brep] obj
+restore [locate_data_file bug27481_tool.brep] tool
+
+bcut result obj tool
+
+checknbshapes result -solid 1
+
+checkshape result
+
+checkprops result -v 197909
+
+smallview; fit
+checkview -screenshot -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/moddata_1/bug17 b/tests/bugs/moddata_1/bug17
index 2ae73486be9a88e272554b6dbb8df8aa5a95faa4..45d0f7244de04790167ebf57d0a3101b4c84d79d 100755 (executable)
--- a/tests/bugs/moddata_1/bug17
+++ b/tests/bugs/moddata_1/bug17
@@ -1,6 +1,3 @@
-puts "TODO OCC12345 ALL: Error: Number of triangles"
-puts "TODO OCC12345 ALL: Error: Number of nodes"
-
 puts "================"
 puts "OCC17"
 puts "================"
@@ -22,5 +19,5 @@ vdisplay result
 vsetdispmode result 1
 vfit
 
-checktrinfo result -tri 100 -nod 94
+checktrinfo result -tri 96 -nod 94
 checkview -display result -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/moddata_1/bug20 b/tests/bugs/moddata_1/bug20
index c8b9c4a5d41b1bf89b3f9fbb49047de8049a20a7..1fe4f6da52dbcbc7effdbf1584b90ee317b57b46 100755 (executable)
--- a/tests/bugs/moddata_1/bug20
+++ b/tests/bugs/moddata_1/bug20
@@ -1,4 +1,5 @@
 puts "TODO OCC12345 ALL: Error: Number of triangles"
+puts "TODO OCC12345 ALL: Error: Number of nodes"
 
 puts "================"
 puts "OCC20"

diff --git a/tests/bugs/moddata_2/bug256 b/tests/bugs/moddata_2/bug256
index 52b4ba932c70a2964c4cfd8236130a98925b5731..ca10ef1cae5ff6a68e19c4a4f1a0e6b510a9ce7c 100755 (executable)
--- a/tests/bugs/moddata_2/bug256
+++ b/tests/bugs/moddata_2/bug256
@@ -12,5 +12,5 @@ vdisplay result
 vsetdispmode result 1
 vfit
 
-checktrinfo result -tri 66 -nod 66
+checktrinfo result -tri 72 -nod 72
 checkview -display result -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/moddata_2/bug258_1 b/tests/bugs/moddata_2/bug258_1
index 9a6fee3ba55b55c0ec2fad4ac50bf69ab3b6471e..95434f3092d2e3061fa19733d53427ed7447e26b 100755 (executable)
--- a/tests/bugs/moddata_2/bug258_1
+++ b/tests/bugs/moddata_2/bug258_1
@@ -15,5 +15,5 @@ vsetdispmode result 1
 vfit
 triangles result
 
-checktrinfo result -tri 100 -nod 102
+checktrinfo result -tri 78 -nod 80
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/moddata_2/bug258_2 b/tests/bugs/moddata_2/bug258_2
index 957d4c114e368f200827a3768f94e82e0671ff3e..65132041323ed0ee1fecaaf087b4b7586a6211d3 100755 (executable)
--- a/tests/bugs/moddata_2/bug258_2
+++ b/tests/bugs/moddata_2/bug258_2
@@ -15,5 +15,5 @@ vsetdispmode result 1
 vfit
 triangles result
 
-checktrinfo result -tri 70 -nod 72
+checktrinfo result -tri 78 -nod 80
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/moddata_3/bug25737_1 b/tests/bugs/moddata_3/bug25737_1
index 1f1844fd38ebc772fb9c8caff45270f352b9aa30..e4d92b9b322c2c08d68f40587bd28df5c526e952 100755 (executable)
--- a/tests/bugs/moddata_3/bug25737_1
+++ b/tests/bugs/moddata_3/bug25737_1
@@ -24,7 +24,7 @@ if {$report != ""} {
 
 # Checking triangulation area (triarea command)...
 set max_rel_tol_diff 1
-set rel_tol 0.29
+set rel_tol 0.4
 set area_eps 0
 
 smallview

diff --git a/tests/bugs/stlvrml/bug25740 b/tests/bugs/stlvrml/bug25740
index f5d5c9b72d990297cfb0821a7c3ef5ba2a534bbb..5be4b838349cfb8051002333afd037147f07985e 100644 (file)
--- a/tests/bugs/stlvrml/bug25740
+++ b/tests/bugs/stlvrml/bug25740
@@ -32,7 +32,7 @@ set fd0 [ open ${aFile} r ]
 set filecontent [ read ${fd0} ]
 close $fd0
 
-if { ![regexp {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,\n\s+16,17,18,19,20,21,22,23,24,25,26,27,28, -1} ${filecontent} full] } {
+if { ![regexp {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -1} ${filecontent} full] } {
   set status 0 
 }
 

diff --git a/tests/bugs/vis/bug19_1 b/tests/bugs/vis/bug19_1
index c7206286f1a6238eb353362d14be6b91126513fd..d4c3cfe1d4d23e063e2dcdd22b13eafb7e0d920e 100755 (executable)
--- a/tests/bugs/vis/bug19_1
+++ b/tests/bugs/vis/bug19_1
@@ -10,5 +10,5 @@ tclean result
 incmesh result .9
 triangles result
 
-checktrinfo result -tri 88 -nod 90
+checktrinfo result -tri 91 -nod 93
 checkview -display result -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug19_2 b/tests/bugs/vis/bug19_2
index 063d0e99a70a5b5dfdb93f4e032c3fa3a431595b..853399ab8646c00ed9ea5f076e892bdf75030d13 100755 (executable)
--- a/tests/bugs/vis/bug19_2
+++ b/tests/bugs/vis/bug19_2
@@ -13,5 +13,5 @@ vsetdispmode result 1
 isos result 0
 triangles result
 
-checktrinfo result -tri 129 -nod 131
+checktrinfo result -tri 50 -nod 52
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug364 b/tests/bugs/vis/bug364
index 5f9207d20c44786bd2e64e99b801001824a49ea4..58557ce2fad94dc9d4edefe4fab4b88f90b1c18d 100755 (executable)
--- a/tests/bugs/vis/bug364
+++ b/tests/bugs/vis/bug364
@@ -18,7 +18,7 @@ vsetdispmode result 1
 vfit
 triangles result
 
-checktrinfo result -tri 92 -nod 92
+checktrinfo result -tri 96 -nod 96
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png
 
 

diff --git a/tests/mesh/data/standard/L3 b/tests/mesh/data/standard/L3
index cbb6f542e982fb62d2f31a5827370e4e9371b8b1..26d4f46e8a388ef9f6f594a4dc6a200e3d848fc4 100755 (executable)
--- a/tests/mesh/data/standard/L3
+++ b/tests/mesh/data/standard/L3
@@ -1,5 +1,5 @@
 set TheFileName shading_102.brep
 if { [string compare $command "shading"] == 0 } {
    set bug_area "OCC22687"
-   set rel_tol 1.692
+   set rel_tol 1.52
 }

diff --git a/tests/mesh/data/standard/Q5 b/tests/mesh/data/standard/Q5
index 98f04a1ae3d59bd7fc9070c1df3dc5389668b343..7b144ba636b1e94ade11dac997544814a67288f0 100755 (executable)
--- a/tests/mesh/data/standard/Q5
+++ b/tests/mesh/data/standard/Q5
@@ -1,5 +1,5 @@
 set TheFileName shading_149.brep
 if { [string compare $command "shading"] != 0 } {
    set bug_area "OCC22687"
-   set rel_tol 1.2
+   set rel_tol 1.05
 }

diff --git a/tests/mesh/data/standard/W1 b/tests/mesh/data/standard/W1
index 0106b97089e12bd8a00acc35dfc18b2e5839abda..ced7748a9d1d2048b2bea2cd7284ef74f5d8f83b 100755 (executable)
--- a/tests/mesh/data/standard/W1
+++ b/tests/mesh/data/standard/W1
@@ -1,5 +1,5 @@
 set TheFileName shading_wrongshape_021.brep
 if { [string compare $command "shading"] != 0 } {
    set bug_area "OCC22687"
-   set rel_tol 1.2
+   set rel_tol 1.04
 }

diff --git a/tests/mesh/end b/tests/mesh/end
index 3dcca9c1910a4b3a29aac7ecf5f623094af0e287..746e47c5e9c55baf75a3dc1d2595abdcdb221545 100644 (file)
--- a/tests/mesh/end
+++ b/tests/mesh/end
@@ -69,7 +69,7 @@ if { [string compare $bug_freelinks ""] != 0 } {
 # It may be different for different OS
     foreach os_freelinks [array names nbfree] {
        if { $nbfree($os_freelinks) != 0 } { 
-           puts "TODO $bug_freelinks $os_freelinks:^\\s*Error: Free links: $nbfree($os_freelinks)\\b\\s*"
+           puts "TODO $bug_freelinks $os_freelinks:^\\s*Error: Free links"
        }
     }
 }