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

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

diff --git a/tests/pipe/specific/U1 b/tests/pipe/specific/U1
index 9d9150a..7667b50 100755 (executable)
--- a/tests/pipe/specific/U1
+++ b/tests/pipe/specific/U1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 61084.5
 set volume 248677
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-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 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0