From e1f111d4b834fd0d79c1bc7ce18891d3003992eb Mon Sep 17 00:00:00 2001 From: mkv Date: Fri, 29 May 2015 14:12:48 +0300 Subject: [PATCH] Update testing cases after integration issue 26253 --- tests/boolean/bcommon_complex/C3 | 4 +--- tests/boolean/bcut_complex/N9 | 4 +--- tests/boolean/bopcut_complex/C3 | 14 +++++++++----- tests/boolean/gdml_private/F8 | 5 +---- tests/boolean/gdml_private/H7 | 2 ++ tests/boolean/gdml_private/K4 | 1 - tests/boolean/gdml_private/P7 | 2 +- tests/boolean/gdml_private/ZH5 | 3 ++- tests/boolean/gdml_public/A9 | 2 +- tests/boolean/volumemaker/A4 | 1 + tests/boolean/volumemaker/B7 | 7 +++---- tests/boolean/volumemaker/B8 | 7 +++---- tests/boolean/volumemaker/C1 | 6 +++--- tests/boolean/volumemaker/C6 | 3 +-- tests/boolean/volumemaker/D6 | 7 +++---- tests/boolean/volumemaker/D8 | 2 +- tests/boolean/volumemaker/D9 | 2 +- tests/boolean/volumemaker/F2 | 3 +-- tests/feat/featprism/C4 | 3 --- tests/heal/wire_tails_real/A5 | 4 ++-- 20 files changed, 37 insertions(+), 45 deletions(-) diff --git a/tests/boolean/bcommon_complex/C3 b/tests/boolean/bcommon_complex/C3 index ec2b35a562..9a99d5f623 100644 --- a/tests/boolean/bcommon_complex/C3 +++ b/tests/boolean/bcommon_complex/C3 @@ -1,11 +1,9 @@ # Original bug : pro9373 # Date : 24mar98 -puts "TODO #22911 ALL: Error : The $command is not valid. The area is 0." - restore [locate_data_file pro9373a.rle] a restore [locate_data_file pro9373b.rle] b bcommon result a b -set square 0 +set square 2045.39 diff --git a/tests/boolean/bcut_complex/N9 b/tests/boolean/bcut_complex/N9 index 2160d785ae..b5157c6165 100644 --- a/tests/boolean/bcut_complex/N9 +++ b/tests/boolean/bcut_complex/N9 @@ -2,12 +2,10 @@ # Date : 26Aout98 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO #22911 ALL: Error : The area of the resulting shape is" restore [locate_data_file CTO904_pro14942a.rle] a restore [locate_data_file pro14942b.rle] b bcut result a b -#CR23958 set square 0 -set square 192472 +set square 192941 diff --git a/tests/boolean/bopcut_complex/C3 b/tests/boolean/bopcut_complex/C3 index 7615836970..ec2b35a562 100644 --- a/tests/boolean/bopcut_complex/C3 +++ b/tests/boolean/bopcut_complex/C3 @@ -1,7 +1,11 @@ -restore [locate_data_file OCC122.brep] sh -explode sh +# Original bug : pro9373 +# Date : 24mar98 -bop sh_1 sh_2 -bopcut result +puts "TODO #22911 ALL: Error : The $command is not valid. The area is 0." -set square 83334.1 +restore [locate_data_file pro9373a.rle] a +restore [locate_data_file pro9373b.rle] b + +bcommon result a b + +set square 0 diff --git a/tests/boolean/gdml_private/F8 b/tests/boolean/gdml_private/F8 index b15ffc3832..97f1249dde 100644 --- a/tests/boolean/gdml_private/F8 +++ b/tests/boolean/gdml_private/F8 @@ -1,7 +1,4 @@ -puts "TODO OCC26018 ALL: Error : The area of the resulting shape is" -puts "TODO OCC26018 Linux: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26017 Windows: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_et1_401-ta6027.prt.2.gdml.tcl] ## image is differ from application -set square 0 +set square 3.52888e+07 diff --git a/tests/boolean/gdml_private/H7 b/tests/boolean/gdml_private/H7 index 359f17beb8..5201dafb2a 100644 --- a/tests/boolean/gdml_private/H7 +++ b/tests/boolean/gdml_private/H7 @@ -1,2 +1,4 @@ +puts "TODO OCC26253 Linux: Faulty shapes in variables faulty_1 to" + source [locate_data_file 20000_et4_401-ta6049.prt.2.gdml.tcl] diff --git a/tests/boolean/gdml_private/K4 b/tests/boolean/gdml_private/K4 index 7e6b0ee116..19538c5378 100644 --- a/tests/boolean/gdml_private/K4 +++ b/tests/boolean/gdml_private/K4 @@ -1,3 +1,2 @@ -puts "TODO OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_et6_401-ta6070.prt.2.gdml.tcl] diff --git a/tests/boolean/gdml_private/P7 b/tests/boolean/gdml_private/P7 index ff65d06c67..a29697aeb3 100644 --- a/tests/boolean/gdml_private/P7 +++ b/tests/boolean/gdml_private/P7 @@ -1,3 +1,3 @@ -puts "TODO OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_h1-2_ss1_401-ta13402.prt.2.gdml.tcl] diff --git a/tests/boolean/gdml_private/ZH5 b/tests/boolean/gdml_private/ZH5 index 2f7b45d352..1377eb7ef7 100644 --- a/tests/boolean/gdml_private/ZH5 +++ b/tests/boolean/gdml_private/ZH5 @@ -1,4 +1,5 @@ -puts "TODO OCC26018 ALL: Error: bopcheck failed" +puts "TODO ?OCC26018 ALL: Error: bopcheck failed" +puts "TODO ?OCC26253 ALL: Faulty shapes in variables faulty_1 to" source [locate_data_file 52109_shapiro.prt.gdml.tcl] set bcheck [bopcheck result] diff --git a/tests/boolean/gdml_public/A9 b/tests/boolean/gdml_public/A9 index c1c03be8a6..a13cbbf25b 100644 --- a/tests/boolean/gdml_public/A9 +++ b/tests/boolean/gdml_public/A9 @@ -1,4 +1,4 @@ -puts "TODO OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_" # test script for freeform_revol_01.prt.1.gdml file compound result diff --git a/tests/boolean/volumemaker/A4 b/tests/boolean/volumemaker/A4 index f41e0732fa..fc4606b7e3 100644 --- a/tests/boolean/volumemaker/A4 +++ b/tests/boolean/volumemaker/A4 @@ -4,6 +4,7 @@ puts "TODO ?OCC26019 ALL: Error: bopcheck failed" puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "TODO ?OCC26019 Linux: Error : The area of the resulting shape is" +puts "TODO OCC26253 Linux: Error : The mkvolume is not valid. The area is" # planar face plane pln_f1 -2740.6595835899998 -150 -1050 1.110223024625157e-016 1 1.1102230246251563e-016 diff --git a/tests/boolean/volumemaker/B7 b/tests/boolean/volumemaker/B7 index 09b6729828..795efc44d0 100644 --- a/tests/boolean/volumemaker/B7 +++ b/tests/boolean/volumemaker/B7 @@ -1,8 +1,8 @@ # test script on make volume operation # plane -puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 ALL: Error: bopcheck failed" +puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26020 ALL: Error: bopcheck failed" # planar face plane pln_f1 18.855982726712998 17.500000000800412 0 -0.96152394764524818 -0.27472112788189063 0 @@ -52,5 +52,4 @@ mkface f9 pln_f9 -1000000 1000000 -1000000 1000000 # make volume operation mkvolume result f1 f2 f3 f4 f5 f6 f7 f8 f9 -set square 3.59999e+013 - +set square 2.75501e+013 diff --git a/tests/boolean/volumemaker/B8 b/tests/boolean/volumemaker/B8 index 31ecbfb549..f46e5f382c 100644 --- a/tests/boolean/volumemaker/B8 +++ b/tests/boolean/volumemaker/B8 @@ -1,8 +1,8 @@ # test script on make volume operation # plane -puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 ALL: Error: bopcheck failed" +puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26020 ALL: Error: bopcheck failed" # planar face plane pln_f1 675.40193739250992 -18.500000000000014 -849.55972443208043 -0.78282540776981002 -2.2204460492503131e-016 -0.62224141693560608 @@ -47,5 +47,4 @@ mkface f8 pln_f8 -1000000 1000000 -1000000 1000000 # make volume operation mkvolume result f1 f2 f3 f4 f5 f6 f7 f8 -set square 3.60102e+013 - +set square 28748.8 diff --git a/tests/boolean/volumemaker/C1 b/tests/boolean/volumemaker/C1 index 4849aac87a..6eb88c252a 100644 --- a/tests/boolean/volumemaker/C1 +++ b/tests/boolean/volumemaker/C1 @@ -1,9 +1,9 @@ # test script on make volume operation # plane -puts "TODO OCC26020 Windows: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 Linux: Error : The area of the resulting shape is" -puts "TODO OCC26020 Linux: Error: bopcheck failed" +puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO OCC26020 ALL: Error : The area of the resulting shape is" +puts "TODO OCC26020 ALL: Error: bopcheck failed" # planar face plane pln_f1 -331.49269816258993 -487.15663197846379 -460.05843051255943 -0.29784456643004237 0.75470958022277179 -0.58455287508322795 diff --git a/tests/boolean/volumemaker/C6 b/tests/boolean/volumemaker/C6 index 643de4ec1f..9160f01c38 100644 --- a/tests/boolean/volumemaker/C6 +++ b/tests/boolean/volumemaker/C6 @@ -39,5 +39,4 @@ mkface f7 con_f7 0 6.2831853071795862 0 1000000 # make volume operation mkvolume result f1 f2 f3 f4 f5 f6 f7 -set square 3.17981e+006 - +set square 4.20797e+006 diff --git a/tests/boolean/volumemaker/D6 b/tests/boolean/volumemaker/D6 index 6c7d842c5e..2789c04675 100644 --- a/tests/boolean/volumemaker/D6 +++ b/tests/boolean/volumemaker/D6 @@ -1,8 +1,8 @@ # test script on make volume operation # cylinder plane -puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 ALL: Error: bopcheck failed" +puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26020 ALL: Error: bopcheck failed" # planar face plane pln_f1 -1677.4339210099999 -825 347.58541137999993 -2.2204460492503131e-016 -1.1102230246251565e-016 1 @@ -47,5 +47,4 @@ mkface f8 cyl_f8 0 6.2831853071795862 -1000000 1000000 # make volume operation mkvolume result f1 f2 f3 f4 f5 f6 f7 f8 -set square 1.99756e+012 - +set square 2.0232e+007 diff --git a/tests/boolean/volumemaker/D8 b/tests/boolean/volumemaker/D8 index 969b7b4c4c..eae38871fb 100644 --- a/tests/boolean/volumemaker/D8 +++ b/tests/boolean/volumemaker/D8 @@ -1,7 +1,7 @@ # test script on make volume operation # cylinder plane -puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "TODO OCC26020 Linux: Error: bopcheck failed" puts "TODO OCC26020 Linux: Error : The area of the resulting shape is" diff --git a/tests/boolean/volumemaker/D9 b/tests/boolean/volumemaker/D9 index 93e3ae5b0e..6f44f49165 100644 --- a/tests/boolean/volumemaker/D9 +++ b/tests/boolean/volumemaker/D9 @@ -1,7 +1,7 @@ # test script on make volume operation # cylinder plane -puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" # planar face plane pln_f1 0 825 4.163336342344337e-015 0 -1 -1.1102230246251565e-016 diff --git a/tests/boolean/volumemaker/F2 b/tests/boolean/volumemaker/F2 index 3b29e2b0b2..b9d485e773 100644 --- a/tests/boolean/volumemaker/F2 +++ b/tests/boolean/volumemaker/F2 @@ -31,5 +31,4 @@ mkface f5 con_f5 0 6.2831853071795862 0 1000000 # make volume operation mkvolume result f1 f2 f3 f4 f5 -set square 7.9273e+006 - +set square 8.06875e+006 diff --git a/tests/feat/featprism/C4 b/tests/feat/featprism/C4 index 6ea16575a6..f98af3700a 100644 --- a/tests/feat/featprism/C4 +++ b/tests/feat/featprism/C4 @@ -1,6 +1,3 @@ -puts "TODO OCC25902 ALL: Error : The feat grid is not valid. The area is 0." -puts "TODO OCC25902 ALL: Error : The area of the resulting shape is 0" - restore [locate_data_file cylindre.rle] cyl restore [locate_data_file contour.rle] cont mkplane cont cont diff --git a/tests/heal/wire_tails_real/A5 b/tests/heal/wire_tails_real/A5 index 065566af8a..c0db940674 100644 --- a/tests/heal/wire_tails_real/A5 +++ b/tests/heal/wire_tails_real/A5 @@ -4,5 +4,5 @@ stepread [locate_data_file bug26261_ca07771-040x.stp] s * renamevar s_1 s fixshape r s -maxtaila 1 -maxtailw 1e-3 -checknbshapes r -vertex 25950 -edge 41999 -wire 16519 -face 16205 -shell 51 -solid 1 -compsolid 0 -compound 2 -checklength r 127197.57657573155 +checknbshapes r -vertex 25951 -edge 42000 -wire 16519 -face 16205 -shell 51 -solid 1 -compsolid 0 -compound 2 +checklength r 127197.46264592493