Adjusting testing cases for current state of OCCT

tests/boolean/bfuse_complex/C4

@@ -1,4 +1,4 @@
-puts "TODO #22911 ALL: Error : The area of the resulting shape is"
+puts "TODO ?#22911 ALL: Error : The area of the resulting shape is"
 
 restore [locate_data_file box.brep] b
 restore [locate_data_file c2.brep] c

tests/boolean/bfuse_complex/C5

@@ -1,4 +1,4 @@
-puts "TODO #22911 ALL: Error : The area of the resulting shape is"
+puts "TODO ?#22911 ALL: Error : The area of the resulting shape is"
 
 restore [locate_data_file c2.brep] c
 restore [locate_data_file box.brep] b

tests/boolean/bsection/M9

@@ -1,3 +1,7 @@
+puts "TODO #23749 ALL: Exception"
+puts "TODO #23749 ALL: An exception was caught"
+puts "TODO #23749 ALL: TEST INCOMPLETE"
+
 restore [locate_data_file lh3d_px1.brep] a
 
 #removing intersection of faces a_3 and a_220

tests/boolean/bsection/N4

@@ -1,3 +1,5 @@
+puts "TODO #23749 ALL: Faulty shapes in variables faulty_1 to faulty_"
+
 cpulimit 2000
 restore [locate_data_file lh3d_px2.brep] a
 compound result

tests/boolean/bsection/N7

@@ -5,8 +5,6 @@ if { [string compare $os "windows"] == 0 } {
 	puts "TODO #22911 ALL: An exception was caught"
 	puts "TODO #22911 ALL: \\*\\* Exception \\*\\*.*"
 	puts "TODO #22911 ALL: TEST INCOMPLETE"
-} else {
-	puts "TODO #22911 ALL: TEST INCOMPLETE"
 }
 
 cpulimit 900

tests/bugs/begin

@@ -234,7 +234,7 @@ proc checktrend {listval delta tolerance message} {
     # check if deviation is definitely too big
     if { abs ($mean - $delta) > 2. * $sigma } {
         puts "Checking trend failed: mean delta per step = $mean, sigma = $sigma, expected delta = $delta"
-        error $message
+        puts "Error : $message"
     }
 
     # check if deviation is clearly within a range

tests/bugs/fclasses/bug309

@@ -23,8 +23,10 @@ if { ${ll} != 2 } {
 	set res1 [ string range $result1 1 [expr [string length $result1] -3 ] ]
 	set res2 [ string range $result2 1 [expr [string length $result2] -3 ] ]
     } else {
-	set res1 [ string range $result1 1 [expr [string length $result1] -2 ] ]
+	set res1 [ string range $result1 3 [expr [string length $result1] -2 ] ]
-	set res2 [ string range $result2 1 [expr [string length $result2] -2 ] ]
+	set res2 [ string range $result2 3 [expr [string length $result2] -2 ] ]
+	set CurrentDirectory [ string range $CurrentDirectory 2 [expr [string length $CurrentDirectory] -1 ]]
+	set UpTrek [ string range $UpTrek 2 [expr [string length $UpTrek] -1 ]]
     }
     if {[string compare ${res1} "${CurrentDirectory}"] == 0} {
 	puts "OCC309: OK 1"

tests/bugs/modalg_1/buc60409_1

@@ -1,3 +1,4 @@
+puts "TODO #23659 Mandriva2010: Error : The square of result shape is"
 
 puts "=============="
 puts "   BUC60409   "

tests/bugs/modalg_1/buc60409_2

@@ -1,3 +1,4 @@
+puts "TODO #23659 Mandriva2010: Error : The square of result shape is"
 
 puts "============="
 puts "   BUC60409  "

tests/bugs/modalg_1/buc60409_3

@@ -1,3 +1,5 @@
+puts "TODO #23659 Mandriva2010: Error : The square of result shape is"
+puts "TODO #23659 Mandriva2010: Error : The command is not valid. The square is"
 
 puts "================="
 puts "     BUC60409    "

tests/bugs/modalg_1/bug19793_2

@@ -6,7 +6,7 @@ puts ""
 # Fuse problem of symetrical shapes. Appendix for NPAL19789
 #######################################################################
 
-cpulimit 100
+cpulimit 1000
 #cpulimit 4500
 set BugNumber OCC19793
 

tests/bugs/modalg_4/bug6272_6

@@ -1,4 +1,5 @@
 puts "TODO OCC11111 ALL: Error : The square of result shape is"
+puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
 
 puts "============"
 puts "OCC6272"

tests/bugs/modalg_4/bug8842_5

@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC11111 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
 puts "TODO OCC11111 ALL: Error : The square of result shape is"
 

tests/bugs/moddata_1/bug152_2

@@ -1,5 +1,5 @@
 # by apn master-master 03.12.2012
-puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_"
+#puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO OCC12345 ALL: Error : The square of result shape is"
 #puts "TODO OCC12345 ALL: An exception was caught"
 #puts "TODO OCC12345 ALL: \\*\\* Exception \\*\\*.*"

tests/bugs/moddata_2/bug22802

@@ -1,71 +0,0 @@
-pload QAcommands
-
-puts "==========="
-puts "OCC22802"
-puts "==========="
-puts ""
-#######################################################################
-#  The memory alloccated with an excess is not released
-#######################################################################
-
-set BugNumber OCC22802
-
-set log [bcarray]
-
-#
-#state before release the unused memory
-#Length: 10
-#FactLength: 100000
-#BlockLength: 100000
-#
-#state after release the unused memory
-#Length: 10
-#FactLength: 10
-#BlockLength: 100000
-#
-
-set linelist [split $log "\n"]
-
-set il 0
-set ifl 0
-set ibl 0
-
-set xl_0 0
-set xl_1 0
-set xfl_0 0
-set xfl_1 0
-set xbl_0 0
-set xbl_1 0
-
-foreach line $linelist {
-    if { [regexp {^Length: ([-0-9.+eE]+)} $line full xl_$il] } { incr il }
-    if { [regexp {FactLength: ([-0-9.+eE]+)} $line full xfl_$ifl] } { incr ifl }
-    if { [regexp {BlockLength: ([-0-9.+eE]+)} $line full xbl_$ibl] } { incr ibl }
-}
-
-set status 0
-if { ${xl_0} != 10} {
-  incr status
-}
-if { ${xfl_0} != 100000} {
-  incr status
-}
-if { ${xbl_0} != 100000} {
-  incr status
-}
-if { ${xl_1} != 10} {
-  incr status
-}
-if { ${xfl_1} != 10} {
-  incr status
-}
-if { ${xbl_1} != 100000} {
-  incr status
-}
-
-if { ${status} != 0} {
-  puts "Faulty ${BugNumber}"
-} else {
-  puts "${BugNumber}  OK"
-}
-

tests/bugs/moddata_2/bug469

@@ -1,12 +1,5 @@
-if { [array get env os_type] != "" } {
+puts "TODO OCC12345 ALL: An exception was caught"
-    set os $env(os_type)
+puts "TODO OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-}
-if { [string compare $os "windows"] == 0 } {
-    puts "TODO OCC12345 ALL: An exception was caught"
-    puts "TODO OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-} else {
-    puts "TODO OCC12345 ALL: Tcl Exception: result is not a topological shape!!!"
-}
 puts "TODO OCC12345 ALL: TEST INCOMPLETE"
 
 puts "========================"

tests/draft/angle/E5

@@ -1,3 +1,5 @@
+puts "TODO #23667 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_"
+
 #C2----------------------------------------------
 puts "TODO #23211 Debian40: Error: The tolerance of result shape is too big"
 

tests/offset/faces_type_i/C9

@@ -1,5 +1,8 @@
-puts "TODO OCC23068 ALL: Error : The offset is not valid"
+puts "TODO ?OCC23068 ALL: Error : The area of face result_3 of the resulting shape is negative."
-puts "TODO OCC23068 ALL: Error : The area of face result_3 of the resulting shape is negative."
+puts "TODO ?OCC23068 ALL: Error : The offset is not valid."
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape is"
+puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+
 psphere s 15 270
 
 OFFSETSHAPE 1 {s_2} $calcul $type

tests/offset/faces_type_i/E7

@@ -1,19 +1,6 @@
-set os "ALL"
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-if {[array get env os_type] != ""} {
+puts "TODO OCC23068 ALL: Error : The offset is not valid. "
-  set os $env(os_type)
+puts "TODO OCC23068 ALL: Error : The area of face result_5 of the resulting shape is negative."
-}
-
-if {
-       [string compare $os "Mandriva2010"] == 0
-   } {
-  puts "TODO OCC23068 $os: An exception was caught"
-  puts "TODO OCC23068 $os: \\*\\* Exception \\*\\*"
-  puts "TODO OCC23068 $os: TEST INCOMPLETE"
-} else {
-  puts "TODO OCC23068 $os: Faulty shapes in variables faulty_1 to faulty_1"
-  puts "TODO OCC23068 $os: Error : The offset is not valid. "
-  puts "TODO OCC23068 $os: Error : The area of face result_5 of the resulting shape is negative."
-}
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

tests/offset/faces_type_i/F1

@@ -1,4 +1,7 @@
-puts "TODO OCC23068 ALL: Error : The offset is not valid"
+puts "TODO OCC23068 ALL: Exception"
+puts "TODO OCC23068 ALL: An exception was caught"
+puts "TODO OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO ?OCC23068 ALL: Error : The offset is not valid"
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

tests/offset/faces_type_i/F2

@@ -1,19 +1,6 @@
-set os "ALL"
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-if {[array get env os_type] != ""} {
+puts "TODO OCC23068 ALL: Error : The offset is not valid. "
-  set os $env(os_type)
+puts "TODO OCC23068 ALL: Error : The area of face result_5 of the resulting shape is negative."
-}
-
-if {
-       [string compare $os "Mandriva2010"] == 0
-   } {
-  puts "TODO OCC23068 $os: An exception was caught"
-  puts "TODO OCC23068 $os: \\*\\* Exception \\*\\*"
-  puts "TODO OCC23068 $os: TEST INCOMPLETE"
-} else {
-  puts "TODO OCC23068 $os: Faulty shapes in variables faulty_1 to faulty_1"
-  puts "TODO OCC23068 $os: Error : The offset is not valid. "
-  puts "TODO OCC23068 $os: Error : The area of face result_5 of the resulting shape is negative."
-}
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

tests/offset/shape_type_i/C5

@@ -1,18 +1,6 @@
-set os "ALL"
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
-if {[array get env os_type] != ""} {
+puts "TODO OCC23068 ALL: Error : The volume of the resulting shape is"
-  set os $env(os_type)
+puts "TODO ?OCC23068 ALL: Error : The area of face result_3 of the resulting shape is negative."
-}
-
-if {
-       [string compare $os "Mandriva2010"] == 0
-   } {
-  puts "TODO OCC23068 $os: An exception was caught"
-  puts "TODO OCC23068 $os: \\*\\* Exception \\*\\*"
-  puts "TODO OCC23068 $os: TEST INCOMPLETE"
-} else {
-  puts "TODO OCC23068 $os: Faulty shapes in variables faulty_1 to faulty_2"
-  puts "TODO OCC23068 $os: Error : The volume of the resulting shape is"
-}
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

tests/offset/shape_type_i/C6

@@ -1,3 +1,7 @@
+puts "TODO ?OCC23068 ALL: Exception"
+puts "TODO ?OCC23068 ALL: An exception was caught"
+puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
+
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90

tests/offset/shape_type_i/C8

@@ -1,5 +1,8 @@
 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: 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"
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2