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

[occt.git] / tests / pipe / specific / G6

diff --git a/tests/pipe/specific/G6 b/tests/pipe/specific/G6
index 630b837..b3aeafc 100755 (executable)
--- a/tests/pipe/specific/G6
+++ b/tests/pipe/specific/G6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26609
 set volume 85867.7
 
-set nb_v_good 43
-set nb_e_good 84
-set nb_w_good 37
-set nb_f_good 37
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 203
-
+checknbshapes result -vertex 43 -edge 84 -wire 37 -face 37 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 203
 set 2dviewer 0