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

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

diff --git a/tests/pipe/specific/N5 b/tests/pipe/specific/N5
index cc5eaae..917fcbc 100755 (executable)
--- a/tests/pipe/specific/N5
+++ b/tests/pipe/specific/N5
@@ -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 38315.9
 set volume 147866
 
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 4 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 25
 set 2dviewer 0