From b7a3c4704b13359c3b9fcf92d5feae4707bf4d50 Mon Sep 17 00:00:00 2001 From: ski Date: Mon, 11 Feb 2013 17:27:02 +0400 Subject: [PATCH] Adjusting testing cases for current state of OCCT --- tests/boolean/bfuse_complex/C4 | 2 +- tests/boolean/bfuse_complex/C5 | 2 +- tests/boolean/bsection/M9 | 4 ++ tests/boolean/bsection/N4 | 2 + tests/boolean/bsection/N7 | 2 - tests/bugs/begin | 2 +- tests/bugs/fclasses/bug309 | 6 ++- tests/bugs/modalg_1/buc60409_1 | 1 + tests/bugs/modalg_1/buc60409_2 | 1 + tests/bugs/modalg_1/buc60409_3 | 2 + tests/bugs/modalg_1/bug19793_2 | 2 +- tests/bugs/modalg_4/bug6272_6 | 1 + tests/bugs/modalg_4/bug8842_5 | 2 +- tests/bugs/moddata_1/bug152_2 | 2 +- tests/bugs/moddata_2/bug22802 | 71 ---------------------------------- tests/bugs/moddata_2/bug469 | 11 +----- tests/draft/angle/E5 | 2 + tests/offset/faces_type_i/C9 | 7 +++- tests/offset/faces_type_i/E7 | 19 ++------- tests/offset/faces_type_i/F1 | 5 ++- tests/offset/faces_type_i/F2 | 19 ++------- tests/offset/shape_type_i/C5 | 18 ++------- tests/offset/shape_type_i/C6 | 4 ++ tests/offset/shape_type_i/C8 | 5 ++- 24 files changed, 51 insertions(+), 141 deletions(-) delete mode 100755 tests/bugs/moddata_2/bug22802 diff --git a/tests/boolean/bfuse_complex/C4 b/tests/boolean/bfuse_complex/C4 index 7b59940b26..e26e90b54e 100644 --- a/tests/boolean/bfuse_complex/C4 +++ b/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 diff --git a/tests/boolean/bfuse_complex/C5 b/tests/boolean/bfuse_complex/C5 index 44ec6b0074..d1f52a42c4 100644 --- a/tests/boolean/bfuse_complex/C5 +++ b/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 diff --git a/tests/boolean/bsection/M9 b/tests/boolean/bsection/M9 index ba5db053a2..84a9438742 100644 --- a/tests/boolean/bsection/M9 +++ 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 diff --git a/tests/boolean/bsection/N4 b/tests/boolean/bsection/N4 index 7ec02410be..2f11b6f716 100644 --- a/tests/boolean/bsection/N4 +++ b/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 diff --git a/tests/boolean/bsection/N7 b/tests/boolean/bsection/N7 index f31c3ced41..3a52c7c63f 100644 --- a/tests/boolean/bsection/N7 +++ b/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 diff --git a/tests/bugs/begin b/tests/bugs/begin index 4f81908102..1135b9c903 100755 --- a/tests/bugs/begin +++ b/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 diff --git a/tests/bugs/fclasses/bug309 b/tests/bugs/fclasses/bug309 index 31a4dbe056..aefd53a6ee 100644 --- a/tests/bugs/fclasses/bug309 +++ b/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 res2 [ string range $result2 1 [expr [string length $result2] -2 ] ] + set res1 [ string range $result1 3 [expr [string length $result1] -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" diff --git a/tests/bugs/modalg_1/buc60409_1 b/tests/bugs/modalg_1/buc60409_1 index 1aceec9594..85ca4d6e0d 100755 --- a/tests/bugs/modalg_1/buc60409_1 +++ b/tests/bugs/modalg_1/buc60409_1 @@ -1,3 +1,4 @@ +puts "TODO #23659 Mandriva2010: Error : The square of result shape is" puts "==============" puts " BUC60409 " diff --git a/tests/bugs/modalg_1/buc60409_2 b/tests/bugs/modalg_1/buc60409_2 index 3ebd2a1c27..9b4afe8621 100755 --- a/tests/bugs/modalg_1/buc60409_2 +++ b/tests/bugs/modalg_1/buc60409_2 @@ -1,3 +1,4 @@ +puts "TODO #23659 Mandriva2010: Error : The square of result shape is" puts "=============" puts " BUC60409 " diff --git a/tests/bugs/modalg_1/buc60409_3 b/tests/bugs/modalg_1/buc60409_3 index 824156f38d..5716aa35db 100755 --- a/tests/bugs/modalg_1/buc60409_3 +++ b/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 " diff --git a/tests/bugs/modalg_1/bug19793_2 b/tests/bugs/modalg_1/bug19793_2 index 02a47794e3..e63f57eb3c 100755 --- a/tests/bugs/modalg_1/bug19793_2 +++ b/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 diff --git a/tests/bugs/modalg_4/bug6272_6 b/tests/bugs/modalg_4/bug6272_6 index 2d85e74eaf..625b1e9e32 100755 --- a/tests/bugs/modalg_4/bug6272_6 +++ b/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" diff --git a/tests/bugs/modalg_4/bug8842_5 b/tests/bugs/modalg_4/bug8842_5 index 4654a2d084..eb584c7d25 100755 --- a/tests/bugs/modalg_4/bug8842_5 +++ b/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" diff --git a/tests/bugs/moddata_1/bug152_2 b/tests/bugs/moddata_1/bug152_2 index 0c791b30ff..0c10d04e9b 100755 --- a/tests/bugs/moddata_1/bug152_2 +++ b/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 \\*\\*.*" diff --git a/tests/bugs/moddata_2/bug22802 b/tests/bugs/moddata_2/bug22802 deleted file mode 100755 index bf4b864fc1..0000000000 --- a/tests/bugs/moddata_2/bug22802 +++ /dev/null @@ -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" -} - diff --git a/tests/bugs/moddata_2/bug469 b/tests/bugs/moddata_2/bug469 index 75472b6a97..9ba507b6a8 100755 --- a/tests/bugs/moddata_2/bug469 +++ b/tests/bugs/moddata_2/bug469 @@ -1,12 +1,5 @@ -if { [array get env os_type] != "" } { - set os $env(os_type) -} -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: An exception was caught" +puts "TODO OCC12345 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC12345 ALL: TEST INCOMPLETE" puts "========================" diff --git a/tests/draft/angle/E5 b/tests/draft/angle/E5 index c6077e576e..a74e2de1a6 100644 --- a/tests/draft/angle/E5 +++ b/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" diff --git a/tests/offset/faces_type_i/C9 b/tests/offset/faces_type_i/C9 index 837284bca4..6ae74f1068 100644 --- a/tests/offset/faces_type_i/C9 +++ b/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 diff --git a/tests/offset/faces_type_i/E7 b/tests/offset/faces_type_i/E7 index 4bc7c02d91..34e252452b 100755 --- a/tests/offset/faces_type_i/E7 +++ b/tests/offset/faces_type_i/E7 @@ -1,19 +1,6 @@ -set os "ALL" -if {[array get env os_type] != ""} { - set os $env(os_type) -} - -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." -} +puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_1" +puts "TODO OCC23068 ALL: Error : The offset is not valid. " +puts "TODO OCC23068 ALL: 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 diff --git a/tests/offset/faces_type_i/F1 b/tests/offset/faces_type_i/F1 index de2eb55465..1e1e2e452a 100644 --- a/tests/offset/faces_type_i/F1 +++ b/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 diff --git a/tests/offset/faces_type_i/F2 b/tests/offset/faces_type_i/F2 index de985e44dd..c604efce0e 100755 --- a/tests/offset/faces_type_i/F2 +++ b/tests/offset/faces_type_i/F2 @@ -1,19 +1,6 @@ -set os "ALL" -if {[array get env os_type] != ""} { - set os $env(os_type) -} - -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." -} +puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_1" +puts "TODO OCC23068 ALL: Error : The offset is not valid. " +puts "TODO OCC23068 ALL: 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 diff --git a/tests/offset/shape_type_i/C5 b/tests/offset/shape_type_i/C5 index f4fa1914bc..b3a5885948 100644 --- a/tests/offset/shape_type_i/C5 +++ b/tests/offset/shape_type_i/C5 @@ -1,18 +1,6 @@ -set os "ALL" -if {[array get env os_type] != ""} { - set os $env(os_type) -} - -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" -} +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_3 of the resulting shape is negative." ellipse w1 0 0 0 15 10 mkedge w1 w1 0 pi/2 diff --git a/tests/offset/shape_type_i/C6 b/tests/offset/shape_type_i/C6 index e6f185d87e..e5d52aaf29 100644 --- a/tests/offset/shape_type_i/C6 +++ b/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 diff --git a/tests/offset/shape_type_i/C8 b/tests/offset/shape_type_i/C8 index f762d0486d..a769580d0e 100644 --- a/tests/offset/shape_type_i/C8 +++ b/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