Adjusting testing cases for current state of OCCT

diff --git a/tests/bugs/grids.list b/tests/bugs/grids.list
index 450347c67692dd2b61bcc177a0fa396c5449eac7..9a9f75fb299ef5c37abe0c1789e80736d59663e9 100755 (executable)
--- a/tests/bugs/grids.list
+++ b/tests/bugs/grids.list
@@ -7,10 +7,11 @@
 007 modalg_2
 008 modalg_3
 009 modalg_4
-010 moddata_1
-011 moddata_2
-012 step
-013 caf
-014 mesh
-015 heal
-
+010 modalg_5
+011 moddata_1
+012 moddata_2
+013 moddata_3
+014 step
+015 caf
+016 mesh
+017 heal

diff --git a/tests/bugs/modalg/bug22323 b/tests/bugs/modalg/bug22323
deleted file mode 100644 (file)
index a3db6c2..0000000
--- a/tests/bugs/modalg/bug22323
+++ /dev/null
@@ -1,15 +0,0 @@
-puts "============"
-puts "CR22323"
-puts "============"
-puts ""
-##########################################################################################################
-# Example of using offsetshape command instead of redundant "shell" command to get the same result
-##########################################################################################################
-
-pcylinder cy 100 200
-explode cy f
-donly cy cy_2
-fit
-
-offsetshape res cy -1. cy_2
-donly res
\ No newline at end of file

diff --git a/tests/bugs/modalg_4/bug8842_6 b/tests/bugs/modalg_4/bug8842_6
index 7bfc6b9a1fd99ff61041922684b3de4707e816ca..d7017e6a8044f13d47eeec35b2687beccb75d44c 100755 (executable)
--- a/tests/bugs/modalg_4/bug8842_6
+++ b/tests/bugs/modalg_4/bug8842_6
@@ -1,6 +1,6 @@
-puts "TODO OCC11111 ALL: OCC8842: Faulty"
-puts "TODO OCC11111 ALL: Exception"
-puts "TODO OCC11111 ALL: An exception was caught"
+puts "TODO ?OCC11111 ALL: OCC8842: Faulty"
+puts "TODO ?OCC11111 ALL: Exception"
+puts "TODO ?OCC11111 ALL: An exception was caught"
 
 puts "============"
 puts "OCC8842"

diff --git a/tests/bugs/modalg_5/bug22323 b/tests/bugs/modalg_5/bug22323
new file mode 100644 (file)
index 0000000..a3db6c2
--- /dev/null
+++ b/tests/bugs/modalg_5/bug22323
@@ -0,0 +1,15 @@
+puts "============"
+puts "CR22323"
+puts "============"
+puts ""
+##########################################################################################################
+# Example of using offsetshape command instead of redundant "shell" command to get the same result
+##########################################################################################################
+
+pcylinder cy 100 200
+explode cy f
+donly cy cy_2
+fit
+
+offsetshape res cy -1. cy_2
+donly res
\ No newline at end of file

diff --git a/tests/bugs/moddata/bug23703 b/tests/bugs/moddata/bug23703
deleted file mode 100755 (executable)
index 098d07b..0000000
--- a/tests/bugs/moddata/bug23703
+++ /dev/null
@@ -1,20 +0,0 @@
-puts "========"
-puts "CR23703"
-puts "========"
-puts ""
-####################################################################
-## Projection algorithm produces incomplete 2D-Curve
-####################################################################
-
-restore [locate_data_file bug23703_c2x.brep] c
-restore [locate_data_file bug23703_s1.brep] s
-
-mkface f s
-pcurve f
-
-project c2d c s
-
-v2d
-2dfit
-
-set only_screen_axo 1

diff --git a/tests/bugs/moddata/bug23733 b/tests/bugs/moddata/bug23733
deleted file mode 100755 (executable)
index e80fd46..0000000
--- a/tests/bugs/moddata/bug23733
+++ /dev/null
@@ -1,40 +0,0 @@
-puts "================"
-puts "CR23733"
-puts "================"
-puts ""
-###############################################
-## PCurve for edge on face creation failure
-###############################################
-
-pload DCAF TOPTEST
-
-Open [locate_data_file bug_glue_edges_GEOM.sgd] D
-
-GetShape D 0:1:9686:1:1:2 s1
-GetShape D 0:1:9449:1:1:2 s2
-explode s1 e
-explode s2 f
-
-#should create pcurve
-bhaspc s1_100 s2_2 do
-#should report OK
-set info1 [bhaspc s1_100 s2_2]
-if { [regexp {No} ${info1}] == 1 } {
-    puts "Faulty: No 2D curves detected"
-}
-
-#should create pcurve
-bhaspc s1_40 s2_54 do
-#should report OK
-set info2 [bhaspc s1_40 s2_54]
-if { [regexp {No} ${info2}] == 1 } {
-    puts "Faulty: No 2D curves detected"
-}
-
-#should create pcurve
-bhaspc s1_22 s2_123 do
-#should report OK
-set info3 [bhaspc s1_22 s2_123]
-if { [regexp {No} ${info3}] == 1 } {
-    puts "Faulty: No 2D curves detected"
-}

diff --git a/tests/bugs/moddata/bug23738 b/tests/bugs/moddata/bug23738
deleted file mode 100755 (executable)
index 4bf6414..0000000
--- a/tests/bugs/moddata/bug23738
+++ /dev/null
@@ -1,34 +0,0 @@
-puts "============"
-puts "CR23738"
-puts "============"
-puts ""
-#######################################################################
-# 
-#######################################################################
-
-puts "Load first shape ..."
-restore [locate_data_file bug23738_b1.brep] b1 
-puts "Load second shape ..."
-restore [locate_data_file bug23738_b2.brep] b2 
-
-puts "Prepare boolean operation ..."
-bop b1 b2
-
-puts "Start boolean operation ..."
-bopfuse result
-puts "Finish boolean operation ..."
-
-set square 225009
-
-# Analysis of "nbshapes result"
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 8
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 36
-
-set 3dviewer 1

diff --git a/tests/bugs/moddata_1/bug22165 b/tests/bugs/moddata_1/bug22165
new file mode 100644 (file)
index 0000000..f41fda1
--- /dev/null
+++ b/tests/bugs/moddata_1/bug22165
@@ -0,0 +1,30 @@
+puts "================"
+puts "OCC22165"
+puts "================"
+puts ""
+#######################################################################################
+# IGES transaltor does not produce any shape
+######################################################################################
+
+set BugNumber OCC22165
+
+catch { pload XDE }
+
+igesbrep [locate_data_file OCC22165-cub_spain.igs] result *
+
+decho off
+set Log [data c]
+decho on
+
+set LogLength [llength ${Log}]
+
+if { ${LogLength} < 21 } {
+    puts "Bad format of data-command"
+    puts "Faulty ${BugNumber}"
+} else {
+    regexp -all {1[ \t]*F: Syntax error in IGES file at line ([-0-9.+eE]+) in section ([A-Z]).} $Log full word1 word2
+    if { ${word1} != "206" || ${word2} != "P" } {
+       puts "Faulty ${BugNumber}"
+    }
+}
+

diff --git a/tests/bugs/moddata_2/bug22165 b/tests/bugs/moddata_2/bug22165
deleted file mode 100755 (executable)
index 404adac..0000000
--- a/tests/bugs/moddata_2/bug22165
+++ /dev/null
@@ -1,28 +0,0 @@
-puts "================"
-puts "OCC22165"
-puts "================"
-puts ""
-#######################################################################################
-# IGES transaltor does not produce any shape
-######################################################################################
-
-set BugNumber OCC22165
-
-catch { pload XDE }
-
-igesbrep [locate_data_file OCC22165-cub_spain.igs] result *
-
-set Log [data c]
-
-set LogLength [llength ${Log}]
-
-if { ${LogLength} < 21 } {
-    puts "Bad format of data-command"
-    puts "Faulty ${BugNumber}"
-} else {
-    regexp -all {1[ \t]*F: Syntax error in IGES file at line ([-0-9.+eE]+) in section ([A-Z]).} $Log full word1 word2
-    if { ${word1} != "206" || ${word2} != "P" } {
-       puts "Faulty ${BugNumber}"
-    }
-}
-

diff --git a/tests/bugs/moddata_3/bug23703 b/tests/bugs/moddata_3/bug23703
new file mode 100644 (file)
index 0000000..098d07b
--- /dev/null
+++ b/tests/bugs/moddata_3/bug23703
@@ -0,0 +1,20 @@
+puts "========"
+puts "CR23703"
+puts "========"
+puts ""
+####################################################################
+## Projection algorithm produces incomplete 2D-Curve
+####################################################################
+
+restore [locate_data_file bug23703_c2x.brep] c
+restore [locate_data_file bug23703_s1.brep] s
+
+mkface f s
+pcurve f
+
+project c2d c s
+
+v2d
+2dfit
+
+set only_screen_axo 1

diff --git a/tests/bugs/moddata_3/bug23733 b/tests/bugs/moddata_3/bug23733
new file mode 100644 (file)
index 0000000..e80fd46
--- /dev/null
+++ b/tests/bugs/moddata_3/bug23733
@@ -0,0 +1,40 @@
+puts "================"
+puts "CR23733"
+puts "================"
+puts ""
+###############################################
+## PCurve for edge on face creation failure
+###############################################
+
+pload DCAF TOPTEST
+
+Open [locate_data_file bug_glue_edges_GEOM.sgd] D
+
+GetShape D 0:1:9686:1:1:2 s1
+GetShape D 0:1:9449:1:1:2 s2
+explode s1 e
+explode s2 f
+
+#should create pcurve
+bhaspc s1_100 s2_2 do
+#should report OK
+set info1 [bhaspc s1_100 s2_2]
+if { [regexp {No} ${info1}] == 1 } {
+    puts "Faulty: No 2D curves detected"
+}
+
+#should create pcurve
+bhaspc s1_40 s2_54 do
+#should report OK
+set info2 [bhaspc s1_40 s2_54]
+if { [regexp {No} ${info2}] == 1 } {
+    puts "Faulty: No 2D curves detected"
+}
+
+#should create pcurve
+bhaspc s1_22 s2_123 do
+#should report OK
+set info3 [bhaspc s1_22 s2_123]
+if { [regexp {No} ${info3}] == 1 } {
+    puts "Faulty: No 2D curves detected"
+}

diff --git a/tests/bugs/moddata_3/bug23738 b/tests/bugs/moddata_3/bug23738
new file mode 100644 (file)
index 0000000..4bf6414
--- /dev/null
+++ b/tests/bugs/moddata_3/bug23738
@@ -0,0 +1,34 @@
+puts "============"
+puts "CR23738"
+puts "============"
+puts ""
+#######################################################################
+# 
+#######################################################################
+
+puts "Load first shape ..."
+restore [locate_data_file bug23738_b1.brep] b1 
+puts "Load second shape ..."
+restore [locate_data_file bug23738_b2.brep] b2 
+
+puts "Prepare boolean operation ..."
+bop b1 b2
+
+puts "Start boolean operation ..."
+bopfuse result
+puts "Finish boolean operation ..."
+
+set square 225009
+
+# Analysis of "nbshapes result"
+set nb_v_good 8
+set nb_e_good 12
+set nb_w_good 8
+set nb_f_good 6
+set nb_sh_good 1
+set nb_sol_good 0
+set nb_compsol_good 0
+set nb_compound_good 1
+set nb_shape_good 36
+
+set 3dviewer 1