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

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

diff --git a/tests/pipe/specific/J1 b/tests/pipe/specific/J1
index 950f3e3..d4277c2 100755 (executable)
--- a/tests/pipe/specific/J1
+++ b/tests/pipe/specific/J1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
 
-set square 20709.4
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
+set square 20709.4
 
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0