0026742: Update test cases for using checknbshapes procedure instead of global variables

Test cases were updated.

tests/boolean/bcut_simple/L9

@@ -25,6 +25,5 @@ add se Solid1
 shape result CS
 add b2 result
 add Solid1 result
-nbshapes result
 
 set square 750

tests/boolean/bcut_simple/M1

@@ -21,6 +21,5 @@ add se_1 Solid1
 shape result CS 
 add b2 result
 add Solid1 result
-nbshapes result
 
 set square 750

tests/bugs/caf/bug21707

@@ -75,6 +75,7 @@ set Sel11 [AttachShape D Pr_10 ${Prism} ${Prism} 0]
 
 GetShape D $Cut1:2 result
 
-set nb_v_good 10
+checknbshapes result -vertex 10
+
 set 2dviewer 0
 

tests/bugs/demo/bug23562_1

@@ -8,12 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V3.brep] result
 
-set nb_v_good 25
+checknbshapes result -vertex 25 -edge 45 -wire 15 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 103
-set nb_e_good 45
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 103

tests/bugs/demo/bug23562_2

@@ -8,12 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V4.brep] result
 
-set nb_v_good 24
+checknbshapes result -vertex 24 -edge 43 -wire 20 -face 20 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 110
-set nb_e_good 43
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 110

tests/bugs/demo/bug23562_3

@@ -8,13 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V3.brep] result
 
-set nbsh_t 1
+checknbshapes result -t -vertex 31 -edge 51 -wire 16 -face 16 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 117
-set nb_v_good 31
-set nb_e_good 51
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 117

tests/bugs/demo/bug23562_4

@@ -8,13 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V4.brep] result
 
-set nbsh_t 1
+checknbshapes result -t -vertex 30 -edge 49 -wire 21 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 124
-set nb_v_good 30
-set nb_e_good 49
-set nb_w_good 21
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 124

tests/bugs/demo/bug23562_5

@@ -10,12 +10,4 @@ restore [locate_data_file bug23562_V3.brep] a
 explode a f
 compound a_1 a_16 result
 
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 6 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 15
-set nb_e_good 6
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 15

tests/bugs/demo/bug23562_6

@@ -10,13 +10,4 @@ restore [locate_data_file bug23562_V3.brep] a
 explode a f
 compound a_1 a_16 result
 
-set nbsh_t 1
+checknbshapes result -t -vertex 12 -edge 12 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
-set nb_v_good 12
-set nb_e_good 12
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29

tests/bugs/end

@@ -42,104 +42,6 @@ if { [info exists mass] } {
     }
 }
 
-set glob_inf [info global nb_*_good]
-if { [regexp "nb_.*_good" $glob_inf] == 1 } {
-    if { [info exists nbsh_t] } {
-      set nb_info [nbshapes result -t]
-    } else {
-      set nb_info [nbshapes result]
-    }
-}
-
-if { [info exists nb_v_good] } {
-    regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v
-    if { ${nb_v} != ${nb_v_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_v_good} vertices instead of ${nb_v}"
-    } else {
-        puts "Result shape contains ${nb_v} vertices"
-    }
-}
-
-if { [info exists nb_e_good] } {
-    regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e
-    if { ${nb_e} != ${nb_e_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_e_good} edges instead of ${nb_e}"
-    } else {
-        puts "Result shape contains ${nb_e} edges"
-    }
-}
-
-if { [info exists nb_w_good] } {
-    regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w
-    if { ${nb_w} != ${nb_w_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_w_good} wires instead of ${nb_w}"
-    } else {
-        puts "Result shape contains ${nb_w} wires"
-    }
-}
-
-if { [info exists nb_f_good] } {
-    regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f
-    if { ${nb_f} != ${nb_f_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_f_good} faces instead of ${nb_f}"
-    } else {
-        puts "Result shape contains ${nb_f} faces"
-    }
-}
-
-if { [info exists nb_sh_good] } {
-    regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh
-    if { ${nb_sh} != ${nb_sh_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_sh_good} shells instead of ${nb_sh}"
-    } else {
-        puts "Result shape contains ${nb_sh} shells"
-    }
-}
-
-if { [info exists nb_sol_good] } {
-    regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol
-    if { ${nb_sol} != ${nb_sol_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_sol_good} solids instead of ${nb_sol}"
-    } else {
-        puts "Result shape contains ${nb_sol} solids"
-    }
-}
-
-if { [info exists nb_compsol_good] } {
-    regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol
-    if { ${nb_compsol} != ${nb_compsol_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_compsol_good} compsolids instead of ${nb_compsol}"
-    } else {
-        puts "Result shape contains ${nb_compsol} compsolids"
-    }
-}
-
-if { [info exists nb_compound_good] } {
-    regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound
-    if { ${nb_compound} != ${nb_compound_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_compound_good} compounds instead of ${nb_compound}"
-    } else {
-        puts "Result shape contains ${nb_compound} compounds"
-    }
-}
-
-if { [info exists nb_shape_good] } {
-    regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape
-    if { ${nb_shape} != ${nb_shape_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-    } else {
-        puts "Result shape contains ${nb_shape} shapes"
-    }
-}
-
-if { [info exists nb_fe_good] && [info exists nb_fe] } {
-    if { ${nb_fe} != ${nb_fe_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-    } else {
-        puts "Result shape contains ${nb_fe} free edges"
-    }
-}
-
 if { [info exists rel_tol] } {
    puts "\nChecking triangulation area (triarea command)..."
    set rel_err [expr abs([CheckTriArea result $area_eps])]

tests/bugs/fclasses/bug23192_1

@@ -24,16 +24,7 @@ catch {exec chmod 777 ${aFile}}
 if { [file exists ${aFile}] } {
   readstl result ${aFile}
 
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
-set nb_e_good 18
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
   # Check file size
   set size_status 0
   set filesize [ file size ${aFile} ]

tests/bugs/fclasses/bug23192_2

@@ -24,16 +24,7 @@ catch {exec chmod 777 ${aFile}}
 if { [file exists ${aFile}] } {
   readstl result ${aFile}
 
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
-set nb_e_good 18
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
   # Check file size
   set size_status 0
   set filesize [ file size ${aFile} ]

tests/bugs/fclasses/bug25367_brep

@@ -18,16 +18,7 @@ brestore ${NameFile} result
 
 set square 6
 
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 34
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 34
-
 file delete -force [glob -nocomplain ${NameFile}]
 
 set 2dviewer 1

tests/bugs/fclasses/bug25367_igs

@@ -22,16 +22,7 @@ igesbrep ${NameFile} result *
 
 set square 6
 
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 34
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 34
-
 file delete -force [glob -nocomplain ${NameFile}]
 
 set 2dviewer 1

tests/bugs/heal/bug24105_1

@@ -17,14 +17,5 @@ fixshape result s
 
 set square 313292
 
-set nb_v_good 12
+checknbshapes result -vertex 12 -edge 20 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 52
-set nb_e_good 20
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 52
-
 set 2dviewer 1

tests/bugs/heal/bug24105_2

@@ -17,14 +17,5 @@ fixshape result s
 
 set square 123446
 
-set nb_v_good 33
+checknbshapes result -vertex 33 -edge 52 -wire 23 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 132
-set nb_e_good 52
-set nb_w_good 23
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 132
-
 set 2dviewer 1

tests/bugs/heal/bug24111

@@ -14,14 +14,5 @@ fixshape result a
 
 set square 15902.8
 
-set nb_v_good 14
+checknbshapes result -vertex 14 -edge 15 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 31
-set nb_e_good 15
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 31
-
 set 2dviewer 1

tests/bugs/heal/bug25424

@@ -38,14 +38,5 @@ if { $z > ${max_time} } {
 
 set square 6998.53
 
-set nb_v_good 4482
+checknbshapes result -vertex 4482 -edge 6781 -wire 2309 -face 2305 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 15879
-set nb_e_good 6781
-set nb_w_good 2309
-set nb_f_good 2305
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 15879
-
 set 3dviewer 1

tests/bugs/heal/bug26572

@@ -8,8 +8,6 @@ puts ""
 
 restore [locate_data_file bug26572_issue_12_new_input.brep] s
 
-nbshapes s -t
-
 smallview
 donly s
 fit

tests/bugs/heal/bug26644

@@ -11,8 +11,6 @@ restore [locate_data_file bug26644_input.brep] a
 # 1
 checkarea a 158.466 1e-1 0.01
 
-nbshapes a -t
-
 vinit
 vsetdispmode 1
 vclear

tests/bugs/iges/bug17026_1

@@ -10,15 +10,6 @@ igesread [locate_data_file OCC17026-1.igs] a *
 tpcompound result
 
 set square 8.76948e+09
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 30
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 30
-
 set 2dviewer 0
 

tests/bugs/iges/bug17026_2

@@ -10,15 +10,6 @@ igesread [locate_data_file OCC17026-2.igs] a *
 tpcompound result
 
 set square 8.80533e+09
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 30
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 30
-
 set 2dviewer 0
 

tests/bugs/iges/bug17026_3

@@ -11,14 +11,5 @@ igesread [locate_data_file OCC17026-3.iges] a *
 tpcompound result
 
 set square 7.72668e+08
-set nb_v_good 175
+checknbshapes result -vertex 175 -edge 175 -wire 38 -face 38 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 428
-set nb_e_good 175
-set nb_w_good 38
-set nb_f_good 38
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 428
-
 set 2dviewer 0

tests/bugs/iges/bug17026_4

@@ -10,14 +10,5 @@ igesread [locate_data_file OCC17026-4.iges] a *
 tpcompound result
 
 set square 7.72668e+08
-set nb_v_good 175
+checknbshapes result -vertex 175 -edge 175 -wire 38 -face 38 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 428
-set nb_e_good 175
-set nb_w_good 38
-set nb_f_good 38
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 428
-
 set 2dviewer 0

tests/bugs/iges/bug23622_1

@@ -10,18 +10,7 @@ igesbrep [locate_data_file bug23622_seatmotor2.igs] s1 397
 
 renamevar s1_1 result
 
-nbshapes result
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 7
-
 set tol [tolerance result ]
 regexp { *Tolerance +MAX=([-0-9.+eE]+)} ${tol} full max_tol
 puts "max_tol=${max_tol}"

tests/bugs/iges/bug23622_2

@@ -12,18 +12,7 @@ igesbrep [locate_data_file bug23622_seatmotor2.igs] s1 397
 
 renamevar s1_1 result
 
-nbshapes result
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 7
-
 set tol [tolerance result ]
 regexp { *Tolerance +MAX=([-0-9.+eE]+)} ${tol} full max_tol
 puts "max_tol=${max_tol}"

tests/bugs/iges/bug5027_1

@@ -15,16 +15,7 @@ if [catch { igesread $filepath a * } res] {
     tpcompound result
     
     set square 159588
-    set nb_v_good 140
+    checknbshapes result -vertex 140 -edge 144 -wire 36 -face 31 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 352
-    set nb_e_good 144
-    set nb_w_good 36
-    set nb_f_good 31
-    set nb_sh_good 0
-    set nb_sol_good 0
-    set nb_compsol_good 0
-    set nb_compound_good 1
-    set nb_shape_good 352
-    
     set 2dviewer 0
 }
 

tests/bugs/iges/bug6508

@@ -11,6 +11,6 @@ tpcompound result
 
 checkshape result
 
-set nb_f_good 192
+checknbshapes result -face 192
 
 set 2dviewer 0

tests/bugs/mesh/bug23512_1

@@ -18,16 +18,7 @@ vdisplay result
 vaxo
 vfit
 
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 14 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 37
-set nb_e_good 14
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 37
-
 # relative tolerance (%)
 set rel_tol 1
 set area_eps 0

tests/bugs/mesh/bug23512_2

@@ -20,16 +20,7 @@ vdisplay result
 vaxo
 vfit
 
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 14 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 37
-set nb_e_good 14
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 37
-
 # relative tolerance (%)
 set rel_tol 1
 set area_eps 0

tests/bugs/mesh/bug25142

@@ -16,8 +16,6 @@ bfillds
 bbuild r
 explode r
 
-nbshapes r
-
 # do all possible checks of validity
 tolerance r
 checkshape r

tests/bugs/modalg_1/buc60787_1

@@ -13,15 +13,7 @@ checkshape S1
 
 bcommon result S1 S2
 
-set nb_info [nbshapes result]
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
-
-if { $err != 1 || $err1 != 1} {
-    puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-    puts "BUC60787 - OK"
-}
 
 set square 45000
 set 2dviewer 0

tests/bugs/modalg_1/buc60787_2

@@ -13,14 +13,7 @@ checkshape S2
 
 bcut result S1 S2
 
-set nb_info [nbshapes result]
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
 
-if { $err != 1 || $err1 != 1} {
-    puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-    puts "BUC60787 - OK"
-}
 set square 150200
 set 2dviewer 0

tests/bugs/modalg_1/buc60788_2

@@ -13,14 +13,7 @@ checkshape S2
 
 bcut result S1 S2
 
-set nb_info [nbshapes result]
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
 
-if { $err != 1 || $err1 != 1} {
-  puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-  puts "BUC60788 - OK"
-}
 set square 150200
 set 2dviewer 0

tests/bugs/modalg_1/buc60788_3

@@ -13,14 +13,7 @@ checkshape S1
 
 bcommon result S1 S2
 
-set nb_info [nbshapes result]
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
 
-if { $err != 1 || $err1 != 1} {
-    puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-    puts "BUC60788 - OK"
-}
 set square 45000
 set 2dviewer 0

tests/bugs/modalg_1/buc60865

@@ -15,14 +15,8 @@ plane pl 1.1 0.99999 1 0 1 0
 mkface f pl
 bsection result sh f
 
-set nb_info [nbshapes result]
+checknbshapes result -edge 5 -m "SECTION operation"
-regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full ed
 
-if {  $ed == 5 } {
-    puts  " BUC60865 : SECTION operation was made properly"
-} else {
-    puts "Faulty BUC60865: SECTION operation was made wrongly"
-}
 set length 4.5
 set 2dviewer 0
 

tests/bugs/modalg_1/buc60899_2

@@ -45,12 +45,6 @@ bsection result crg cyl
 set nb_info [nbshapes result]
 regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full edgeness
     
-    #set fullness [ nbshapes res ]
-    #puts "$fullness"
-    #set qq [ lindex $fullness 0 ]
-    #set edgeness [ lindex $fullness 10 ]
-    # puts "$edgeness"
-    
 if { $edgeness == 1  } {                                         
     puts "Shape is empty, it is Faulty result"                                                                               
 } else {                                                                                                                        

tests/bugs/modalg_1/bug10160_1

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10160"
@@ -46,14 +46,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 1.30062e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 20
+checknbshapes result -vertex 20 -edge 28 -wire 16 -face 15 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 86
-set nb_e_good 28
-set nb_w_good 16
-set nb_f_good 15
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 86
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_10

@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.20326e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 116
+checknbshapes result -vertex 116 -edge 173 -wire 67 -face 63 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 422
-set nb_e_good 173
-set nb_w_good 67
-set nb_f_good 63
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 422
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_11

@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.05154e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 96
+checknbshapes result -vertex 96 -edge 143 -wire 51 -face 48 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 341
-set nb_e_good 143
-set nb_w_good 51
-set nb_f_good 48
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 341
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_12

@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 6.38359e+06
 
 # Analysis of "nbshapes res"
-set nb_v_good 108
+checknbshapes result -vertex 108 -edge 161 -wire 61 -face 60 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 397
-set nb_e_good 161
-set nb_w_good 61
-set nb_f_good 60
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 397
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_2

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10160"
@@ -43,15 +43,6 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 4.75218e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 32
+checknbshapes result -vertex 32 -edge 60 -wire 32 -face 29 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 156
-set nb_e_good 60
-set nb_w_good 32
-set nb_f_good 29
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 156
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug10160_3

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "TODO OCC11111 ALL: Error : The square of result shape is"
 puts "============"
 puts "OCC10160"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 2.36194e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 24
+checknbshapes result -vertex 24 -edge 34 -wire 20 -face 19 -shell 4 -solid 4 -compsolid 0 -compound 1 -shape 106
-set nb_e_good 34
-set nb_w_good 20
-set nb_f_good 19
-set nb_sh_good 4
-set nb_sol_good 4
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 106
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_4

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.52471e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 24
+checknbshapes result -vertex 24 -edge 34 -wire 20 -face 17 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 102
-set nb_e_good 34
-set nb_w_good 20
-set nb_f_good 17
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 102
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_5

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 784833
 
 # Analysis of "nbshapes res"
-set nb_v_good 53
+checknbshapes result -vertex 53 -edge 75 -wire 38 -face 34 -shell 6 -solid 6 -compsolid 0 -compound 1 -shape 213
-set nb_e_good 75
-set nb_w_good 38
-set nb_f_good 34
-set nb_sh_good 6
-set nb_sol_good 6
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 213
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_6

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -42,16 +42,7 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.65961e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 121
+checknbshapes result -vertex 121 -edge 178 -wire 65 -face 59 -shell 3 -solid 2 -compsolid 0 -compound 1 -shape 429
-set nb_e_good 178
-set nb_w_good 65
-set nb_f_good 59
-set nb_sh_good 3
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 429
-
 set 2dviewer 0
 
 

tests/bugs/modalg_1/bug10160_7

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10160"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.05118e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 61
+checknbshapes result -vertex 61 -edge 87 -wire 44 -face 36 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 231
-set nb_e_good 87
-set nb_w_good 44
-set nb_f_good 36
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 231
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_8

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -42,14 +42,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 6.87093e+06
 
 # Analysis of "nbshapes res"
-set nb_v_good 113
+checknbshapes result -vertex 113 -edge 166 -wire 59 -face 57 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 398
-set nb_e_good 166
-set nb_w_good 59
-set nb_f_good 57
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 398
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10160_9

@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 4.86635e+06
 
 # Analysis of "nbshapes res"
-set nb_v_good 88
+checknbshapes result -vertex 88 -edge 131 -wire 45 -face 45 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 312
-set nb_e_good 131
-set nb_w_good 45
-set nb_f_good 45
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 312
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10232

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10232"
@@ -24,15 +24,6 @@ puts "Finish boolean operation ..."
 
 set length 3331.35
 
-set nb_v_good 1197
+checknbshapes result -vertex 1197 -edge 1182 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2380
-set nb_e_good 1182
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2380
-
 set 2dviewer 1
 

tests/bugs/modalg_1/bug10435_1

@@ -23,15 +23,7 @@ if { [catch {fillet result a ${radius} a_10 ${radius} a_15 ${radius} a_16 } catc
     set square 36455.2
 
     # Analysis of "nbshapes res"
-    set nb_v_good 12
+    checknbshapes result -vertex 12 -edge 19 -wire 11 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 55
-    set nb_e_good 19
-    set nb_w_good 11
-    set nb_f_good 10
-    set nb_sh_good 1
-    set nb_sol_good 1
-    set nb_compsol_good 0
-    set nb_compound_good 1
-    set nb_shape_good 55
 }
 
 set 2dviewer 0

tests/bugs/modalg_1/bug10435_2

@@ -20,15 +20,6 @@ puts "Finish fillet ..."
 set square 36455.2
 
 # Analysis of "nbshapes res"
-set nb_v_good 12
+checknbshapes result -vertex 12 -edge 19 -wire 11 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 55
-set nb_e_good 19
-set nb_w_good 11
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 55
-
 set 2dviewer 1
 

tests/bugs/modalg_1/bug10605_1

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 233.798
 
 # Analysis of "nbshapes res"
-set nb_v_good 10
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 42
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 42
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10605_2

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 838.752
 
 # Analysis of "nbshapes res"
-set nb_v_good 15
+checknbshapes result -vertex 15 -edge 22 -wire 10 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
-set nb_e_good 22
-set nb_w_good 10
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10605_3

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 779.887
 
 # Analysis of "nbshapes res"
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 19 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 50
-set nb_e_good 19
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 50
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10605_4

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 292.663
 
 # Analysis of "nbshapes res"
-set nb_v_good 12
+checknbshapes result -vertex 12 -edge 18 -wire 9 -face 9 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 53
-set nb_e_good 18
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 53
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10605_5

@@ -20,14 +20,5 @@ puts "Finish boolean operation ..."
 
 set length 59.8334
 # Analysis of "nbshapes res"
-set nb_v_good 9
+checknbshapes result -vertex 9 -edge 9 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 19
-set nb_e_good 9
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 19
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10606_1

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 66.672
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 8 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 21
-set nb_e_good 8
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 21
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10606_2

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 1450.22
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 25
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 25
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10606_3

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 761.355
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 8 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 23
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 23
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10606_4

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 755.54
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 8 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 23
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 23
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10606_5

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set length 18.3861
 
 # Analysis of "nbshapes res"
-set nb_v_good 4
+checknbshapes result -vertex 4 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10842_1

@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 2312.93
 
 # Analysis of "nbshapes res"
-set nb_v_good 7
+checknbshapes result -vertex 7 -edge 9 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 27
-set nb_e_good 9
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 27
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10842_2

@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 27919.7
 
 # Analysis of "nbshapes res"
-set nb_v_good 15
+checknbshapes result -vertex 15 -edge 21 -wire 7 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 52
-set nb_e_good 21
-set nb_w_good 7
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 52
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10842_3

@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 18757.7
 
 # Analysis of "nbshapes res"
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 18 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 46
-set nb_e_good 18
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 46
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10842_4

@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 11475
 
 # Analysis of "nbshapes res"
-set nb_v_good 9
+checknbshapes result -vertex 9 -edge 12 -wire 5 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 33
-set nb_e_good 12
-set nb_w_good 5
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 33
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10842_5

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set length 122.816
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
+checknbshapes result -vertex 6 -edge 6 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13
-set nb_e_good 6
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 13
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10846_1

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 183.567
 
 # Analysis of "nbshapes res"
-set nb_v_good 18
+checknbshapes result -vertex 18 -edge 31 -wire 19 -face 19 -shell 6 -solid 6 -compsolid 0 -compound 1 -shape 100
-set nb_e_good 31
-set nb_w_good 19
-set nb_f_good 19
-set nb_sh_good 6
-set nb_sol_good 6
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 100
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10846_2

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 2309.97
 
 # Analysis of "nbshapes res"
-set nb_v_good 25
+checknbshapes result -vertex 25 -edge 45 -wire 15 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 103
-set nb_e_good 45
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 103
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10846_3

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 510.907
 
 # Analysis of "nbshapes res"
-set nb_v_good 24
+checknbshapes result -vertex 24 -edge 43 -wire 20 -face 20 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 110
-set nb_e_good 43
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 110
-
 set 2dviewer 0

tests/bugs/modalg_1/bug10846_4

@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 1982.63
 
 # Analysis of "nbshapes res"
-set nb_v_good 19
+checknbshapes result -vertex 19 -edge 33 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 83
-set nb_e_good 33
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 83
-
 set 2dviewer 0

tests/bugs/modalg_1/bug11565_1

@@ -13,15 +13,6 @@ bop a_1 a_2
 bopcut result
 
 set square 28.6255
-set nb_v_good 12
+checknbshapes result -vertex 12 -edge 12 -wire 2 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 28
-set nb_e_good 12
-set nb_w_good 2
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug11565_2

@@ -13,15 +13,6 @@ bop a_1 a_3
 bopcut result
 
 set square 28.6438
-set nb_v_good 12
+checknbshapes result -vertex 12 -edge 12 -wire 2 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 28
-set nb_e_good 12
-set nb_w_good 2
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug12213

@@ -33,15 +33,6 @@ buildsweep result
 set square 15708.8
 
 # Analysis of "nbshapes res"
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 29
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 29
-
 set 2dviewer 1
 

tests/bugs/modalg_1/bug12257

@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 set square 3394.17
 
 # Analysis of "nbshapes res"
-set nb_v_good 72
+checknbshapes result -vertex 72 -edge 109 -wire 39 -face 39 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 262
-set nb_e_good 109
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 262
-
 set 2dviewer 1
 

tests/bugs/modalg_1/bug12507

@@ -17,14 +17,5 @@ ttranslate e3 0 6 0
 bop c_3 e3
 bopfuse result
 
-set nb_v_good 3
+checknbshapes result -vertex 3 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
 set 2dviewer 0

tests/bugs/modalg_1/bug12627

@@ -15,16 +15,7 @@ bop b1 b2
 bopfuse result
 
 set square 272295
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 20 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 54
-set nb_e_good 20
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 54
-
 set 2dviewer 0
 
 

tests/bugs/modalg_1/bug12918

@@ -15,15 +15,6 @@ bop b1 b2
 bopfuse result
 
 set square 0.00240038
-set nb_v_good 24
+checknbshapes result -vertex 24 -edge 36 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 91
-set nb_e_good 36
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 91
-
 set 2dviewer 1
 

tests/bugs/modalg_1/bug13116_1

@@ -15,15 +15,6 @@ bop b1 b2
 bopfuse result
 
 set square 438194
-set nb_v_good 21
+checknbshapes result -vertex 21 -edge 37 -wire 16 -face 16 -shell 2 -solid 1 -compsolid 0 -compound 1 -shape 94
-set nb_e_good 37
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 2
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 94
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13116_2

@@ -13,15 +13,6 @@ bop b1 b2
 bopcommon result
 
 set square 3769.91
-set nb_v_good 3
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 15
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 15
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13116_3

@@ -13,15 +13,6 @@ bop b1 b2
 bopcut result
 
 set square 438194
-set nb_v_good 21
+checknbshapes result -vertex 21 -edge 34 -wire 15 -face 15 -shell 2 -solid 1 -compsolid 0 -compound 1 -shape 89
-set nb_e_good 34
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 2
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 89
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13116_4

@@ -13,15 +13,6 @@ bop b1 b2
 boptuc result
 
 set square 3769.89
-set nb_v_good 3
+checknbshapes result -vertex 3 -edge 8 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 20
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 20
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13142

@@ -14,15 +14,6 @@ vfit
 vsetdispmode 1
 
 set square 513.007
-set nb_v_good 34
+checknbshapes result -vertex 34 -edge 66 -wire 47 -face 42 -shell 9 -solid 9 -compsolid 0 -compound 3 -shape 210
-set nb_e_good 66
-set nb_w_good 47
-set nb_f_good 42
-set nb_sh_good 9
-set nb_sol_good 9
-set nb_compsol_good 0
-set nb_compound_good 3
-set nb_shape_good 210
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13186_1

@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 bopcut result
 
 set square 42.5841
-set nb_v_good 19
+checknbshapes result -vertex 19 -edge 25 -wire 12 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13186_2

@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 bopfuse result
 
 set square 85.6816
-set nb_v_good 21
+checknbshapes result -vertex 21 -edge 28 -wire 13 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 73
-set nb_e_good 28
-set nb_w_good 13
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 73
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13186_3

@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 bopcommon result
 
 set square 14.9648
-set nb_v_good 8
+checknbshapes result -vertex 8 -edge 11 -wire 7 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 34
-set nb_e_good 11
-set nb_w_good 7
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 34
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13186_4

@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 boptuc result
 
 set square 58.0624
-set nb_v_good 10
+checknbshapes result -vertex 10 -edge 14 -wire 8 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 41
-set nb_e_good 14
-set nb_w_good 8
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 41
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13209_1

@@ -13,15 +13,6 @@ bop b1 b2
 bopfuse result
 
 set square 17308.3
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 25 -wire 13 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
-set nb_e_good 25
-set nb_w_good 13
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13209_2

@@ -13,16 +13,7 @@ bop b1 b2
 bopcommon result
 
 set square 2990.42
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 23 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
-set nb_e_good 23
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
 set 2dviewer 0
 
 

tests/bugs/modalg_1/bug13209_3

@@ -13,15 +13,6 @@ bop b1 b2
 bopcut result
 
 set square 17292.5
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 26 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 65
-set nb_e_good 26
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 65
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13209_4

@@ -13,15 +13,6 @@ bop b1 b2
 boptuc result
 
 set square 3006.19
-set nb_v_good 11
+checknbshapes result -vertex 11 -edge 18 -wire 11 -face 11 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 58
-set nb_e_good 18
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13211_1

@@ -13,14 +13,5 @@ bop b1 b2
 bopsection result
 
 set length 37.7057
-set nb_v_good 5
+checknbshapes result -vertex 5 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10
-
 set 2dviewer 0

tests/bugs/modalg_1/bug13211_10

@@ -13,15 +13,6 @@ bop s1 s2
 boptuc result
 
 set square 3006.19
-set nb_v_good 11
+checknbshapes result -vertex 11 -edge 18 -wire 11 -face 11 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 58
-set nb_e_good 18
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
 set 2dviewer 0
 

tests/bugs/modalg_1/bug13211_11

@@ -13,14 +13,5 @@ bop s1 s2
 bopsection result
 
 set length 228.699
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 15 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
-set nb_e_good 15
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29
-
 set 2dviewer 0

tests/bugs/modalg_1/bug13211_2

@@ -32,14 +32,5 @@ bop r1 r2
 bopfuse result
 
 set square 17308.3
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 25 -wire 13 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
-set nb_e_good 25
-set nb_w_good 13
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
 set 2dviewer 0

tests/bugs/modalg_1/bug13211_3

@@ -30,14 +30,5 @@ bop r1 r2
 bopcommon result
 
 set square 2990.42
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 23 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
-set nb_e_good 23
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
 set 2dviewer 0

tests/bugs/modalg_1/bug13211_4

@@ -30,14 +30,5 @@ bop r1 r2
 bopcut result
 
 set square 17292.5
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 26 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 65
-set nb_e_good 26
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 65
-
 set 2dviewer 0

tests/bugs/modalg_1/bug13211_5

@@ -30,14 +30,5 @@ bop r1 r2
 boptuc result
 
 set square 3006.19
-set nb_v_good 11
+checknbshapes result -vertex 11 -edge 18 -wire 11 -face 11 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 58
-set nb_e_good 18
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
 set 2dviewer 0

tests/bugs/modalg_1/bug13211_6

@@ -30,14 +30,7 @@ bop r1 r2
 bopsection result
 
 set length 228.699
-set nb_v_good_vertex 13
+
-set nb_e_good_edge 15
+checknbshapes result -vertex 13 -edge 15 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
-set nb_w_good_wire 0
-set nb_f_good_face 0
-set nb_sh_good_shell 0
-set nb_sol_good_solid 0
-set nb_compsol_good_compsolid 0
-set nb_compound_good_compound 1
-set nb_shape_good_shape 29
 
 set 2dviewer 0

tests/bugs/modalg_1/bug13211_7

@@ -14,14 +14,5 @@ bop s1 s2
 bopfuse result
 
 set square 17308.3
-set nb_v_good 13
+checknbshapes result -vertex 13 -edge 25 -wire 13 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
-set nb_e_good 25
-set nb_w_good 13
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
 set 2dviewer 0