From 28746337be1be156ded4238dabcc151e4ce60e3e Mon Sep 17 00:00:00 2001
From: bugmaster <bugmaster@opencascade.com>
Date: Fri, 24 Oct 2014 15:35:41 +0400
Subject: [PATCH] Update of testing cases after integration fixes for issue
 25354 and 25406

---
 tests/bugs/modalg_2/bug5805_17 | 5 ++++-
 tests/bugs/modalg_2/bug5805_41 | 7 +++++--
 tests/bugs/modalg_4/bug794     | 1 -
 tests/bugs/modalg_4/bug8842_1  | 4 ++--
 tests/bugs/modalg_4/bug8842_6  | 4 ++--
 tests/bugs/modalg_4/bug8842_7  | 4 ++--
 tests/bugs/modalg_4/bug8842_8  | 4 ++--
 tests/bugs/modalg_5/bug25111   | 4 ++--
 tests/de/iges_2/B8             | 4 +---
 tests/de/iges_2/E6             | 4 +---
 tests/de/iges_2/G1             | 7 ++-----
 tests/offset/compshape/A1      | 5 ++++-
 tests/offset/faces_type_i/C8   | 1 +
 tests/offset/shape_type_i/A5   | 4 ++--
 tests/offset/shape_type_i/A7   | 6 ++++--
 tests/offset/shape_type_i/A9   | 4 ++--
 tests/offset/shape_type_i/B2   | 6 ++++--
 tests/offset/shape_type_i/B3   | 6 ++++--
 tests/offset/shape_type_i/B7   | 6 ++++--
 tests/offset/shape_type_i/C5   | 1 +
 tests/offset/shape_type_i/C8   | 1 +
 tests/offset/shape_type_i/F6   | 5 ++++-
 22 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/tests/bugs/modalg_2/bug5805_17 b/tests/bugs/modalg_2/bug5805_17
index a64f73a1b6..97f5bf80f2 100755
--- a/tests/bugs/modalg_2/bug5805_17
+++ b/tests/bugs/modalg_2/bug5805_17
@@ -1,8 +1,11 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO ?OCC11111 ALL: Error : Result shape is WRONG"
 puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 puts "TODO ?OCC11111 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO ?OCC11111 ALL: Faulty OCC5805 : result is not Closed shape"
 puts "TODO ?OCC11111 ALL: Error : The command is not valid."
+puts "TODO ?OCC25406 ALL: result is not a topological shape"
+puts "TODO ?OCC25406 ALL: TEST INCOMPLETE"
+
 puts "============"
 puts "OCC5805"
 puts "============"
diff --git a/tests/bugs/modalg_2/bug5805_41 b/tests/bugs/modalg_2/bug5805_41
index 1cbb41489b..77334464b7 100755
--- a/tests/bugs/modalg_2/bug5805_41
+++ b/tests/bugs/modalg_2/bug5805_41
@@ -1,8 +1,11 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
-puts "TODO OCC11111 ALL: Error : The square of result shape is"
+puts "TODO ?OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 puts "TODO ?OCC11111 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO ?OCC11111 ALL: Faulty OCC5805 : result is not Closed shape"
 puts "TODO ?OCC11111 ALL: Error : The command is not valid"
+puts "TODO ?OCC25406 ALL: result is not a topological shape"
+puts "TODO ?OCC25406 ALL: TEST INCOMPLETE"
+
 puts "============"
 puts "OCC5805"
 puts "============"
diff --git a/tests/bugs/modalg_4/bug794 b/tests/bugs/modalg_4/bug794
index b840b8e330..24ad8a5706 100755
--- a/tests/bugs/modalg_4/bug794
+++ b/tests/bugs/modalg_4/bug794
@@ -1,4 +1,3 @@
-puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "========="
 puts " OCC794 "
 puts "========="
diff --git a/tests/bugs/modalg_4/bug8842_1 b/tests/bugs/modalg_4/bug8842_1
index 16073f8852..25da09005c 100755
--- a/tests/bugs/modalg_4/bug8842_1
+++ b/tests/bugs/modalg_4/bug8842_1
@@ -39,10 +39,10 @@ set nb_e_good 8
 set nb_w_good 4
 set nb_f_good 4
 set nb_sh_good 1
-set nb_sol_good 1
+set nb_sol_good 0
 set nb_compsol_good 0
 set nb_compound_good 0
-set nb_shape_good 23
+set nb_shape_good 22
 
 }
 
diff --git a/tests/bugs/modalg_4/bug8842_6 b/tests/bugs/modalg_4/bug8842_6
index 1e9df0d877..f79cec03df 100755
--- a/tests/bugs/modalg_4/bug8842_6
+++ b/tests/bugs/modalg_4/bug8842_6
@@ -38,10 +38,10 @@ set nb_e_good 9
 set nb_w_good 4
 set nb_f_good 4
 set nb_sh_good 1
-set nb_sol_good 1
+set nb_sol_good 0
 set nb_compsol_good 0
 set nb_compound_good 0
-set nb_shape_good 23
+set nb_shape_good 22
 
 }
 
diff --git a/tests/bugs/modalg_4/bug8842_7 b/tests/bugs/modalg_4/bug8842_7
index 47367b5dcb..668e83c7ea 100755
--- a/tests/bugs/modalg_4/bug8842_7
+++ b/tests/bugs/modalg_4/bug8842_7
@@ -42,10 +42,10 @@ set nb_e_good 9
 set nb_w_good 4
 set nb_f_good 4
 set nb_sh_good 1
-set nb_sol_good 1
+set nb_sol_good 0
 set nb_compsol_good 0
 set nb_compound_good 0
-set nb_shape_good 23
+set nb_shape_good 22
 
 }
 
diff --git a/tests/bugs/modalg_4/bug8842_8 b/tests/bugs/modalg_4/bug8842_8
index 10a97698b6..32bf794928 100755
--- a/tests/bugs/modalg_4/bug8842_8
+++ b/tests/bugs/modalg_4/bug8842_8
@@ -40,10 +40,10 @@ set nb_e_good 9
 set nb_w_good 4
 set nb_f_good 4
 set nb_sh_good 1
-set nb_sol_good 1
+set nb_sol_good 0
 set nb_compsol_good 0
 set nb_compound_good 0
-set nb_shape_good 23
+set nb_shape_good 22
 
 }
 
diff --git a/tests/bugs/modalg_5/bug25111 b/tests/bugs/modalg_5/bug25111
index b09bec1683..beaa9b5ccb 100644
--- a/tests/bugs/modalg_5/bug25111
+++ b/tests/bugs/modalg_5/bug25111
@@ -17,7 +17,7 @@ bopsection result
 
 set length 53.1714
 
-set nb_v_good 3
+set nb_v_good 4
 set nb_e_good 2
 set nb_w_good 0
 set nb_f_good 0
@@ -25,6 +25,6 @@ set nb_sh_good 0
 set nb_sol_good 0
 set nb_compsol_good 0
 set nb_compound_good  1
-set nb_shape_good 6
+set nb_shape_good 7
 
 set 2dviewer 1
diff --git a/tests/de/iges_2/B8 b/tests/de/iges_2/B8
index b3b166c5f6..11e27c608a 100644
--- a/tests/de/iges_2/B8
+++ b/tests/de/iges_2/B8
@@ -1,9 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-
-
-puts "TODO CR23096 ALL: Error : 1 differences with reference data found :" 
+#puts "TODO CR23096 ALL: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename FRA62468-2.igs
diff --git a/tests/de/iges_2/E6 b/tests/de/iges_2/E6
index f1e069c147..276c9ed23c 100644
--- a/tests/de/iges_2/E6
+++ b/tests/de/iges_2/E6
@@ -1,9 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-
-
-puts "TODO CR23096 ALL: Error : 1 differences with reference data found :" 
+#puts "TODO CR23096 ALL: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename ims010.igs
diff --git a/tests/de/iges_2/G1 b/tests/de/iges_2/G1
index 637025f5b9..e6d88495ea 100755
--- a/tests/de/iges_2/G1
+++ b/tests/de/iges_2/G1
@@ -2,11 +2,8 @@
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-
-
-puts "TODO CR23096 ALL: STATSHAPE : Faulty " 
-
-puts "TODO CR23096 ALL: Error : 2 differences with reference data found :" 
+#puts "TODO CR23096 ALL: STATSHAPE : Faulty " 
+#puts "TODO CR23096 ALL: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
 set LinuxFaulties {STATSHAPE}
diff --git a/tests/offset/compshape/A1 b/tests/offset/compshape/A1
index b4ca5c0613..27d202dff4 100644
--- a/tests/offset/compshape/A1
+++ b/tests/offset/compshape/A1
@@ -1,3 +1,7 @@
+puts "TODO ?OFF22926 ALL: The offset is not valid"
+puts "TODO ?OCC23068 ALL: result is not a topological shape"
+puts "TODO ?OCC24156 ALL: TEST INCOMPLETE"
+
 ## ======================================
 ## Grid    : CCV002
 ## Test    : A1
@@ -9,5 +13,4 @@ explode s F
 offsetcompshape result s -10 s_1
 
 #real volume of result shape is unknow yet
-puts "TODO OFF22926 ALL: The offset is not valid"
 set volume 0
diff --git a/tests/offset/faces_type_i/C8 b/tests/offset/faces_type_i/C8
index 2627b557ec..453212527e 100644
--- a/tests/offset/faces_type_i/C8
+++ b/tests/offset/faces_type_i/C8
@@ -3,6 +3,7 @@ puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape is"
 puts "TODO ?OCC23068 ALL: Exception"
 puts "TODO ?OCC23068 ALL: An exception was caught"
 puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO ?OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
diff --git a/tests/offset/shape_type_i/A5 b/tests/offset/shape_type_i/A5
index 8efe57eb09..2f92b53ca0 100644
--- a/tests/offset/shape_type_i/A5
+++ b/tests/offset/shape_type_i/A5
@@ -1,5 +1,5 @@
-puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
-puts "TODO OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape "
 pcone s 5 0 12 90
 trotate s 0 0 0 0 0 1 90
 
diff --git a/tests/offset/shape_type_i/A7 b/tests/offset/shape_type_i/A7
index bcadc6b8d2..9905fc8158 100644
--- a/tests/offset/shape_type_i/A7
+++ b/tests/offset/shape_type_i/A7
@@ -1,5 +1,7 @@
-puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
-puts "TODO OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
+
 pcone s 5 0 12 270
 
 OFFSETSHAPE 1 {} $calcul $type
diff --git a/tests/offset/shape_type_i/A9 b/tests/offset/shape_type_i/A9
index bb53ff3d3e..d39d83f8d5 100644
--- a/tests/offset/shape_type_i/A9
+++ b/tests/offset/shape_type_i/A9
@@ -1,5 +1,5 @@
-puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
-puts "TODO OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape "
 psphere s 15 -90 60 90
 trotate s 0 0 0 0 0 1 90
 
diff --git a/tests/offset/shape_type_i/B2 b/tests/offset/shape_type_i/B2
index 0818d5f9eb..9c5ef4f516 100644
--- a/tests/offset/shape_type_i/B2
+++ b/tests/offset/shape_type_i/B2
@@ -1,5 +1,7 @@
-puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
-puts "TODO OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
+
 psphere s 15 -90 60 270
 
 OFFSETSHAPE 1 {} $calcul $type
diff --git a/tests/offset/shape_type_i/B3 b/tests/offset/shape_type_i/B3
index b5eb43ddc2..d2c98df9bc 100644
--- a/tests/offset/shape_type_i/B3
+++ b/tests/offset/shape_type_i/B3
@@ -1,6 +1,8 @@
-puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO ?OCC23068 ALL: Error : The area of face "
-puts "TODO OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape "
+puts "TODO ?OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
+
 psphere s 15 -90 60 270
 
 OFFSETSHAPE -1 {} $calcul $type
diff --git a/tests/offset/shape_type_i/B7 b/tests/offset/shape_type_i/B7
index a95e82d855..841cbd361a 100644
--- a/tests/offset/shape_type_i/B7
+++ b/tests/offset/shape_type_i/B7
@@ -1,5 +1,7 @@
-puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-puts "TODO OCC23068 ALL: Error : The volume of the resulting shape"
+puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_2"
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape"
+puts "TODO ?OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
+
 psphere s 15 270
 
 OFFSETSHAPE -1 {} $calcul $type
diff --git a/tests/offset/shape_type_i/C5 b/tests/offset/shape_type_i/C5
index 88de4739ac..6b7a8fdcaa 100644
--- a/tests/offset/shape_type_i/C5
+++ b/tests/offset/shape_type_i/C5
@@ -4,6 +4,7 @@ puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
 puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape is"
 puts "TODO ?OCC23068 ALL: Error : The area of face result_"
+puts "TODO ?OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
diff --git a/tests/offset/shape_type_i/C8 b/tests/offset/shape_type_i/C8
index a336917696..a7d4a68b6c 100644
--- a/tests/offset/shape_type_i/C8
+++ b/tests/offset/shape_type_i/C8
@@ -3,6 +3,7 @@ puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape is"
 puts "TODO ?OCC23068 ALL: \\*\\* Exception"
 puts "TODO ?OCC23068 ALL: An exception was caught"
 puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO ?OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
diff --git a/tests/offset/shape_type_i/F6 b/tests/offset/shape_type_i/F6
index 459f36fe52..62548a99b3 100644
--- a/tests/offset/shape_type_i/F6
+++ b/tests/offset/shape_type_i/F6
@@ -1,4 +1,7 @@
-puts "TODO OCC23068 ALL: Error : The offset is not valid"
+puts "TODO ?OCC23068 ALL: Error : The offset is not valid"
+puts "TODO ?OCC23068 ALL: result is not a topological shape"
+puts "TODO ?OCC24156 ALL: TEST INCOMPLETE"
+
 cpulimit 500
 
 pcone s 9 4 15 270