From 355c15514722e8eb800b58dcb8b65e478a127c77 Mon Sep 17 00:00:00 2001 From: apn Date: Fri, 28 Dec 2012 18:50:48 +0400 Subject: [PATCH] Adding testing cases from chl group Modified END file of all group bugs. Command nbshape moved to END file. Add begin with variable subgroup Small correction in END file Replaced test case bug726_3 from moddata to modalg --- tests/bugs/caf/begin | 2 + tests/bugs/caf/bug2932_1 | 6 +- tests/bugs/caf/bug2932_2 | 6 +- tests/bugs/demo/begin | 9 ++ tests/bugs/end | 134 +++++++++++++++++++++++- tests/bugs/fclasses/begin | 9 ++ tests/bugs/fclasses/bug23403 | 4 +- tests/bugs/fclasses/bug6794 | 5 +- tests/bugs/heal/begin | 3 + tests/bugs/iges/begin | 3 + tests/bugs/iges/bug448 | 5 +- tests/bugs/iges/bug5027_1 | 2 - tests/bugs/iges/end | 120 --------------------- tests/bugs/mesh/begin | 2 + tests/bugs/modalg/begin | 9 ++ tests/bugs/modalg/buc60703_1 | 5 +- tests/bugs/modalg/buc60782_2 | 5 +- tests/bugs/modalg/buc60787_1 | 2 - tests/bugs/modalg/buc60789_1 | 1 - tests/bugs/modalg/buc60865 | 1 - tests/bugs/modalg/buc60882 | 1 - tests/bugs/modalg/buc60898 | 14 +-- tests/bugs/modalg/buc60899_2 | 1 - tests/bugs/modalg/bug1665 | 1 - tests/bugs/modalg/bug21 | 1 - tests/bugs/modalg/bug23470 | 2 - tests/bugs/modalg/bug238_1 | 6 +- tests/bugs/modalg/bug238_2 | 6 +- tests/bugs/modalg/bug239_1 | 14 ++- tests/bugs/modalg/bug239_2 | 9 +- tests/bugs/modalg/bug240_1 | 13 ++- tests/bugs/modalg/bug240_2 | 13 ++- tests/bugs/modalg/bug241_1 | 13 ++- tests/bugs/modalg/bug241_2 | 15 ++- tests/bugs/modalg/bug242_1 | 15 ++- tests/bugs/modalg/bug242_2 | 15 ++- tests/bugs/modalg/bug243_1 | 15 ++- tests/bugs/modalg/bug243_2 | 13 ++- tests/bugs/modalg/bug244 | 3 +- tests/bugs/modalg/bug245_1 | 13 ++- tests/bugs/modalg/bug245_2 | 15 ++- tests/bugs/modalg/bug246 | 16 ++- tests/bugs/modalg/bug248_1 | 15 ++- tests/bugs/modalg/bug248_2 | 15 ++- tests/bugs/modalg/bug249_1 | 15 ++- tests/bugs/modalg/bug249_2 | 13 ++- tests/bugs/modalg/bug249_3 | 15 ++- tests/bugs/modalg/bug249_4 | 15 ++- tests/bugs/modalg/bug250_1 | 13 ++- tests/bugs/modalg/bug250_2 | 13 ++- tests/bugs/modalg/bug250_3 | 13 ++- tests/bugs/modalg/bug250_4 | 7 +- tests/bugs/modalg/bug398 | 13 --- tests/bugs/modalg/bug4717_1 | 1 - tests/bugs/modalg/bug4717_2 | 1 - tests/bugs/modalg/bug4717_3 | 1 - tests/bugs/modalg/bug4717_4 | 1 - tests/bugs/modalg/bug4717_5 | 1 - tests/bugs/modalg/bug4717_6 | 1 - tests/bugs/modalg/bug4717_7 | 1 - tests/bugs/modalg/bug4717_8 | 1 - tests/bugs/modalg/bug472_3 | 2 - tests/bugs/modalg/bug476_1 | 3 - tests/bugs/modalg/bug476_2 | 3 - tests/bugs/modalg/bug476_3 | 3 - tests/bugs/modalg/bug476_4 | 3 - tests/bugs/modalg/bug476_5 | 3 - tests/bugs/modalg/bug476_6 | 3 - tests/bugs/modalg/bug476_7 | 3 - tests/bugs/modalg/bug476_8 | 3 - tests/bugs/modalg/bug497_3 | 9 +- tests/bugs/modalg/bug4993_1 | 1 - tests/bugs/modalg/bug4993_2 | 1 - tests/bugs/modalg/bug526 | 1 - tests/bugs/modalg/bug535 | 1 - tests/bugs/modalg/bug539_1 | 12 +-- tests/bugs/modalg/bug539_2 | 11 +- tests/bugs/modalg/bug548 | 1 - tests/bugs/modalg/bug673 | 7 +- tests/bugs/{moddata => modalg}/bug726_3 | 3 - tests/bugs/modalg/bug745_12 | 7 +- tests/bugs/modalg/bug829_1 | 7 +- tests/bugs/modalg/bug910 | 1 - tests/bugs/modalg/end | 123 ---------------------- tests/bugs/moddata/begin | 9 ++ tests/bugs/moddata/buc60637 | 1 - tests/bugs/moddata/buc60652_1 | 1 - tests/bugs/moddata/buc60652_2 | 1 - tests/bugs/moddata/buc60652_3 | 1 - tests/bugs/moddata/buc60652_4 | 1 - tests/bugs/moddata/buc60755 | 1 - tests/bugs/moddata/buc60895 | 1 - tests/bugs/moddata/buc60911 | 1 - tests/bugs/moddata/buc60955 | 1 - tests/bugs/moddata/bug126 | 1 - tests/bugs/moddata/bug134_1 | 1 - tests/bugs/moddata/bug134_2 | 1 - tests/bugs/moddata/bug135 | 1 - tests/bugs/moddata/bug150_1 | 1 - tests/bugs/moddata/bug150_2 | 1 - tests/bugs/moddata/bug151_1 | 1 - tests/bugs/moddata/bug151_2 | 1 - tests/bugs/moddata/bug152_1 | 1 - tests/bugs/moddata/bug152_2 | 1 - tests/bugs/moddata/bug160_1 | 1 - tests/bugs/moddata/bug160_2 | 1 - tests/bugs/moddata/bug160_3 | 1 - tests/bugs/moddata/bug160_4 | 1 - tests/bugs/moddata/bug160_5 | 1 - tests/bugs/moddata/bug160_6 | 1 - tests/bugs/moddata/bug164_1 | 1 - tests/bugs/moddata/bug164_2 | 1 - tests/bugs/moddata/bug175 | 1 - tests/bugs/moddata/bug183_1 | 1 - tests/bugs/moddata/bug183_2 | 1 - tests/bugs/moddata/bug183_3 | 1 - tests/bugs/moddata/bug183_4 | 1 - tests/bugs/moddata/bug183_5 | 1 - tests/bugs/moddata/bug183_6 | 1 - tests/bugs/moddata/bug188 | 1 - tests/bugs/moddata/bug188_1 | 1 - tests/bugs/moddata/bug211_1 | 1 - tests/bugs/moddata/bug211_2 | 1 - tests/bugs/moddata/bug217 | 1 - tests/bugs/moddata/bug227_1 | 1 - tests/bugs/moddata/bug227_2 | 1 - tests/bugs/moddata/bug228 | 1 - tests/bugs/moddata/bug254 | 1 - tests/bugs/moddata/bug259 | 1 - tests/bugs/moddata/bug266 | 1 - tests/bugs/moddata/bug268 | 1 - tests/bugs/moddata/bug26_1 | 2 - tests/bugs/moddata/bug26_2 | 2 - tests/bugs/moddata/bug278_1 | 1 - tests/bugs/moddata/bug278_2 | 1 - tests/bugs/moddata/bug278_3 | 1 - tests/bugs/moddata/bug27_1 | 2 - tests/bugs/moddata/bug27_2 | 2 - tests/bugs/moddata/bug28_1 | 1 - tests/bugs/moddata/bug28_2 | 1 - tests/bugs/moddata/bug31 | 1 - tests/bugs/moddata/bug332 | 4 +- tests/bugs/moddata/bug354_1 | 1 - tests/bugs/moddata/bug354_2 | 1 - tests/bugs/moddata/bug374_1 | 1 - tests/bugs/moddata/bug374_2 | 1 - tests/bugs/moddata/bug376 | 1 - tests/bugs/moddata/bug37_1 | 1 - tests/bugs/moddata/bug37_2 | 1 - tests/bugs/moddata/bug380_1 | 1 - tests/bugs/moddata/bug380_2 | 1 - tests/bugs/moddata/bug3_1 | 1 - tests/bugs/moddata/bug3_2 | 1 - tests/bugs/moddata/bug4 | 2 +- tests/bugs/moddata/bug466 | 1 - tests/bugs/moddata/bug469 | 1 - tests/bugs/moddata/bug496 | 1 - tests/bugs/moddata/bug50 | 1 - tests/bugs/moddata/bug601 | 1 - tests/bugs/moddata/bug611_1 | 1 - tests/bugs/moddata/bug611_2 | 1 - tests/bugs/moddata/bug611_3 | 1 - tests/bugs/moddata/bug65 | 5 +- tests/bugs/moddata/bug766 | 4 +- tests/bugs/moddata/end | 120 --------------------- tests/bugs/moddata/pro19422_1 | 1 - tests/bugs/moddata/pro19422_2 | 1 - tests/bugs/step/begin | 3 + tests/bugs/step/bug3397 | 2 - tests/bugs/step/bug5027_2 | 2 - tests/bugs/step/end | 120 --------------------- tests/bugs/vis/begin | 4 + tests/bugs/vis/bug138_1 | 4 +- tests/bugs/vis/bug138_2 | 4 +- tests/bugs/vis/bug319 | 6 +- tests/bugs/vis/bug672_1 | 4 +- tests/bugs/vis/bug672_4 | 4 +- tests/bugs/xde/begin | 2 + tests/bugs/xde/bug4648 | 4 +- 179 files changed, 395 insertions(+), 902 deletions(-) create mode 100755 tests/bugs/demo/begin create mode 100755 tests/bugs/fclasses/begin delete mode 100755 tests/bugs/iges/end create mode 100755 tests/bugs/modalg/begin rename tests/bugs/{moddata => modalg}/bug726_3 (92%) delete mode 100755 tests/bugs/modalg/end create mode 100755 tests/bugs/moddata/begin delete mode 100755 tests/bugs/moddata/end delete mode 100755 tests/bugs/step/end diff --git a/tests/bugs/caf/begin b/tests/bugs/caf/begin index 04f004b1d5..ce171e2f78 100755 --- a/tests/bugs/caf/begin +++ b/tests/bugs/caf/begin @@ -1,5 +1,7 @@ pload DCAF +set subgroup caf + diff --git a/tests/bugs/caf/bug2932_1 b/tests/bugs/caf/bug2932_1 index a606183405..eeb7c535dc 100755 --- a/tests/bugs/caf/bug2932_1 +++ b/tests/bugs/caf/bug2932_1 @@ -53,12 +53,12 @@ NewCommand D set list [DumpCommand D] # Checking -set length [llength ${list}] +set ll [llength ${list}] set good_length 17 -puts "length = ${length}" +puts "length = ${ll}" puts "good_length = ${good_length}" -if { ${length} != ${good_length} } { +if { ${ll} != ${good_length} } { puts "OCC2932 Error (case 1)" } else { set name_attribute [lindex ${list} [expr ${good_length} - 1]] diff --git a/tests/bugs/caf/bug2932_2 b/tests/bugs/caf/bug2932_2 index 0e07b5283e..b11432140d 100755 --- a/tests/bugs/caf/bug2932_2 +++ b/tests/bugs/caf/bug2932_2 @@ -53,12 +53,12 @@ NewCommand D set list [DumpCommand D] # Checking -set length [llength ${list}] +set ll [llength ${list}] set good_length 17 -puts "length = ${length}" +puts "length = ${ll}" puts "good_length = ${good_length}" -if { ${length} != ${good_length} } { +if { ${ll} != ${good_length} } { puts "OCC2932 Error (case 1)" } else { set name_attribute [lindex ${list} [expr ${good_length} - 1]] diff --git a/tests/bugs/demo/begin b/tests/bugs/demo/begin new file mode 100755 index 0000000000..c8bfd1dd35 --- /dev/null +++ b/tests/bugs/demo/begin @@ -0,0 +1,9 @@ +set subgroup demo + + + + + + + + diff --git a/tests/bugs/end b/tests/bugs/end index 9178db6b3e..af27a99fa6 100755 --- a/tests/bugs/end +++ b/tests/bugs/end @@ -1,3 +1,132 @@ +if { [info exists square] } { + set prop "square" + set mass $square + if { [info exists tol_square] } { + regexp {Mass +: +([-0-9.+eE]+)} [sprops result $tol_square] full m + } else { + regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m + } +} +if { [info exists length] } { + set prop "length" + set mass $length + regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m + + puts "checksection" + puts [checksection result] +} + +#if mass (length or square) is empty in test case then result should be an empty shape. +if { [info exists mass] } { + if { [string compare $subgroup "moddata"] != 0 } { + puts "checkshape" + checkshape result + } + + if { [string compare "$mass" "empty"] != 0 } { + if { $m == 0 } { + puts "Error : The command is not valid. The $prop is 0." + } + if { $mass > 0 } { + puts "The expected $prop is $mass" + } + #check of change of square is < 1% + if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { + puts "Error : The $prop of result shape is $m" + } + } else { + if { $m != 0 } { + puts "Error : The command is not valid. The $prop is $m" + } + } +} + +set glob_inf [info global nb_*_good] +if { [regexp "nb_.*_good" $glob_inf] == 1 } { + 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} vertexes instead of ${nb_v}" + } else { + puts "Result shape contains ${nb_v} vertexes" + } +} + +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 { [isdraw result] } { if { [info exists 2dviewer] } { clear @@ -18,13 +147,12 @@ if { [isdraw result] } { } if { [info exist only_screen] } { - vdump $imagedir/${test_image}.png + vdump $imagedir/${test_image}.png } if { [info exist only_screen2d] } { - v2ddump $imagedir/${test_image}.png + v2ddump $imagedir/${test_image}.png } # to end a test script puts "TEST COMPLETED" - diff --git a/tests/bugs/fclasses/begin b/tests/bugs/fclasses/begin new file mode 100755 index 0000000000..5fee6fb13b --- /dev/null +++ b/tests/bugs/fclasses/begin @@ -0,0 +1,9 @@ +set subgroup fclasses + + + + + + + + diff --git a/tests/bugs/fclasses/bug23403 b/tests/bugs/fclasses/bug23403 index b3b65a6e68..ac4dbc2d76 100755 --- a/tests/bugs/fclasses/bug23403 +++ b/tests/bugs/fclasses/bug23403 @@ -4,9 +4,9 @@ pload QAcommands set result [CR23403 \t] -set length [llength ${result}] +set ll [llength ${result}] puts "" -if { ${length} != 0 } { +if { ${ll} != 0 } { puts "Error : parsing is incorrect" } \ No newline at end of file diff --git a/tests/bugs/fclasses/bug6794 b/tests/bugs/fclasses/bug6794 index 45379663d0..4aaf90f21c 100755 --- a/tests/bugs/fclasses/bug6794 +++ b/tests/bugs/fclasses/bug6794 @@ -18,9 +18,10 @@ if { ${OPT} != 0 } { } else { set result [OCC6794 ${nb}] regexp {Use nb += +([-0-9.+eE]+)} $result full use_nb - regexp {aLength += +([-0-9.+eE]+)} $result full length + regexp {aLength += +([-0-9.+eE]+)} $result full ll - if { ${use_nb} != ${nb} || ${length} != ${nb} } { + if { ${use_nb} != ${nb} || ${ll} != ${nb} } { puts "Faulty ${BugNumber}" } } + diff --git a/tests/bugs/heal/begin b/tests/bugs/heal/begin index a4b98f1bed..58d19fe5d3 100755 --- a/tests/bugs/heal/begin +++ b/tests/bugs/heal/begin @@ -1,3 +1,6 @@ pload XSDRAW +set subgroup heal + + diff --git a/tests/bugs/iges/begin b/tests/bugs/iges/begin index 437191e665..a2e8811738 100755 --- a/tests/bugs/iges/begin +++ b/tests/bugs/iges/begin @@ -1,6 +1,9 @@ pload XDE pload AISV +set subgroup iges + + diff --git a/tests/bugs/iges/bug448 b/tests/bugs/iges/bug448 index fcca327585..618d30fe48 100755 --- a/tests/bugs/iges/bug448 +++ b/tests/bugs/iges/bug448 @@ -12,8 +12,8 @@ if [catch { set list [igesbrep [locate_data_file Amino_172448-65210.igs] a * ] } puts "Faulty OCC448: here is reading problem" } else { tpcompound result - set length [llength $list] - set NbShapes [lindex $list [expr $length - 1]] + set ll [llength $list] + set NbShapes [lindex $list [expr $ll - 1]] # # ATANTION!!!!!!! FOR TESTING !!!!!!! @@ -28,3 +28,4 @@ if [catch { set list [igesbrep [locate_data_file Amino_172448-65210.igs] a * ] } set 2dviewer 0 + diff --git a/tests/bugs/iges/bug5027_1 b/tests/bugs/iges/bug5027_1 index e4f9629f7b..b42b845e2a 100755 --- a/tests/bugs/iges/bug5027_1 +++ b/tests/bugs/iges/bug5027_1 @@ -12,9 +12,7 @@ if [catch { igesread [locate_data_file OCC5027.igs] a * } res] { puts "Warning ${BugNumber} : here is reading problem" } else { tpcompound result - set nb_info [nbshapes result] - set check_square 1 set square 159588 set nb_v_good 140 set nb_e_good 144 diff --git a/tests/bugs/iges/end b/tests/bugs/iges/end deleted file mode 100755 index 48b054a897..0000000000 --- a/tests/bugs/iges/end +++ /dev/null @@ -1,120 +0,0 @@ -if { [info exist check_square] } { - if { [info exists square] } { - set prop "square" - set mass $square - regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m - } - - if { [info exists volume] } { - set prop "volume" - set mass $volume - regexp {Mass +: +([-0-9.+eE]+)} [vprops result] full m - } - - if { [info exists length] } { - set prop "length" - set mass $length - regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m - puts "checksection" - puts [checksection result] - } - - #if mass (length or square) is empty in test case then result should be an empty shape. - if { [string compare "$mass" "empty"] != 0 } { - if { $m == 0 } { - puts "Error : The command is not valid. The $prop is 0." - } - if { $mass > 0 } { - puts "The expected $prop is $mass" - } - #check of change of square is < 1% - if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { - puts "Error : The $prop of result shape is $m" - } - } else { - if { $m != 0 } { - puts "Error : The command is not valid. The $prop is $m" - } - } -} -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} vertexes instead of ${nb_v}" - } else { - puts "Result shape contains ${nb_v} vertexes" - } -} - -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" - } -} - diff --git a/tests/bugs/mesh/begin b/tests/bugs/mesh/begin index 5d6a7d4ad4..ba457e1b97 100755 --- a/tests/bugs/mesh/begin +++ b/tests/bugs/mesh/begin @@ -27,3 +27,5 @@ if { [array get Draw_Groups "TOPOLOGY Check commands"] == "" } { if { [array get Draw_Groups "ZeViewer"] == "" } { pload AISV } + +set subgroup mesh diff --git a/tests/bugs/modalg/begin b/tests/bugs/modalg/begin new file mode 100755 index 0000000000..34903372b5 --- /dev/null +++ b/tests/bugs/modalg/begin @@ -0,0 +1,9 @@ +set subgroup modalg + + + + + + + + diff --git a/tests/bugs/modalg/buc60703_1 b/tests/bugs/modalg/buc60703_1 index d213ff1b84..1226c03d9d 100755 --- a/tests/bugs/modalg/buc60703_1 +++ b/tests/bugs/modalg/buc60703_1 @@ -1,7 +1,6 @@ puts "TODO OCC12345 ALL: An exception was caught" puts "TODO OCC12345 ALL: Exception" puts "TODO OCC12345 ALL: Faulty BUC60703: here is problem with FUSE operation" -puts "TODO OCC12345 ALL: Error : The command can not be build." puts "========================" puts "BUC60703" @@ -32,7 +31,7 @@ if [catch {bfuse result a b } catch_result] { puts "BUC60703 OK" } # maxtolerance res + set square 0 + set 2dviewer 0 } -set square 0 -set 2dviewer 0 diff --git a/tests/bugs/modalg/buc60782_2 b/tests/bugs/modalg/buc60782_2 index d5526a846f..7d042a14b8 100755 --- a/tests/bugs/modalg/buc60782_2 +++ b/tests/bugs/modalg/buc60782_2 @@ -1,7 +1,6 @@ puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_2" puts "TODO OCC12345 ALL: Faulty : mistakes are found in SOURCE shape by checkshape command" puts "TODO OCC12345 ALL: Faulty BUC60782" -puts "TODO OCC12345 ALL: Error : The command can not be build." puts "========================" puts "BUC60782" @@ -32,6 +31,6 @@ if { [regexp {OK} $che ] != 1} { puts "OK BUC60782: offset is created" tpcompound result } + set square 0 + set 2dviewer 0 } -set square 0 -set 2dviewer 0 diff --git a/tests/bugs/modalg/buc60787_1 b/tests/bugs/modalg/buc60787_1 index 527904acba..2119030376 100755 --- a/tests/bugs/modalg/buc60787_1 +++ b/tests/bugs/modalg/buc60787_1 @@ -17,8 +17,6 @@ checkshape S1 bcommon result S1 S2 set nb_info [nbshapes result] - - regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1 diff --git a/tests/bugs/modalg/buc60789_1 b/tests/bugs/modalg/buc60789_1 index 6cd08871ed..b35e264144 100755 --- a/tests/bugs/modalg/buc60789_1 +++ b/tests/bugs/modalg/buc60789_1 @@ -13,7 +13,6 @@ checkshape S2 bcommon result S1 S2 - set nb_info [nbshapes result] regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full ve regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full ed diff --git a/tests/bugs/modalg/buc60865 b/tests/bugs/modalg/buc60865 index acdf0d8b43..0b3f61ac12 100755 --- a/tests/bugs/modalg/buc60865 +++ b/tests/bugs/modalg/buc60865 @@ -15,7 +15,6 @@ plane pl 1.1 0.99999 1 0 1 0 mkface f pl bsection result sh f - set nb_info [nbshapes result] regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full ed diff --git a/tests/bugs/modalg/buc60882 b/tests/bugs/modalg/buc60882 index 8d8183759a..0d57ec2e40 100755 --- a/tests/bugs/modalg/buc60882 +++ b/tests/bugs/modalg/buc60882 @@ -7,7 +7,6 @@ puts "" ####################################################################### pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } restore [locate_data_file BUC60882_samepar.brep] result diff --git a/tests/bugs/modalg/buc60898 b/tests/bugs/modalg/buc60898 index 460a3a1e38..1a252cc45b 100755 --- a/tests/bugs/modalg/buc60898 +++ b/tests/bugs/modalg/buc60898 @@ -1,5 +1,4 @@ puts "TODO OCC12345 ALL: Faulty BUC60898: here is reading problem" -puts "TODO OCC12345 ALL: Error : The command can not be build." puts "===========" puts " BUC60898" @@ -7,7 +6,6 @@ puts "===========" puts "" pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } if [catch { igesbrep [locate_data_file $filedir/buc60898.igs] a *} result] { ## rename to BUC60898.igs @@ -21,16 +19,8 @@ if [catch { igesbrep [locate_data_file $filedir/buc60898.igs] a *} result] { } else { puts " BUC60898 OK: function SEWING works without except" } + set square 0 + set 2dviewer 0 } -#checkshape res -#set che [checkshape res r] -#set err [lindex $che [expr [llength $che] - 1]] -#if { $err != "OK"} { -# puts "Faulty : mistakes are found in checked shape by checkshape command" -#} else { -# puts "Checking by checkshape - OK" -#} -set square 0 -set 2dviewer 0 diff --git a/tests/bugs/modalg/buc60899_2 b/tests/bugs/modalg/buc60899_2 index 4d79361333..09757b8361 100755 --- a/tests/bugs/modalg/buc60899_2 +++ b/tests/bugs/modalg/buc60899_2 @@ -45,7 +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 ] diff --git a/tests/bugs/modalg/bug1665 b/tests/bugs/modalg/bug1665 index f599daf38d..811021e144 100755 --- a/tests/bugs/modalg/bug1665 +++ b/tests/bugs/modalg/bug1665 @@ -13,7 +13,6 @@ if {[catch {setvperiodic a} message]} { if {[catch {mkface result a} message]} { puts "OCC1665 FAULTY : mkface" } else { - set nb_info [nbshapes result] set nb_e_good 3 } } diff --git a/tests/bugs/modalg/bug21 b/tests/bugs/modalg/bug21 index bbf1721382..f8ba733c7b 100755 --- a/tests/bugs/modalg/bug21 +++ b/tests/bugs/modalg/bug21 @@ -7,7 +7,6 @@ puts "" #==============================# pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } restore [locate_data_file OCC21.brep] sh checkshape sh diff --git a/tests/bugs/modalg/bug23470 b/tests/bugs/modalg/bug23470 index 2f3682b0c9..1b5405bf91 100755 --- a/tests/bugs/modalg/bug23470 +++ b/tests/bugs/modalg/bug23470 @@ -10,13 +10,11 @@ restore [locate_data_file bug23470_qe.brep] qe explode qe bop qe_1 qe_2 bopfuse result -set nb_info [nbshapes result] set nb_v_good 2 set nb_e_good 1 set nb_w_good 1 set nb_shape_good 5 - set length 48.4459 set command bopfuse diff --git a/tests/bugs/modalg/bug238_1 b/tests/bugs/modalg/bug238_1 index fd49fe852b..cdfd9d737c 100755 --- a/tests/bugs/modalg/bug238_1 +++ b/tests/bugs/modalg/bug238_1 @@ -13,10 +13,6 @@ puts [restore [locate_data_file case_2_edge1.brep] b] puts [bop a b] puts [bopcommon result b a] -set nb_info [nbshapes result] -set nb_v_good 14 -set nb_e_good 7 - explode result v explode a e distmini di result_1 a_3 @@ -27,5 +23,7 @@ if { [expr $dis > 1.e-5] } { puts " Result shape is COMPLITE" } +set nb_v_good 14 +set nb_e_good 7 set length 0 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug238_2 b/tests/bugs/modalg/bug238_2 index bb1f0622f8..e92fd4bb6f 100755 --- a/tests/bugs/modalg/bug238_2 +++ b/tests/bugs/modalg/bug238_2 @@ -13,10 +13,6 @@ puts [restore [locate_data_file case_2_edge1.brep] b] puts [bop a b] puts [boptuc result b a] -set nb_info [nbshapes result] -set nb_v_good 14 -set nb_e_good 7 - explode result v explode a e distmini di result_2 a_3 @@ -27,5 +23,7 @@ if { [expr $dis > 1.e-5] } { puts " Result shape is COMPLITE" } +set nb_v_good 14 +set nb_e_good 7 set length 0 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug239_1 b/tests/bugs/modalg/bug239_1 index 855f90f4d3..cca3f2e937 100755 --- a/tests/bugs/modalg/bug239_1 +++ b/tests/bugs/modalg/bug239_1 @@ -11,13 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC238a.brep] a restore [locate_data_file case_2_wire1.brep] b - puts [bop a b] - puts [bopcommon result] +puts [bop a b] +puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 18 - set nb_e_good 10 - - set length 0 - set 2dviewer 0 +set nb_v_good 18 +set nb_e_good 10 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug239_2 b/tests/bugs/modalg/bug239_2 index 8d71b62150..ddacd399c9 100755 --- a/tests/bugs/modalg/bug239_2 +++ b/tests/bugs/modalg/bug239_2 @@ -9,12 +9,11 @@ puts "========================" puts " " restore [locate_data_file OCC238a.brep] a restore [locate_data_file case_2_wire1.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 18 - set nb_e_good 11 +puts [bop a b] +puts [boptuc result] +set nb_v_good 18 +set nb_e_good 11 set length 2481.26 set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug240_1 b/tests/bugs/modalg/bug240_1 index 2f46893eb2..9761aa14e7 100755 --- a/tests/bugs/modalg/bug240_1 +++ b/tests/bugs/modalg/bug240_1 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC240a.brep] a restore [locate_data_file case_2_edge2.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 14 - set nb_e_good 6 +puts [bop a b] +puts [bopcommon result] - set length 0 - set 2dviewer 0 +set nb_v_good 14 +set nb_e_good 6 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug240_2 b/tests/bugs/modalg/bug240_2 index d6575a3d93..189f358a1e 100755 --- a/tests/bugs/modalg/bug240_2 +++ b/tests/bugs/modalg/bug240_2 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC240a.brep] a restore [locate_data_file case_2_edge2.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 14 - set nb_e_good 7 +puts [bop a b] +puts [boptuc result] - set length 0 - set 2dviewer 0 +set nb_v_good 14 +set nb_e_good 7 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug241_1 b/tests/bugs/modalg/bug241_1 index 5b01f27af8..c29342aa5b 100755 --- a/tests/bugs/modalg/bug241_1 +++ b/tests/bugs/modalg/bug241_1 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC240a.brep] a restore [locate_data_file case_2_edge3.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 6 - set nb_e_good 3 +puts [bop a b] +puts [bopcommon result] - set length 0 - set 2dviewer 0 +set nb_v_good 6 +set nb_e_good 3 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug241_2 b/tests/bugs/modalg/bug241_2 index c6c1f019a3..0aecc6e2e9 100755 --- a/tests/bugs/modalg/bug241_2 +++ b/tests/bugs/modalg/bug241_2 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC240a.brep] a restore [locate_data_file case_2_edge3.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 6 - set nb_e_good 3 - - set length 0 - set 2dviewer 0 +puts [bop a b] +puts [boptuc result] + +set nb_v_good 6 +set nb_e_good 3 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug242_1 b/tests/bugs/modalg/bug242_1 index b54049b791..1e6dab42f1 100755 --- a/tests/bugs/modalg/bug242_1 +++ b/tests/bugs/modalg/bug242_1 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC240a.brep] a restore [locate_data_file case_2_wire1.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 18 - set nb_e_good 9 - - set length 0 - set 2dviewer 0 +puts [bop a b] +puts [bopcommon result] + +set nb_v_good 18 +set nb_e_good 9 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug242_2 b/tests/bugs/modalg/bug242_2 index b6a9e6bf29..1304e72e5f 100755 --- a/tests/bugs/modalg/bug242_2 +++ b/tests/bugs/modalg/bug242_2 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC240a.brep] a restore [locate_data_file case_2_wire1.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 18 - set nb_e_good 13 - - set length 0 - set 2dviewer 0 +puts [bop a b] +puts [boptuc result] + +set nb_v_good 18 +set nb_e_good 13 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug243_1 b/tests/bugs/modalg/bug243_1 index 19a30ca660..6cca505a5a 100755 --- a/tests/bugs/modalg/bug243_1 +++ b/tests/bugs/modalg/bug243_1 @@ -9,12 +9,11 @@ puts "========================" puts " " restore [locate_data_file case_4_shell.brep] a restore [locate_data_file case_4_wire3.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 15 - set nb_e_good 10 - - set length 1150.78 - set 2dviewer 0 +puts [bop a b] +puts [bopcommon result] + +set nb_v_good 15 +set nb_e_good 10 +set length 1150.78 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug243_2 b/tests/bugs/modalg/bug243_2 index ed3f1fb67e..d7613a902a 100755 --- a/tests/bugs/modalg/bug243_2 +++ b/tests/bugs/modalg/bug243_2 @@ -9,12 +9,11 @@ puts "========================" puts " " restore [locate_data_file case_4_shell.brep] a restore [locate_data_file case_4_wire3.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 16 - set nb_e_good 11 +puts [bop a b] +puts [boptuc result] - set length 929.278 - set 2dviewer 1 +set nb_v_good 16 +set nb_e_good 11 +set length 929.278 +set 2dviewer 1 \ No newline at end of file diff --git a/tests/bugs/modalg/bug244 b/tests/bugs/modalg/bug244 index d7c0cea847..8b24b1e4a8 100755 --- a/tests/bugs/modalg/bug244 +++ b/tests/bugs/modalg/bug244 @@ -11,10 +11,9 @@ restore [locate_data_file case_5_solid.brep] a restore [locate_data_file case_4_wire3.brep] b puts [bop a b] puts [bopcommon result] - set nb_info [nbshapes result] + set nb_v_good 12 set nb_e_good 11 - set length 1808.02 set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug245_1 b/tests/bugs/modalg/bug245_1 index 0c8f0169c7..ad7f598092 100755 --- a/tests/bugs/modalg/bug245_1 +++ b/tests/bugs/modalg/bug245_1 @@ -9,12 +9,11 @@ puts "========================" puts " " restore [locate_data_file case_5_shell.brep] a restore [locate_data_file case_4_wire3.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 12 - set nb_e_good 11 +puts [bop a b] +puts [bopcommon result] - set length 1808.02 - set 2dviewer 0 +set nb_v_good 12 +set nb_e_good 11 +set length 1808.02 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug245_2 b/tests/bugs/modalg/bug245_2 index 10f19fe9c2..ceda3cdb65 100755 --- a/tests/bugs/modalg/bug245_2 +++ b/tests/bugs/modalg/bug245_2 @@ -9,12 +9,11 @@ puts "========================" puts " " restore [locate_data_file case_5_shell.brep] a restore [locate_data_file case_4_wire3.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 3 - set nb_e_good 2 - - set length 272.04 - set 2dviewer 0 +puts [bop a b] +puts [boptuc result] + +set nb_v_good 3 +set nb_e_good 2 +set length 272.04 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug246 b/tests/bugs/modalg/bug246 index c0791bb9f3..dd1ea1d268 100755 --- a/tests/bugs/modalg/bug246 +++ b/tests/bugs/modalg/bug246 @@ -11,12 +11,10 @@ puts "========================" puts " " restore [locate_data_file OCC246a.brep] a restore [locate_data_file case_1_wire1.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 5 - set nb_e_good 2 - - set length 0 - set 2dviewer 0 - \ No newline at end of file +puts [bop a b] +puts [bopcommon result] + +set nb_v_good 5 +set nb_e_good 2 +set length 0 +set 2dviewer 0 diff --git a/tests/bugs/modalg/bug248_1 b/tests/bugs/modalg/bug248_1 index 2d90b98bf4..19bd2cfb01 100755 --- a/tests/bugs/modalg/bug248_1 +++ b/tests/bugs/modalg/bug248_1 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC247a.brep] a restore [locate_data_file OCC248b.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 1 - set nb_e_good 0 - - set length 0 - set 2dviewer 0 +puts [bop a b] +puts [bopcommon result] + +set nb_v_good 1 +set nb_e_good 0 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug248_2 b/tests/bugs/modalg/bug248_2 index 43e3a166ec..86644ae15d 100755 --- a/tests/bugs/modalg/bug248_2 +++ b/tests/bugs/modalg/bug248_2 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file OCC247a.brep] a restore [locate_data_file OCC248b.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 8 - set nb_e_good 8 - - set length 0 - set 2dviewer 0 +puts [bop a b] +puts [boptuc result] + +set nb_v_good 8 +set nb_e_good 8 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug249_1 b/tests/bugs/modalg/bug249_1 index beefe7fe1d..718f83c9a7 100755 --- a/tests/bugs/modalg/bug249_1 +++ b/tests/bugs/modalg/bug249_1 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_edge3.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 2 - set nb_e_good 1 - - set length 0 - set 2dviewer 0 +puts [bop a b] +puts [bopcommon result] + +set nb_v_good 2 +set nb_e_good 1 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug249_2 b/tests/bugs/modalg/bug249_2 index 79a5ce889d..3831479d5b 100755 --- a/tests/bugs/modalg/bug249_2 +++ b/tests/bugs/modalg/bug249_2 @@ -11,13 +11,12 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_edge3.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 4 - set nb_e_good 2 +puts [bop a b] +puts [boptuc result] - set length 0 - set 2dviewer 0 +set nb_v_good 4 +set nb_e_good 2 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug249_3 b/tests/bugs/modalg/bug249_3 index 6ea2f7de7e..eb6acc1aa0 100755 --- a/tests/bugs/modalg/bug249_3 +++ b/tests/bugs/modalg/bug249_3 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_edge3.brep] b - puts [bop a b] - puts [bopcut result] - set nb_info [nbshapes result] - set nb_v_good 4 - set nb_e_good 2 - - set length 0 - set 2dviewer 0 +puts [bop a b] +puts [bopcut result] + +set nb_v_good 4 +set nb_e_good 2 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug249_4 b/tests/bugs/modalg/bug249_4 index f7fc2ea5aa..75e0d9cc29 100755 --- a/tests/bugs/modalg/bug249_4 +++ b/tests/bugs/modalg/bug249_4 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_edge3.brep] b - puts [bop a b] - puts [bopfuse result] - set nb_info [nbshapes result] - set nb_v_good 6 - set nb_e_good 5 - - set length 0 - set 2dviewer 2 +puts [bop a b] +puts [bopfuse result] + +set nb_v_good 6 +set nb_e_good 5 +set length 0 +set 2dviewer 2 \ No newline at end of file diff --git a/tests/bugs/modalg/bug250_1 b/tests/bugs/modalg/bug250_1 index a3dc6d4786..f45bec692e 100755 --- a/tests/bugs/modalg/bug250_1 +++ b/tests/bugs/modalg/bug250_1 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_wire2.brep] b - puts [bop a b] - puts [bopcommon result] - set nb_info [nbshapes result] - set nb_v_good 2 - set nb_e_good 1 +puts [bop a b] +puts [bopcommon result] - set length 0 - set 2dviewer 0 +set nb_v_good 2 +set nb_e_good 1 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug250_2 b/tests/bugs/modalg/bug250_2 index 68fd5d3d7c..4e98480501 100755 --- a/tests/bugs/modalg/bug250_2 +++ b/tests/bugs/modalg/bug250_2 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_wire2.brep] b - puts [bop a b] - puts [boptuc result] - set nb_info [nbshapes result] - set nb_v_good 7 - set nb_e_good 6 +puts [bop a b] +puts [boptuc result] - set length 0 - set 2dviewer 0 +set nb_v_good 7 +set nb_e_good 6 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug250_3 b/tests/bugs/modalg/bug250_3 index 686178468d..5d94ebaa81 100755 --- a/tests/bugs/modalg/bug250_3 +++ b/tests/bugs/modalg/bug250_3 @@ -11,12 +11,11 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_wire2.brep] b - puts [bop a b] - puts [bopcut result] - set nb_info [nbshapes result] - set nb_v_good 4 - set nb_e_good 2 +puts [bop a b] +puts [bopcut result] - set length 0 - set 2dviewer 0 +set nb_v_good 4 +set nb_e_good 2 +set length 0 +set 2dviewer 0 \ No newline at end of file diff --git a/tests/bugs/modalg/bug250_4 b/tests/bugs/modalg/bug250_4 index 8feeec140b..18a06125f4 100755 --- a/tests/bugs/modalg/bug250_4 +++ b/tests/bugs/modalg/bug250_4 @@ -11,11 +11,10 @@ puts "========================" puts " " restore [locate_data_file case_9_wire_a.brep] a restore [locate_data_file case_9_wire2.brep] b - puts [bop a b] - puts [bopfuse result] -set nb_info [nbshapes result] +puts [bop a b] +puts [bopfuse result] + set nb_v_good 9 set nb_e_good 9 - set length 0 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug398 b/tests/bugs/modalg/bug398 index 0378b709f7..829c95cb9e 100755 --- a/tests/bugs/modalg/bug398 +++ b/tests/bugs/modalg/bug398 @@ -8,7 +8,6 @@ puts "" ############################################################# pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } restore [locate_data_file OCC398.brep] a #statsh a @@ -20,18 +19,6 @@ scaleshape result a 10 #statsh res - -set nb_info [nbshapes result] set nb_sol_good 1 - -#if { $sol == 1 } { -# puts " OCC398 : scaleshape operation was made properly" -#} else { -# puts "Faulty OCC398: scaleshape operation was made wrongly" -#} - -#Statshape should give 3 solids -#Nbshape should return 1 solid (3 solids is returned if bug not fixed) - set square 180000. set 2dviewer 0 diff --git a/tests/bugs/modalg/bug4717_1 b/tests/bugs/modalg/bug4717_1 index 104835140c..77f6b34cc7 100755 --- a/tests/bugs/modalg/bug4717_1 +++ b/tests/bugs/modalg/bug4717_1 @@ -29,7 +29,6 @@ bop s b bopfuse result set square 680565 -set nb_info [nbshapes result] set nb_v_good 11 set nb_e_good 16 diff --git a/tests/bugs/modalg/bug4717_2 b/tests/bugs/modalg/bug4717_2 index e3235365d3..edf0106c58 100755 --- a/tests/bugs/modalg/bug4717_2 +++ b/tests/bugs/modalg/bug4717_2 @@ -29,7 +29,6 @@ bop b s bopfuse result set square 680565 -set nb_info [nbshapes result] set nb_v_good 11 set nb_e_good 16 diff --git a/tests/bugs/modalg/bug4717_3 b/tests/bugs/modalg/bug4717_3 index c1fa1266dc..185f5885b4 100755 --- a/tests/bugs/modalg/bug4717_3 +++ b/tests/bugs/modalg/bug4717_3 @@ -29,7 +29,6 @@ bop s b bopcut result set square 181937 -set nb_info [nbshapes result] set nb_v_good 3 set nb_e_good 4 diff --git a/tests/bugs/modalg/bug4717_4 b/tests/bugs/modalg/bug4717_4 index b1fe5c250b..c68768ed24 100755 --- a/tests/bugs/modalg/bug4717_4 +++ b/tests/bugs/modalg/bug4717_4 @@ -29,7 +29,6 @@ bop b s bopcut result set square 680565 -set nb_info [nbshapes result] set nb_v_good 11 set nb_e_good 16 diff --git a/tests/bugs/modalg/bug4717_5 b/tests/bugs/modalg/bug4717_5 index cac87466f1..8eae8fa6fc 100755 --- a/tests/bugs/modalg/bug4717_5 +++ b/tests/bugs/modalg/bug4717_5 @@ -29,7 +29,6 @@ bop s b boptuc result set square 680565 -set nb_info [nbshapes result] set nb_v_good 11 set nb_e_good 16 diff --git a/tests/bugs/modalg/bug4717_6 b/tests/bugs/modalg/bug4717_6 index 01bafd5096..dab4307691 100755 --- a/tests/bugs/modalg/bug4717_6 +++ b/tests/bugs/modalg/bug4717_6 @@ -29,7 +29,6 @@ bop b s boptuc result set square 181937 -set nb_info [nbshapes result] set nb_v_good 3 set nb_e_good 4 diff --git a/tests/bugs/modalg/bug4717_7 b/tests/bugs/modalg/bug4717_7 index 99d4b6abc9..804091e634 100755 --- a/tests/bugs/modalg/bug4717_7 +++ b/tests/bugs/modalg/bug4717_7 @@ -29,7 +29,6 @@ bop s b bopcommon result set square 181937 -set nb_info [nbshapes result] set nb_v_good 3 set nb_e_good 4 diff --git a/tests/bugs/modalg/bug4717_8 b/tests/bugs/modalg/bug4717_8 index 3f28f5798d..40fe4fa6c6 100755 --- a/tests/bugs/modalg/bug4717_8 +++ b/tests/bugs/modalg/bug4717_8 @@ -29,7 +29,6 @@ bop b s bopcommon result set square 181937 -set nb_info [nbshapes result] set nb_v_good 3 set nb_e_good 4 diff --git a/tests/bugs/modalg/bug472_3 b/tests/bugs/modalg/bug472_3 index 305485f0d0..903b34f5d5 100755 --- a/tests/bugs/modalg/bug472_3 +++ b/tests/bugs/modalg/bug472_3 @@ -19,10 +19,8 @@ checkshape b2 bfuse result b1 b2 -set nb_info [nbshapes result] set nb_v_good 5 set nb_e_edge 7 - set square 0 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug476_1 b/tests/bugs/modalg/bug476_1 index 07bf00d2da..e05d8c9dc0 100755 --- a/tests/bugs/modalg/bug476_1 +++ b/tests/bugs/modalg/bug476_1 @@ -15,10 +15,7 @@ checkshape s2 bop s1 s2 bopfuse result -set nb_info [nbshapes result] - set square 9333.96 - set nb_v_good 16 set nb_e_good 26 set nb_w_good 11 diff --git a/tests/bugs/modalg/bug476_2 b/tests/bugs/modalg/bug476_2 index e6f51b1047..892685e680 100755 --- a/tests/bugs/modalg/bug476_2 +++ b/tests/bugs/modalg/bug476_2 @@ -15,10 +15,7 @@ checkshape s2 bop s2 s1 bopfuse result -set nb_info [nbshapes result] - set square 9333.96 - set nb_v_good 16 set nb_e_good 26 set nb_w_good 11 diff --git a/tests/bugs/modalg/bug476_3 b/tests/bugs/modalg/bug476_3 index c0440ee2f0..ef5d6ff58b 100755 --- a/tests/bugs/modalg/bug476_3 +++ b/tests/bugs/modalg/bug476_3 @@ -15,10 +15,7 @@ checkshape s2 bop s1 s2 bopcut result -set nb_info [nbshapes result] - set square 99.5159 - set nb_v_good 12 set nb_e_good 19 set nb_w_good 9 diff --git a/tests/bugs/modalg/bug476_4 b/tests/bugs/modalg/bug476_4 index b540f0814f..55739ac89c 100755 --- a/tests/bugs/modalg/bug476_4 +++ b/tests/bugs/modalg/bug476_4 @@ -15,10 +15,7 @@ checkshape s2 bop s2 s1 bopcut result -set nb_info [nbshapes result] - set square 9340.03 - set nb_v_good 19 set nb_e_good 33 set nb_w_good 14 diff --git a/tests/bugs/modalg/bug476_5 b/tests/bugs/modalg/bug476_5 index 2df33eb920..b7a375c85a 100755 --- a/tests/bugs/modalg/bug476_5 +++ b/tests/bugs/modalg/bug476_5 @@ -15,10 +15,7 @@ checkshape s2 bop s1 s2 boptuc result -set nb_info [nbshapes result] - set square 9340.03 - set nb_v_good 19 set nb_e_good 33 set nb_w_good 14 diff --git a/tests/bugs/modalg/bug476_6 b/tests/bugs/modalg/bug476_6 index 02d7aa4479..a43243998f 100755 --- a/tests/bugs/modalg/bug476_6 +++ b/tests/bugs/modalg/bug476_6 @@ -15,10 +15,7 @@ checkshape s2 bop s2 s1 boptuc result -set nb_info [nbshapes result] - set square 99.5159 - set nb_v_good 12 set nb_e_good 19 set nb_w_good 9 diff --git a/tests/bugs/modalg/bug476_7 b/tests/bugs/modalg/bug476_7 index eee8c347b8..e8c9a7efb9 100755 --- a/tests/bugs/modalg/bug476_7 +++ b/tests/bugs/modalg/bug476_7 @@ -15,10 +15,7 @@ checkshape s2 bop s1 s2 bopcommon result -set nb_info [nbshapes result] - set square 105.587 - set nb_v_good 15 set nb_e_good 26 set nb_w_good 12 diff --git a/tests/bugs/modalg/bug476_8 b/tests/bugs/modalg/bug476_8 index 8c3559fd6b..f519b5abb6 100755 --- a/tests/bugs/modalg/bug476_8 +++ b/tests/bugs/modalg/bug476_8 @@ -15,10 +15,7 @@ checkshape s2 bop s2 s1 bopcommon result -set nb_info [nbshapes result] - set square 105.587 - set nb_v_good 15 set nb_e_good 26 set nb_w_good 12 diff --git a/tests/bugs/modalg/bug497_3 b/tests/bugs/modalg/bug497_3 index b497083646..b42ce3a8ce 100755 --- a/tests/bugs/modalg/bug497_3 +++ b/tests/bugs/modalg/bug497_3 @@ -1,4 +1,5 @@ -puts "TODO OCC12345 ALL: Error : The command can not be build." +puts "TODO OCC12345 ALL: result is not a topological shape!!!" +puts "TODO OCC12345 ALL: TEST INCOMPLETE" puts "=========" puts " OCC497 " @@ -17,11 +18,5 @@ checkshape a_2 bcut result a_1 a_2 -#if { [catch { bcut result a_1 a_2 } catch_result] } { -# puts "Faulty OCC497:function CUT works wrongly " -#} else { -# puts "OCC497 : function CUT works without hangs up " -#} - set square 0 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug4993_1 b/tests/bugs/modalg/bug4993_1 index 92b8f0ffc7..5641abff35 100755 --- a/tests/bugs/modalg/bug4993_1 +++ b/tests/bugs/modalg/bug4993_1 @@ -17,7 +17,6 @@ bop s1 s2 bopfuse result set square 4854.51 -set nb_info [nbshapes result] set nb_v_good 40 set nb_e_good 64 diff --git a/tests/bugs/modalg/bug4993_2 b/tests/bugs/modalg/bug4993_2 index 6b46745d5f..7c5ff166b5 100755 --- a/tests/bugs/modalg/bug4993_2 +++ b/tests/bugs/modalg/bug4993_2 @@ -17,7 +17,6 @@ bop s2 s1 bopfuse result set square 4854.51 -set nb_info [nbshapes result] set nb_v_good 40 set nb_e_good 64 diff --git a/tests/bugs/modalg/bug526 b/tests/bugs/modalg/bug526 index 1476e5febe..44ea80917a 100755 --- a/tests/bugs/modalg/bug526 +++ b/tests/bugs/modalg/bug526 @@ -8,7 +8,6 @@ puts "" ################################################ pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } restore [locate_data_file OCC592.brep] a diff --git a/tests/bugs/modalg/bug535 b/tests/bugs/modalg/bug535 index b110cd778e..54bc654f96 100755 --- a/tests/bugs/modalg/bug535 +++ b/tests/bugs/modalg/bug535 @@ -9,7 +9,6 @@ puts "" ############################################################# pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } restore [locate_data_file OCC535.brep] a diff --git a/tests/bugs/modalg/bug539_1 b/tests/bugs/modalg/bug539_1 index 17d2f24340..5c3493849c 100755 --- a/tests/bugs/modalg/bug539_1 +++ b/tests/bugs/modalg/bug539_1 @@ -9,13 +9,13 @@ puts "" puts " BOPCOMMON case_4_shell.brep and case_4_wire3.brep" puts "===========================================" puts " " - puts [restore [locate_data_file case_4_shell.brep] a] - puts [restore [locate_data_file case_4_wire3.brep] b] - puts [bop a b] - puts [bopcommon result] -set nb_info [nbshapes result] + +restore [locate_data_file case_4_shell.brep] a +restore [locate_data_file case_4_wire3.brep] b +bop a b +bopcommon result + set nb_v_good 15 set nb_e_good 10 - set length 1150.78 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug539_2 b/tests/bugs/modalg/bug539_2 index abdaf6a222..dc31058c43 100755 --- a/tests/bugs/modalg/bug539_2 +++ b/tests/bugs/modalg/bug539_2 @@ -9,15 +9,14 @@ puts "" puts " BOPTUC case_4_shell.brep and case_4_wire3.brep" puts "============================================" puts " " - puts [restore [locate_data_file case_4_shell.brep] a] - puts [restore [locate_data_file case_4_wire3.brep] b] - puts [bop a b] - puts [boptuc result] -set nb_info [nbshapes result] +restore [locate_data_file case_4_shell.brep] a +restore [locate_data_file case_4_wire3.brep] b +bop a b +boptuc result + set nb_v_good 16 set nb_e_good 11 - set length 929.278 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug548 b/tests/bugs/modalg/bug548 index 963ee8ff05..b301f73ed9 100755 --- a/tests/bugs/modalg/bug548 +++ b/tests/bugs/modalg/bug548 @@ -9,7 +9,6 @@ puts "" ################################################################## pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } restore [locate_data_file CTO908_topo103-t.brep] a diff --git a/tests/bugs/modalg/bug673 b/tests/bugs/modalg/bug673 index d5fd0580c6..8aa9494d1e 100755 --- a/tests/bugs/modalg/bug673 +++ b/tests/bugs/modalg/bug673 @@ -1,4 +1,3 @@ -puts "TODO OCC12345 ALL: Error : The command can not be build" puts "TODO OCC12345 ALL: Faulty OCC673: function SPLITSHAPE works wrongly" puts "================" @@ -19,7 +18,9 @@ if [catch {spliteshape result a a b} catch_result] { puts "Faulty OCC673: function SPLITSHAPE works wrongly" } else { puts "OCC673 OK : function SPLITSHAPE works OK" + set square 0 + set 2dviewer 0 } -set square 0 -set 2dviewer 0 + + diff --git a/tests/bugs/moddata/bug726_3 b/tests/bugs/modalg/bug726_3 similarity index 92% rename from tests/bugs/moddata/bug726_3 rename to tests/bugs/modalg/bug726_3 index 708f6d290b..58dbf30ab2 100755 --- a/tests/bugs/moddata/bug726_3 +++ b/tests/bugs/modalg/bug726_3 @@ -17,8 +17,5 @@ checkshape a_2 bcut result a_2 a_1 -checkshape result - -set check_square 1 set square 10 set 2dviewer 0 diff --git a/tests/bugs/modalg/bug745_12 b/tests/bugs/modalg/bug745_12 index c8d52b2d75..99e6796b5b 100755 --- a/tests/bugs/modalg/bug745_12 +++ b/tests/bugs/modalg/bug745_12 @@ -1,7 +1,6 @@ puts "TODO OCC12345 ALL: An exception was caught" puts "TODO OCC12345 ALL: Exception " puts "TODO OCC12345 ALL: Faulty OCC745" -puts "TODO OCC12345 ALL: Error : The command can not be build." puts "========" puts "OCC745" @@ -40,8 +39,6 @@ if { [catch { mkoffset result w 1 10 } status] } { } } } + set length 0 + set 2dviewer 0 } - -set length 0 -set 2dviewer 0 - diff --git a/tests/bugs/modalg/bug829_1 b/tests/bugs/modalg/bug829_1 index 606ae7f177..8c4cd8c9bb 100755 --- a/tests/bugs/modalg/bug829_1 +++ b/tests/bugs/modalg/bug829_1 @@ -1,6 +1,5 @@ puts "TODO OCC12345 ALL: An exception was caught" puts "TODO OCC12345 ALL: Exception" -puts "TODO OCC12345 ALL: Error : The command can not be build." puts "========" puts "OCC829" @@ -42,8 +41,6 @@ if { [catch { mkoffset result a_1 1 5 } status] } { } } } + set length 0 + set 2dviewer 0 } - -set length 0 -set 2dviewer 0 - diff --git a/tests/bugs/modalg/bug910 b/tests/bugs/modalg/bug910 index 09965c8acd..e2798a7697 100755 --- a/tests/bugs/modalg/bug910 +++ b/tests/bugs/modalg/bug910 @@ -8,7 +8,6 @@ puts "" ##################################################### pload XDE -catch { source $env(CSF_DrawPluginQADefaults)/QARebuildCommands } restore [locate_data_file OCC910.rle] a diff --git a/tests/bugs/modalg/end b/tests/bugs/modalg/end deleted file mode 100755 index 1e3fbf0023..0000000000 --- a/tests/bugs/modalg/end +++ /dev/null @@ -1,123 +0,0 @@ -if { [isdraw result] } { - #check if result is valid - - puts "checkshape" - set ch [checkshape result] - puts $ch - - if { [info exists square] } { - set prop "square" - set mass $square - regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m - } - if { [info exists length] } { - set prop "length" - set mass $length - regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m - - puts "checksection" - puts [checksection result] - } - - #if mass (length or square) is empty in test case then result should be an empty shape. - if { [string compare "$mass" "empty"] != 0 } { - if { $m == 0 } { - puts "Error : The command is not valid. The $prop is 0." - } - if { $mass > 0 } { - puts "The expected $prop is $mass" - } - #check of change of square is < 1% - if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { - puts "Error : The $prop of result shape is $m" - } - - 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} vertexes instead of ${nb_v}" - } else { - puts "Result shape contains ${nb_v} vertexes" - } - } - - 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" - } - } - - } else { - if { $m != 0 } { - puts "Error : The command is not valid. The $prop is $m" - } - } -} else { - puts "Error : The command can not be build." -} diff --git a/tests/bugs/moddata/begin b/tests/bugs/moddata/begin new file mode 100755 index 0000000000..572d363e8b --- /dev/null +++ b/tests/bugs/moddata/begin @@ -0,0 +1,9 @@ +set subgroup moddata + + + + + + + + diff --git a/tests/bugs/moddata/buc60637 b/tests/bugs/moddata/buc60637 index 0beaab699c..e7ac755bf1 100755 --- a/tests/bugs/moddata/buc60637 +++ b/tests/bugs/moddata/buc60637 @@ -6,6 +6,5 @@ puts "========================" restore [locate_data_file buc60637a.brep] result fsameparameter result -set check_square 1 set square 144.866 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60652_1 b/tests/bugs/moddata/buc60652_1 index 08b6e68006..20d10721b9 100755 --- a/tests/bugs/moddata/buc60652_1 +++ b/tests/bugs/moddata/buc60652_1 @@ -10,6 +10,5 @@ restore [locate_data_file buc60652a.brep] result checkshape result BUC60652 result -set check_square 1 set square 19614.8 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60652_2 b/tests/bugs/moddata/buc60652_2 index 677c238637..fb8e4e54de 100755 --- a/tests/bugs/moddata/buc60652_2 +++ b/tests/bugs/moddata/buc60652_2 @@ -10,7 +10,6 @@ restore [locate_data_file buc60652b.brep] result checkshape result BUC60652 result -set check_square 1 set square 29961 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60652_3 b/tests/bugs/moddata/buc60652_3 index 150675f9e0..bde1f9333c 100755 --- a/tests/bugs/moddata/buc60652_3 +++ b/tests/bugs/moddata/buc60652_3 @@ -10,6 +10,5 @@ restore [locate_data_file buc60652c.brep] result checkshape result BUC60652 result -set check_square 1 set square 77815.1 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60652_4 b/tests/bugs/moddata/buc60652_4 index e03cc7a61d..04d72aa5c7 100755 --- a/tests/bugs/moddata/buc60652_4 +++ b/tests/bugs/moddata/buc60652_4 @@ -10,6 +10,5 @@ restore [locate_data_file shading_104.brep] result checkshape result BUC60652 result -set check_square 1 set square 119134 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60755 b/tests/bugs/moddata/buc60755 index 283cebb9c6..46c988e6f3 100755 --- a/tests/bugs/moddata/buc60755 +++ b/tests/bugs/moddata/buc60755 @@ -14,7 +14,6 @@ checkshape a tcopy a result checkshape result -set check_square 1 set square 623.832 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60895 b/tests/bugs/moddata/buc60895 index 9eb62fcdcc..6d9355207b 100755 --- a/tests/bugs/moddata/buc60895 +++ b/tests/bugs/moddata/buc60895 @@ -12,7 +12,6 @@ restore [locate_data_file BUC60895.brep] result fsameparameter result checkshape result -set check_square 1 set length 12.6012 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60911 b/tests/bugs/moddata/buc60911 index 38a262fcc0..08e27800bc 100755 --- a/tests/bugs/moddata/buc60911 +++ b/tests/bugs/moddata/buc60911 @@ -10,6 +10,5 @@ puts "============" restore [locate_data_file BUC60911.brep] result invert result -set check_square 1 set square 16353.8 set 2dviewer 0 diff --git a/tests/bugs/moddata/buc60955 b/tests/bugs/moddata/buc60955 index 7910b14473..6fa8f790c1 100755 --- a/tests/bugs/moddata/buc60955 +++ b/tests/bugs/moddata/buc60955 @@ -9,7 +9,6 @@ checkshape result build3d result -set check_square 1 set square 8464.65 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug126 b/tests/bugs/moddata/bug126 index 5a66edc59d..e40a6dbc59 100755 --- a/tests/bugs/moddata/bug126 +++ b/tests/bugs/moddata/bug126 @@ -12,6 +12,5 @@ checkshape sh2 compound sh1 sh2 result -set check_square 1 set square 560.774 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug134_1 b/tests/bugs/moddata/bug134_1 index b9761c8b83..e7c19899b4 100755 --- a/tests/bugs/moddata/bug134_1 +++ b/tests/bugs/moddata/bug134_1 @@ -14,6 +14,5 @@ checkshape sh prism result sh 100 100 100 checkshape result -set check_square 1 set square 104057 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug134_2 b/tests/bugs/moddata/bug134_2 index 815f9445e3..5a1622f31b 100755 --- a/tests/bugs/moddata/bug134_2 +++ b/tests/bugs/moddata/bug134_2 @@ -14,7 +14,6 @@ checkshape sh prism result sh 100 100 100 checkshape result -set check_square 1 set square 271859 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug135 b/tests/bugs/moddata/bug135 index 671a68a57c..85247a971c 100755 --- a/tests/bugs/moddata/bug135 +++ b/tests/bugs/moddata/bug135 @@ -10,7 +10,6 @@ checkshape sh sewing result 1 sh checkshape result -set check_square 1 set square 273837 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug150_1 b/tests/bugs/moddata/bug150_1 index 53423ad422..9174f95521 100755 --- a/tests/bugs/moddata/bug150_1 +++ b/tests/bugs/moddata/bug150_1 @@ -31,6 +31,5 @@ checkshape sh_2 bfuse result sh_1 sh_2 checkshape result -set check_square 1 set square 700 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug150_2 b/tests/bugs/moddata/bug150_2 index b55d14a101..eac73fe079 100755 --- a/tests/bugs/moddata/bug150_2 +++ b/tests/bugs/moddata/bug150_2 @@ -30,6 +30,5 @@ checkshape sh_2 bfuse result sh_2 sh_1 checkshape result -set check_square 1 set square 700 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug151_1 b/tests/bugs/moddata/bug151_1 index ba5ba13cef..c13709c34f 100755 --- a/tests/bugs/moddata/bug151_1 +++ b/tests/bugs/moddata/bug151_1 @@ -14,7 +14,6 @@ checkshape sh2 bfuse result sh1 sh2 checkshape result -set check_square 1 set square 11400 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug151_2 b/tests/bugs/moddata/bug151_2 index f57f1edd18..12f3b5c2af 100755 --- a/tests/bugs/moddata/bug151_2 +++ b/tests/bugs/moddata/bug151_2 @@ -14,7 +14,6 @@ checkshape sh2 bfuse result sh2 sh1 checkshape result -set check_square 1 set square 11400 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug152_1 b/tests/bugs/moddata/bug152_1 index d068783ada..365abd7b91 100755 --- a/tests/bugs/moddata/bug152_1 +++ b/tests/bugs/moddata/bug152_1 @@ -22,7 +22,6 @@ checkshape sh_2 bcut result sh_1 sh_2 checkshape result -set check_square 1 set square 276424 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug152_2 b/tests/bugs/moddata/bug152_2 index e2af220b33..3bfef20c89 100755 --- a/tests/bugs/moddata/bug152_2 +++ b/tests/bugs/moddata/bug152_2 @@ -21,7 +21,6 @@ checkshape sh_2 bcut result sh_2 sh_1 checkshape result -set check_square 1 set square 34894.3 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug160_1 b/tests/bugs/moddata/bug160_1 index 9295085f1c..6a0c7b6909 100755 --- a/tests/bugs/moddata/bug160_1 +++ b/tests/bugs/moddata/bug160_1 @@ -18,7 +18,6 @@ if {$nf < 6} { puts "Error : the resulting shape is unclosed!!!" } -set check_square 1 set square 94067.7 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug160_2 b/tests/bugs/moddata/bug160_2 index a8a8f2992e..4aa1d8da3b 100755 --- a/tests/bugs/moddata/bug160_2 +++ b/tests/bugs/moddata/bug160_2 @@ -18,7 +18,6 @@ if {$nf < 6} { puts "Error : the resulting shape is unclosed!!!" } -set check_square 1 set square 94067.7 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug160_3 b/tests/bugs/moddata/bug160_3 index 7138331786..08ee7f42c5 100755 --- a/tests/bugs/moddata/bug160_3 +++ b/tests/bugs/moddata/bug160_3 @@ -19,7 +19,6 @@ if {$nf < 6} { puts "Error : the resulting shape is unclosed!!!" } -set check_square 1 set square 328116 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug160_4 b/tests/bugs/moddata/bug160_4 index 8f0f12eba2..1b9364dcf2 100755 --- a/tests/bugs/moddata/bug160_4 +++ b/tests/bugs/moddata/bug160_4 @@ -18,7 +18,6 @@ if {$nf < 6} { puts "Error : the resulting shape is unclosed!!!" } -set check_square 1 set square 328116 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug160_5 b/tests/bugs/moddata/bug160_5 index 6712ac4748..fd618a95c5 100755 --- a/tests/bugs/moddata/bug160_5 +++ b/tests/bugs/moddata/bug160_5 @@ -18,7 +18,6 @@ if {$nf < 6} { puts "Error : the resulting shape is unclosed!!!" } -set check_square 1 set square 48129.6 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug160_6 b/tests/bugs/moddata/bug160_6 index 1ee510f7e3..ff37689e68 100755 --- a/tests/bugs/moddata/bug160_6 +++ b/tests/bugs/moddata/bug160_6 @@ -19,7 +19,6 @@ if {$nf < 6} { puts "Error : the resulting shape is unclosed!!!" } -set check_square 1 set square 247636 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug164_1 b/tests/bugs/moddata/bug164_1 index 92f8e084c9..40162c2431 100755 --- a/tests/bugs/moddata/bug164_1 +++ b/tests/bugs/moddata/bug164_1 @@ -13,7 +13,6 @@ checkshape sh2 bfuse result sh1 sh2 checkshape result -set check_square 1 set square 344595 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug164_2 b/tests/bugs/moddata/bug164_2 index 621fbef9dc..f9fa341174 100755 --- a/tests/bugs/moddata/bug164_2 +++ b/tests/bugs/moddata/bug164_2 @@ -13,7 +13,6 @@ checkshape sh2 bfuse result sh2 sh1 checkshape result -set check_square 1 set square 344595 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug175 b/tests/bugs/moddata/bug175 index a7100b67a4..5297a495ea 100755 --- a/tests/bugs/moddata/bug175 +++ b/tests/bugs/moddata/bug175 @@ -19,6 +19,5 @@ if { $col1 != $col2} { puts "Error : Command mirror does NOT work properly. " } -set check_square 1 set square 13091.3 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug183_1 b/tests/bugs/moddata/bug183_1 index 0e4dccbee9..1adf74fd34 100755 --- a/tests/bugs/moddata/bug183_1 +++ b/tests/bugs/moddata/bug183_1 @@ -14,7 +14,6 @@ checkshape b2 bcommon result b1 b2 checkshape result -set check_square 1 set square 315.159 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug183_2 b/tests/bugs/moddata/bug183_2 index a4396aa7a8..babea15396 100755 --- a/tests/bugs/moddata/bug183_2 +++ b/tests/bugs/moddata/bug183_2 @@ -14,6 +14,5 @@ checkshape b2 bfuse result b1 b2 checkshape result -set check_square 1 set square 942.478 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug183_3 b/tests/bugs/moddata/bug183_3 index e8b782dc88..e2e4342e1d 100755 --- a/tests/bugs/moddata/bug183_3 +++ b/tests/bugs/moddata/bug183_3 @@ -14,7 +14,6 @@ checkshape b2 bcut result b1 b2 checkshape result -set check_square 1 set square 863.938 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug183_4 b/tests/bugs/moddata/bug183_4 index 62bf145ee0..985cf6bec2 100755 --- a/tests/bugs/moddata/bug183_4 +++ b/tests/bugs/moddata/bug183_4 @@ -14,7 +14,6 @@ checkshape b2 bcommon result b1 b2 checkshape result -set check_square 1 set square 392.699 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug183_5 b/tests/bugs/moddata/bug183_5 index 9e29053932..b170dada13 100755 --- a/tests/bugs/moddata/bug183_5 +++ b/tests/bugs/moddata/bug183_5 @@ -14,7 +14,6 @@ checkshape b2 bcommon result b1 b2 checkshape result -set check_square 1 set square 198.863 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug183_6 b/tests/bugs/moddata/bug183_6 index 12709f7543..674c216e21 100755 --- a/tests/bugs/moddata/bug183_6 +++ b/tests/bugs/moddata/bug183_6 @@ -15,7 +15,6 @@ bop a b bopfuse result a b checkshape -top result -set check_square 1 set square 0.0892544 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug188 b/tests/bugs/moddata/bug188 index 72f29ef6bc..6b840d4f0a 100755 --- a/tests/bugs/moddata/bug188 +++ b/tests/bugs/moddata/bug188 @@ -13,7 +13,6 @@ checkshape a_2 bcommon result a_1 a_2 checkshape result -set check_square 1 set square 3739.26 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug188_1 b/tests/bugs/moddata/bug188_1 index 65a1400263..a7ff6d6824 100755 --- a/tests/bugs/moddata/bug188_1 +++ b/tests/bugs/moddata/bug188_1 @@ -12,7 +12,6 @@ checkshape a_2 bcut result a_1 a_2 checkshape result -set check_square 1 set square 669659 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug211_1 b/tests/bugs/moddata/bug211_1 index 769bb1a30d..4223a4cd49 100755 --- a/tests/bugs/moddata/bug211_1 +++ b/tests/bugs/moddata/bug211_1 @@ -14,7 +14,6 @@ explode a e blend result a 10 a_24 checkshape result -set check_square 1 set square 1.34399e+06 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug211_2 b/tests/bugs/moddata/bug211_2 index c791e25aae..5857e5b5be 100755 --- a/tests/bugs/moddata/bug211_2 +++ b/tests/bugs/moddata/bug211_2 @@ -14,6 +14,5 @@ explode a e blend result a 10 a_4 checkshape result -set check_square 1 set square 1.34399e+06 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug217 b/tests/bugs/moddata/bug217 index 05c39abb9c..301eceda1c 100755 --- a/tests/bugs/moddata/bug217 +++ b/tests/bugs/moddata/bug217 @@ -13,6 +13,5 @@ psphere s 6 bfuse result s b checkshape result -set check_square 1 set square 618.85 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug227_1 b/tests/bugs/moddata/bug227_1 index 64cede8e71..fa5ae7e57a 100755 --- a/tests/bugs/moddata/bug227_1 +++ b/tests/bugs/moddata/bug227_1 @@ -21,6 +21,5 @@ checkshape b bfuse result a b checkshape result -set check_square 1 set square 1583.92 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug227_2 b/tests/bugs/moddata/bug227_2 index bf387cc30f..0f7bfb19b0 100755 --- a/tests/bugs/moddata/bug227_2 +++ b/tests/bugs/moddata/bug227_2 @@ -21,6 +21,5 @@ checkshape b bfuse result b a checkshape result -set check_square 1 set square 1583.92 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug228 b/tests/bugs/moddata/bug228 index 9bd1ce1e87..ea1a863db9 100755 --- a/tests/bugs/moddata/bug228 +++ b/tests/bugs/moddata/bug228 @@ -16,6 +16,5 @@ checkshape a_2 bcommon result a_1 a_2 -set check_square 1 set square 66231.3 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug254 b/tests/bugs/moddata/bug254 index cd399167f2..aab2e06d87 100755 --- a/tests/bugs/moddata/bug254 +++ b/tests/bugs/moddata/bug254 @@ -13,6 +13,5 @@ checkshape shape3 common result shape1 shape3 checkshape result -set check_square 1 set length 1231.07 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug259 b/tests/bugs/moddata/bug259 index a5d00c6009..dc0026ffa3 100755 --- a/tests/bugs/moddata/bug259 +++ b/tests/bugs/moddata/bug259 @@ -16,6 +16,5 @@ trotate b2 0 0 0 0 0 1 135 bfuse result b2 b1 checkshape -top result -set check_square 1 set square 18.8496 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug266 b/tests/bugs/moddata/bug266 index 652cc5873d..a45b818019 100755 --- a/tests/bugs/moddata/bug266 +++ b/tests/bugs/moddata/bug266 @@ -16,7 +16,6 @@ explode face f chamf result face edge_10 face_3 A 1 45 edge_6 face_3 A 1 45 edge_11 face_3 A 1 45 edge_12 face_3 A 1 45 edge_13 face_3 A 1 45 edge_14 face_3 A 1 45 edge_8 face_3 A 1 45 edge_9 face_3 A 1 45 checkshape result -set check_square 1 set square 48913 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug268 b/tests/bugs/moddata/bug268 index 3958a9b4d1..971a2d7fae 100755 --- a/tests/bugs/moddata/bug268 +++ b/tests/bugs/moddata/bug268 @@ -10,7 +10,6 @@ puts "" restore [locate_data_file OCC268.brep] result checkshape result -set check_square 1 set length 56.6039 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug26_1 b/tests/bugs/moddata/bug26_1 index 6da88a2198..cccaa0bc7e 100755 --- a/tests/bugs/moddata/bug26_1 +++ b/tests/bugs/moddata/bug26_1 @@ -11,9 +11,7 @@ checkshape a_2 bfuse result a_1 a_2 -set check_square 1 set square 44819.9 - set 2dviewer 0 diff --git a/tests/bugs/moddata/bug26_2 b/tests/bugs/moddata/bug26_2 index 8366ac0c29..2585427aa0 100755 --- a/tests/bugs/moddata/bug26_2 +++ b/tests/bugs/moddata/bug26_2 @@ -11,7 +11,5 @@ checkshape a_2 bfuse result a_2 a_1 -set check_square 1 set square 44819.8 - set 2dviewer 0 diff --git a/tests/bugs/moddata/bug278_1 b/tests/bugs/moddata/bug278_1 index 2fc28225a4..c384545153 100755 --- a/tests/bugs/moddata/bug278_1 +++ b/tests/bugs/moddata/bug278_1 @@ -16,6 +16,5 @@ restore [locate_data_file OCC278a.brep] a mkplane result a checkshape result -set check_square 1 set square 2914.99 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug278_2 b/tests/bugs/moddata/bug278_2 index 089dabd28c..51a833d31e 100755 --- a/tests/bugs/moddata/bug278_2 +++ b/tests/bugs/moddata/bug278_2 @@ -16,6 +16,5 @@ restore [locate_data_file OCC278b.brep] a mkplane result a checkshape result -set check_square 1 set square 22740 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug278_3 b/tests/bugs/moddata/bug278_3 index e6cd16f799..47e7df88e2 100755 --- a/tests/bugs/moddata/bug278_3 +++ b/tests/bugs/moddata/bug278_3 @@ -22,6 +22,5 @@ if { [regexp "Faulty" $che] != 1 } { puts "Error (case 3) : Checkshape command works wrongly" } -set check_square 1 set square 43.3075 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug27_1 b/tests/bugs/moddata/bug27_1 index 0d2e01ef37..2c079ccfbd 100755 --- a/tests/bugs/moddata/bug27_1 +++ b/tests/bugs/moddata/bug27_1 @@ -11,8 +11,6 @@ explode a e blend result a 1 a_5 1 a_6 1 a_7 1 a_8 checkshape result -set check_square 1 set square 155.846 - set 2dviewer 0 diff --git a/tests/bugs/moddata/bug27_2 b/tests/bugs/moddata/bug27_2 index 9bb04b90fa..8a81f2a226 100755 --- a/tests/bugs/moddata/bug27_2 +++ b/tests/bugs/moddata/bug27_2 @@ -12,8 +12,6 @@ explode a f chamf result a a_5 a_1 A 1 45 a_6 a_1 A 1 45 a_7 a_1 A 1 45 a_8 a_1 A 1 45 checkshape result -set check_square 1 set square 154.145 - set 2dviewer 0 diff --git a/tests/bugs/moddata/bug28_1 b/tests/bugs/moddata/bug28_1 index 86bcf08627..5ca2973635 100755 --- a/tests/bugs/moddata/bug28_1 +++ b/tests/bugs/moddata/bug28_1 @@ -15,7 +15,6 @@ checkshape a_2 bfuse result a_1 a_2 checkshape result -set check_square 1 set square 483935 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug28_2 b/tests/bugs/moddata/bug28_2 index 487ce241d1..0d8eec1bb8 100755 --- a/tests/bugs/moddata/bug28_2 +++ b/tests/bugs/moddata/bug28_2 @@ -15,7 +15,6 @@ checkshape a_2 bfuse result a_2 a_1 checkshape result -set check_square 1 set square 483935 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug31 b/tests/bugs/moddata/bug31 index 14a9782c2d..a0b940df16 100755 --- a/tests/bugs/moddata/bug31 +++ b/tests/bugs/moddata/bug31 @@ -29,6 +29,5 @@ explode res2_4 e chamf result res2 res2_4_1 res2_4 7 7 checkshape result -set check_square 1 set square 107634 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug332 b/tests/bugs/moddata/bug332 index ec9a18d637..f6e31f60fd 100755 --- a/tests/bugs/moddata/bug332 +++ b/tests/bugs/moddata/bug332 @@ -8,10 +8,10 @@ pload QAcommands set wall_thickness 10 set dia1 30 set dia2 50 -set length 100 +set ll 100 set major_radius 200 -OCC332 ${wall_thickness} ${dia1} ${dia2} ${length} ${major_radius} +OCC332 ${wall_thickness} ${dia1} ${dia2} ${ll} ${major_radius} checkshape wallSolid_ checkshape gasSolid_ diff --git a/tests/bugs/moddata/bug354_1 b/tests/bugs/moddata/bug354_1 index 009d4ef180..34b9cbbe01 100755 --- a/tests/bugs/moddata/bug354_1 +++ b/tests/bugs/moddata/bug354_1 @@ -15,6 +15,5 @@ explode a e blend result a 2 a_18 checkshape result -set check_square 1 set square 593.527 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug354_2 b/tests/bugs/moddata/bug354_2 index bc7536c1b4..100a457d91 100755 --- a/tests/bugs/moddata/bug354_2 +++ b/tests/bugs/moddata/bug354_2 @@ -18,6 +18,5 @@ donl a a_5_6 chamf result a a_5_6 a_5 A 2 45 checkshape result -set check_square 1 set square 589.268 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug374_1 b/tests/bugs/moddata/bug374_1 index f12b62d5f3..e19b57ea85 100755 --- a/tests/bugs/moddata/bug374_1 +++ b/tests/bugs/moddata/bug374_1 @@ -13,6 +13,5 @@ offset su1 su 1 mkface result su1 -set check_square 1 set square 7960.45 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug374_2 b/tests/bugs/moddata/bug374_2 index 65bd53b7f6..aee0b215e5 100755 --- a/tests/bugs/moddata/bug374_2 +++ b/tests/bugs/moddata/bug374_2 @@ -13,6 +13,5 @@ offset su2 su -1 mkface result su2 -set check_square 1 set square 7181.83 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug376 b/tests/bugs/moddata/bug376 index c5b7d80960..378a38112b 100755 --- a/tests/bugs/moddata/bug376 +++ b/tests/bugs/moddata/bug376 @@ -14,7 +14,6 @@ offset r s 1 mkface result s -set check_square 1 set square 1256.64 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug37_1 b/tests/bugs/moddata/bug37_1 index 142ed50f8e..391810f0b0 100755 --- a/tests/bugs/moddata/bug37_1 +++ b/tests/bugs/moddata/bug37_1 @@ -12,7 +12,6 @@ checkshape sh_2 bfuse result sh_1 sh_2 checkshape result -set check_square 1 set square 665013 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug37_2 b/tests/bugs/moddata/bug37_2 index 4aaf933827..3811648b03 100755 --- a/tests/bugs/moddata/bug37_2 +++ b/tests/bugs/moddata/bug37_2 @@ -12,7 +12,6 @@ checkshape sh_2 bfuse result sh_2 sh_1 checkshape result -set check_square 1 set square 665013 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug380_1 b/tests/bugs/moddata/bug380_1 index f9f051c0f5..c11b07dc42 100755 --- a/tests/bugs/moddata/bug380_1 +++ b/tests/bugs/moddata/bug380_1 @@ -12,7 +12,6 @@ restore [locate_data_file OCC380b.rle] b bcommon result a b -set check_square 1 set square 21.154 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug380_2 b/tests/bugs/moddata/bug380_2 index 869c81432f..f340025d38 100755 --- a/tests/bugs/moddata/bug380_2 +++ b/tests/bugs/moddata/bug380_2 @@ -12,6 +12,5 @@ restore [locate_data_file OCC380b.rle] b bcommon result b a -set check_square 1 set square 21.154 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug3_1 b/tests/bugs/moddata/bug3_1 index e5507c9c74..bdc5055c50 100755 --- a/tests/bugs/moddata/bug3_1 +++ b/tests/bugs/moddata/bug3_1 @@ -12,6 +12,5 @@ checkshape b bfuse result a b checkshape result -set check_square 1 set square 11400 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug3_2 b/tests/bugs/moddata/bug3_2 index b13213f5aa..507896eeab 100755 --- a/tests/bugs/moddata/bug3_2 +++ b/tests/bugs/moddata/bug3_2 @@ -12,7 +12,6 @@ checkshape b bfuse result b a checkshape result -set check_square 1 set square 11400 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug4 b/tests/bugs/moddata/bug4 index c885ca0585..dead6ca60c 100755 --- a/tests/bugs/moddata/bug4 +++ b/tests/bugs/moddata/bug4 @@ -12,7 +12,7 @@ explode sh e fillet result sh 15 sh_14 checkshape result -set square 1 +set square 177328 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug466 b/tests/bugs/moddata/bug466 index 054d0267e9..2af6860574 100755 --- a/tests/bugs/moddata/bug466 +++ b/tests/bugs/moddata/bug466 @@ -9,6 +9,5 @@ checkshape res nurbsconvert result res -set check_square 1 set square 693.577 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug469 b/tests/bugs/moddata/bug469 index 6e3063ec0e..75472b6a97 100755 --- a/tests/bugs/moddata/bug469 +++ b/tests/bugs/moddata/bug469 @@ -26,6 +26,5 @@ checkshape a_2 bfuse result a_1 a_2 checkshape result -set check_square 1 set square 10 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug496 b/tests/bugs/moddata/bug496 index 5968bcaca8..d2b2a15e97 100755 --- a/tests/bugs/moddata/bug496 +++ b/tests/bugs/moddata/bug496 @@ -14,6 +14,5 @@ checkshape a_2 bfuse result a_1 a_2 -set check_square 1 set square 4949.79 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug50 b/tests/bugs/moddata/bug50 index 5b2e296d82..7db5f09b7c 100755 --- a/tests/bugs/moddata/bug50 +++ b/tests/bugs/moddata/bug50 @@ -16,6 +16,5 @@ explode a e blend result a 1 a_17 1 a_5 1 a_1 1 a_2 1 a_16 1 a_20 1 a_3 1 a_11 1 a_10 1 a_4 checkshape result -set check_square 1 set square 7677.49 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug601 b/tests/bugs/moddata/bug601 index 46428f8005..f1cdc4f1f5 100755 --- a/tests/bugs/moddata/bug601 +++ b/tests/bugs/moddata/bug601 @@ -20,7 +20,6 @@ if [catch {blend result a 13 a_41 } res] { puts "OCC601 OK: function BLEND works without exception" checkshape result - set check_square 1 set square 10 set 2dviewer 0 } diff --git a/tests/bugs/moddata/bug611_1 b/tests/bugs/moddata/bug611_1 index 998f762324..98f29e83fd 100755 --- a/tests/bugs/moddata/bug611_1 +++ b/tests/bugs/moddata/bug611_1 @@ -16,6 +16,5 @@ checkshape a_2 bfuse result a_1 a_2 checkshape result -set check_square 1 set square 531.197 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug611_2 b/tests/bugs/moddata/bug611_2 index 71616d41b1..a9efdc484a 100755 --- a/tests/bugs/moddata/bug611_2 +++ b/tests/bugs/moddata/bug611_2 @@ -17,6 +17,5 @@ bop a_1 a_2 bopfuse result checkshape result -set check_square 1 set square 531.197 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug611_3 b/tests/bugs/moddata/bug611_3 index 308a525d32..3cdd5ce25b 100755 --- a/tests/bugs/moddata/bug611_3 +++ b/tests/bugs/moddata/bug611_3 @@ -16,6 +16,5 @@ checkshape a_2 bfuse result a_2 a_1 checkshape result -set check_square 1 set square 531.197 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug65 b/tests/bugs/moddata/bug65 index af394df2e8..91e614ef64 100755 --- a/tests/bugs/moddata/bug65 +++ b/tests/bugs/moddata/bug65 @@ -1,6 +1,4 @@ puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC12345 ALL: Error : The command is not valid. The volume is 0." -puts "TODO OCC12345 ALL: Error : The volume of result shape is 0" puts "================" puts "BUC61023" @@ -18,8 +16,7 @@ revol result sh 0 0 0 0 0 1 360 checkshape result -set check_square 1 -set volume 10 +set square 1.0134e+06 set 2dviewer 0 diff --git a/tests/bugs/moddata/bug766 b/tests/bugs/moddata/bug766 index afdf179a46..7be84277bc 100755 --- a/tests/bugs/moddata/bug766 +++ b/tests/bugs/moddata/bug766 @@ -10,9 +10,9 @@ restore [locate_data_file OCC766.draw] c set result [proj c 30 3.944304526105059e-31 20.0] -set length [llength $result] +set ll [llength $result] -if {$length > 0} { +if {$ll > 0} { puts "OCC770 OK" } else { puts "Faulty OCC770" diff --git a/tests/bugs/moddata/end b/tests/bugs/moddata/end deleted file mode 100755 index 48b054a897..0000000000 --- a/tests/bugs/moddata/end +++ /dev/null @@ -1,120 +0,0 @@ -if { [info exist check_square] } { - if { [info exists square] } { - set prop "square" - set mass $square - regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m - } - - if { [info exists volume] } { - set prop "volume" - set mass $volume - regexp {Mass +: +([-0-9.+eE]+)} [vprops result] full m - } - - if { [info exists length] } { - set prop "length" - set mass $length - regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m - puts "checksection" - puts [checksection result] - } - - #if mass (length or square) is empty in test case then result should be an empty shape. - if { [string compare "$mass" "empty"] != 0 } { - if { $m == 0 } { - puts "Error : The command is not valid. The $prop is 0." - } - if { $mass > 0 } { - puts "The expected $prop is $mass" - } - #check of change of square is < 1% - if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { - puts "Error : The $prop of result shape is $m" - } - } else { - if { $m != 0 } { - puts "Error : The command is not valid. The $prop is $m" - } - } -} -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} vertexes instead of ${nb_v}" - } else { - puts "Result shape contains ${nb_v} vertexes" - } -} - -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" - } -} - diff --git a/tests/bugs/moddata/pro19422_1 b/tests/bugs/moddata/pro19422_1 index 332f598bfb..30a16449a1 100755 --- a/tests/bugs/moddata/pro19422_1 +++ b/tests/bugs/moddata/pro19422_1 @@ -15,7 +15,6 @@ checkshape tool bcut result shape tool -set check_square 1 set square 3166.93 set 2dviewer 0 diff --git a/tests/bugs/moddata/pro19422_2 b/tests/bugs/moddata/pro19422_2 index f41f11d3b2..01e6423b0a 100755 --- a/tests/bugs/moddata/pro19422_2 +++ b/tests/bugs/moddata/pro19422_2 @@ -14,6 +14,5 @@ checkshape tool bcut result shape tool -set check_square 1 set square 2369.43 set 2dviewer 0 diff --git a/tests/bugs/step/begin b/tests/bugs/step/begin index 548d4d3146..56a8ea7ab8 100755 --- a/tests/bugs/step/begin +++ b/tests/bugs/step/begin @@ -1,5 +1,8 @@ pload XDE +set subgroup step + + diff --git a/tests/bugs/step/bug3397 b/tests/bugs/step/bug3397 index bfee7430f5..659db06898 100755 --- a/tests/bugs/step/bug3397 +++ b/tests/bugs/step/bug3397 @@ -15,9 +15,7 @@ if [catch { stepread [locate_data_file trj12_b3-tu-203.stp] a * } res] { puts "Faulty ${BugNumber} : here is reading problem" } else { tpcompound result - set nb_info [nbshapes result] - set check_square 1 set square 1.48021e+06 set nb_v_good 1228 set nb_e_good 1938 diff --git a/tests/bugs/step/bug5027_2 b/tests/bugs/step/bug5027_2 index 5f4dc97524..bfed1e3792 100755 --- a/tests/bugs/step/bug5027_2 +++ b/tests/bugs/step/bug5027_2 @@ -12,9 +12,7 @@ if [catch { stepread [locate_data_file OCC5027.stp] a * } res] { puts "Warning ${BugNumber} : here is reading problem" } else { tpcompound result - set nb_info [nbshapes result] - set check_square 1 set square 159588 set nb_v_good 44 set nb_e_good 72 diff --git a/tests/bugs/step/end b/tests/bugs/step/end deleted file mode 100755 index 48b054a897..0000000000 --- a/tests/bugs/step/end +++ /dev/null @@ -1,120 +0,0 @@ -if { [info exist check_square] } { - if { [info exists square] } { - set prop "square" - set mass $square - regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m - } - - if { [info exists volume] } { - set prop "volume" - set mass $volume - regexp {Mass +: +([-0-9.+eE]+)} [vprops result] full m - } - - if { [info exists length] } { - set prop "length" - set mass $length - regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m - puts "checksection" - puts [checksection result] - } - - #if mass (length or square) is empty in test case then result should be an empty shape. - if { [string compare "$mass" "empty"] != 0 } { - if { $m == 0 } { - puts "Error : The command is not valid. The $prop is 0." - } - if { $mass > 0 } { - puts "The expected $prop is $mass" - } - #check of change of square is < 1% - if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { - puts "Error : The $prop of result shape is $m" - } - } else { - if { $m != 0 } { - puts "Error : The command is not valid. The $prop is $m" - } - } -} -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} vertexes instead of ${nb_v}" - } else { - puts "Result shape contains ${nb_v} vertexes" - } -} - -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" - } -} - diff --git a/tests/bugs/vis/begin b/tests/bugs/vis/begin index d4ae0a4675..18fe572f9e 100755 --- a/tests/bugs/vis/begin +++ b/tests/bugs/vis/begin @@ -1,3 +1,7 @@ pload QAcommands +set subgroup vis + + + diff --git a/tests/bugs/vis/bug138_1 b/tests/bugs/vis/bug138_1 index e26ee4d816..37d15fb2ee 100755 --- a/tests/bugs/vis/bug138_1 +++ b/tests/bugs/vis/bug138_1 @@ -8,8 +8,8 @@ puts "" vinit set info [OCC138] -set length [llength ${info}] -if {${length} < 5 } { +set ll [llength ${info}] +if {${ll} < 5 } { puts "OCC138: Error (case 1)" } else { regexp {No of currents += +([-0-9.+eE]+)} $info full NbCurrents diff --git a/tests/bugs/vis/bug138_2 b/tests/bugs/vis/bug138_2 index cae563f523..feed9cb2e4 100755 --- a/tests/bugs/vis/bug138_2 +++ b/tests/bugs/vis/bug138_2 @@ -5,8 +5,8 @@ puts "========" vinit set info [OCC138LC] -set length [llength ${info}] -if {${length} < 5 } { +set ll [llength ${info}] +if {${ll} < 5 } { puts "OCC138: Error (case 1)" } else { regexp {No of selected += +([-0-9.+eE]+)} $info full NbCurrents diff --git a/tests/bugs/vis/bug319 b/tests/bugs/vis/bug319 index c00a0725e9..0d2aefda4e 100755 --- a/tests/bugs/vis/bug319 +++ b/tests/bugs/vis/bug319 @@ -49,14 +49,14 @@ if { $tri == 0 || $nod == 0 } { set IsGood 0 } -regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full square +regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full sq set good_square 8623.6 -set square_percent [expr abs(${square} - ${good_square}) / double(${good_square}) * 100.] +set square_percent [expr abs(${sq} - ${good_square}) / double(${good_square}) * 100.] set percent_max 0.1 puts "good_square = ${good_square}" -puts "square = ${square}" +puts "square = ${sq}" puts "square_percent = ${square_percent}" if {${square_percent} > ${percent_max}} { diff --git a/tests/bugs/vis/bug672_1 b/tests/bugs/vis/bug672_1 index 6ee1b16955..e6785169fb 100755 --- a/tests/bugs/vis/bug672_1 +++ b/tests/bugs/vis/bug672_1 @@ -26,14 +26,14 @@ set str "(center)" set scale_text 4.0 set length_dist -21.0 set angle 30.0 -set length 5.0 +set ll 5.0 set txtAngle 0. set txtPosH 0. set txtPosV 3. v2dinit -OCC672_Length $x1 $y1 $x2 $y2 $str $scale_text $length_dist $angle $length $x3 $y3 $x4 $y4 $txtAngle $txtPosH $txtPosV +OCC672_Length $x1 $y1 $x2 $y2 $str $scale_text $length_dist $angle $ll $x3 $y3 $x4 $y4 $txtAngle $txtPosH $txtPosV v2dfit diff --git a/tests/bugs/vis/bug672_4 b/tests/bugs/vis/bug672_4 index 1146b54a95..088f1fdd54 100755 --- a/tests/bugs/vis/bug672_4 +++ b/tests/bugs/vis/bug672_4 @@ -26,14 +26,14 @@ set str "(center)" set scale_text 4. set length_dist -10.0 set angle 30.0 -set length 5.0 +set ll 5.0 set txtAngle 0. set txtPosH 0. set txtPosV 3. v2dinit -OCC672_ShortLength $x1 $y1 $x2 $y2 $str $scale_text $length_dist $angle $length $x3 $y3 $x4 $y4 $txtAngle $txtPosH $txtPosV +OCC672_ShortLength $x1 $y1 $x2 $y2 $str $scale_text $length_dist $angle $ll $x3 $y3 $x4 $y4 $txtAngle $txtPosH $txtPosV v2dfit diff --git a/tests/bugs/xde/begin b/tests/bugs/xde/begin index ded93e3e5d..9ff0c1e65b 100755 --- a/tests/bugs/xde/begin +++ b/tests/bugs/xde/begin @@ -1,5 +1,7 @@ pload XDE +set subgroup xde + proc GetPercent {Value GoodValue} { set Percent 0. if {${GoodValue} != 0.} { diff --git a/tests/bugs/xde/bug4648 b/tests/bugs/xde/bug4648 index bf0274cdc9..2305b49c8e 100755 --- a/tests/bugs/xde/bug4648 +++ b/tests/bugs/xde/bug4648 @@ -35,7 +35,7 @@ if [catch { stepread ${imagedir}/annie b *} res] { } else { renamevar b_1 res set info1 [nbshapes res] - regexp {Mass +: +([-0-9.+eE]+)} [sprops res] full square + regexp {Mass +: +([-0-9.+eE]+)} [sprops res] full sq regexp {VERTEX +: +([-0-9.+eE]+)} $info1 full vertex regexp {EDGE +: +([-0-9.+eE]+)} $info1 full edge regexp {WIRE +: +([-0-9.+eE]+)} $info1 full wire @@ -46,7 +46,7 @@ if [catch { stepread ${imagedir}/annie b *} res] { regexp {COMPOUND +: +([-0-9.+eE]+)} $info1 full compound regexp {SHAPE +: +([-0-9.+eE]+)} $info1 full shape - if { $square != $good_square + if { $sq != $good_square || $vertex != $good_vertex || $edge != $good_edge || $wire != $good_wire