From 4b445d1848514f31d27203c7d3ea1311a1f708dd Mon Sep 17 00:00:00 2001
From: azv <azv@opencascade.com>
Date: Tue, 24 May 2016 15:12:01 +0300
Subject: [PATCH] 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
---
 tests/bugs/mesh/bug23631        |  2 +-
 tests/bugs/modalg_2/bug264_0    |  2 +-
 tests/bugs/modalg_2/bug269_1    |  2 +-
 tests/bugs/modalg_2/bug269_3    |  2 +-
 tests/bugs/modalg_2/bug287      |  4 ++--
 tests/bugs/modalg_2/bug291      |  2 +-
 tests/bugs/modalg_2/bug292      |  2 +-
 tests/bugs/modalg_2/bug347_1    |  2 +-
 tests/bugs/modalg_2/bug347_2    |  2 +-
 tests/bugs/modalg_2/bug481      |  2 +-
 tests/bugs/modalg_6/bug27481    | 21 +++++++++++++++++++++
 tests/bugs/moddata_1/bug17      |  5 +----
 tests/bugs/moddata_1/bug20      |  1 +
 tests/bugs/moddata_2/bug256     |  2 +-
 tests/bugs/moddata_2/bug258_1   |  2 +-
 tests/bugs/moddata_2/bug258_2   |  2 +-
 tests/bugs/moddata_3/bug25737_1 |  2 +-
 tests/bugs/stlvrml/bug25740     |  2 +-
 tests/bugs/vis/bug19_1          |  2 +-
 tests/bugs/vis/bug19_2          |  2 +-
 tests/bugs/vis/bug364           |  2 +-
 tests/mesh/data/standard/L3     |  2 +-
 tests/mesh/data/standard/Q5     |  2 +-
 tests/mesh/data/standard/W1     |  2 +-
 tests/mesh/end                  |  2 +-
 25 files changed, 46 insertions(+), 27 deletions(-)
 create mode 100644 tests/bugs/modalg_6/bug27481

diff --git a/tests/bugs/mesh/bug23631 b/tests/bugs/mesh/bug23631
index 3ab080de42..edd2750129 100644
--- 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 f150faaeb9..8346596003 100755
--- 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 8b0ebed164..1f3d16b0e6 100755
--- 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 05272046d5..a4b7143631 100755
--- 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 a78f4f090a..143941e983 100755
--- 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 f8e32507a4..029a3b432a 100755
--- 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 0a0b88b92f..f4b2c78c00 100755
--- 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 33d7eac003..87ebc6a2cc 100755
--- 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 d21fc5bced..4f36eb80e3 100755
--- 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 c598c82813..c480474a08 100755
--- 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
index 0000000000..654e385f05
--- /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 2ae73486be..45d0f7244d 100755
--- 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 c8b9c4a5d4..1fe4f6da52 100755
--- 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 52b4ba932c..ca10ef1cae 100755
--- 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 9a6fee3ba5..95434f3092 100755
--- 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 957d4c114e..6513204132 100755
--- 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 1f1844fd38..e4d92b9b32 100755
--- 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 f5d5c9b72d..5be4b83834 100644
--- 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 c7206286f1..d4c3cfe1d4 100755
--- 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 063d0e99a7..853399ab86 100755
--- 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 5f9207d20c..58557ce2fa 100755
--- 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 cbb6f542e9..26d4f46e8a 100755
--- 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 98f04a1ae3..7b144ba636 100755
--- 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 0106b97089..ced7748a9d 100755
--- 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 3dcca9c191..746e47c5e9 100644
--- 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"
 	}
     }
 }