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

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

diff --git a/tests/pipe/specific/M2 b/tests/pipe/specific/M2
index d3c9909..c21728b 100755 (executable)
--- a/tests/pipe/specific/M2
+++ b/tests/pipe/specific/M2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32535.9
 set volume 103756
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0