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

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

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