From: msv <msv@opencascade.com>
Date: Fri, 21 Dec 2018 12:41:55 +0000 (+0300)
Subject: #correction following remarks
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=a6e65fe79f4a042a079193eb74ee228edf7aa830;p=occt-copy.git

#correction following remarks
---

diff --git a/tests/bugs/modalg_7/bug30396_1 b/tests/bugs/modalg_7/bug30396_1
index 398a435044..6ddbd2416a 100644
--- a/tests/bugs/modalg_7/bug30396_1
+++ b/tests/bugs/modalg_7/bug30396_1
@@ -8,6 +8,14 @@ set list(1) {a_2 a_3 a_4 a_5 a_6 a_7}
 # With this order of tools the operation produced good result
 set list(2) {a_6 a_2 a_7 a_3 a_4 a_5}
 
+set nbw {33 23 29 0}
+set nbf {33 17 23 0}
+set nbsh {6 1 1 0}
+set nbso {6 1 1 0}
+set vol {3.24433 11.1953 7.95093 empty}
+set area {25.9962 58.8635 53.1541 empty}
+set nameop {common fuse cut cut21}
+
 bfuzzyvalue 1e-2
 bnondestructive 1
 
@@ -21,14 +29,19 @@ for {set i 1} { $i <= 2} {incr i} {
   baddobjects a_1
   eval baddtools $list($i)
   bfillds
-  bbop r_$i 2
 
-  checknbshapes r_$i -solid 1 -shell 1
-  checkshape r_$i
-  if {![regexp "OK" [bopcheck r_$i]]} {
-    puts "Error: result $i is self-interfered shape"
+  for {set iop 0} {$iop < 4} {incr iop} {
+    set oper [lindex $nameop $iop]
+    bbop r_${i}_$oper $iop
+    checknbshapes r_${i}_$oper -wire [lindex $nbw $iop] -face [lindex $nbf $iop]\
+      -solid [lindex $nbso $iop] -shell [lindex $nbsh $iop]
+    checkprops r_${i}_$oper -v [lindex $vol $iop] -s [lindex $area $iop]
+    checkshape r_${i}_$oper
+    if {![regexp "OK" [bopcheck r_${i}_$oper]]} {
+      puts "Error: result $i of $oper is self-interfered shape"
+    }
   }
 }
 
-checkprops r_1 -equal r_2
-checkview -display r_2 -2d -path ${imagedir}/${test_image}.png
+boptions -default
+checkview -display r_1_cut -2d -path ${imagedir}/${test_image}.png