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

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

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