diff --git a/tests/boolean/volumemaker/A7 b/tests/boolean/volumemaker/A7 index eed93b0929..9defcbd151 100644 --- a/tests/boolean/volumemaker/A7 +++ b/tests/boolean/volumemaker/A7 @@ -3,7 +3,6 @@ puts "TODO OCC26020 ALL: Error: bopcheck failed" puts "TODO OCC26020 ALL: Error : The area of the resulting shape" -puts "TODO OCC26020 Linux: Faulty shapes in variables faulty_1 to faulty_" # planar face plane pln_f1 -1863.18155559 1250 -1538.57262704 1.110223024625157e-016 1 1.1102230246251563e-016 diff --git a/tests/bugs/fclasses/bug670 b/tests/bugs/fclasses/bug670 index b29434c2ea..088c0312b1 100755 --- a/tests/bugs/fclasses/bug670 +++ b/tests/bugs/fclasses/bug670 @@ -1,7 +1,6 @@ # OK: Exception appears and does not kill DRAWEXE (TEST COMPLETED) -puts "TODO OCC670 ALL: An exception was caught" -puts "TODO OCC670 ALL: \\*\\* Exception \\*\\*" -puts "TODO OCC670 ALL: TEST INCOMPLETE" +puts "TODO OCC670 Windows: An exception was caught" +puts "TODO OCC670 Windows: \\*\\* Exception \\*\\*" puts "========" puts "OCC670" diff --git a/tests/bugs/mesh/bug26532 b/tests/bugs/mesh/bug26532 index 6ab8bef745..65234181c1 100644 --- a/tests/bugs/mesh/bug26532 +++ b/tests/bugs/mesh/bug26532 @@ -6,6 +6,22 @@ puts "" # Meshing of edge with minSize parameter leads to incorrect result ####################################################################### +proc xyzList {List N A B} { + set ResultList {} + for {set i 1} {$i <= $N} {incr i} { + set tmpList {} + set x [lindex $List [expr ($A + 0 + $B*$i) ]] + set y [lindex $List [expr ($A + 1 + $B*$i) ]] + set z [lindex $List [expr ($A + 2 + $B*$i) ]] + #puts "i=$i x=$x y=$y z=$z" + lappend tmpList $x + lappend tmpList $y + lappend tmpList $z + lappend ResultList $tmpList + } + return $ResultList +} + restore [locate_data_file bug26533_aal2.brep] a vinit @@ -13,6 +29,7 @@ vdisplay a vfit vdump ${imagedir}/${casename}_1.png +# 1 # with min size # => ugly curve vclear @@ -20,9 +37,85 @@ incmesh a 0.3 -min 0.06 vdisplay a vdump ${imagedir}/${casename}_2.png +set log1 [dump a] + +regexp {Polygon3D with +([-0-9.+eE]+)} $log1 full Nodes1 + +set Index1 [lsearch -exact $log1 "Polygon3D"] +set Index1 [expr ($Index1 + 8)] +set B 5 + +set RL1 [xyzList $log1 $Nodes1 $Index1 $B] +set Length1 [llength $RL1] + +# 2 # without min size # => nice curve +restore [locate_data_file bug26533_aal2.brep] a2 +vdisplay a2 vclear -incmesh a 0.3 -vdisplay a +incmesh a2 0.3 +vdisplay a2 vdump ${imagedir}/${casename}_3.png + +set log2 [dump a2] + +regexp {Polygon3D with +([-0-9.+eE]+)} $log2 full Nodes2 + +set Index2 [lsearch -exact $log2 "Polygon3D"] +set Index2 [expr ($Index2 + 8)] + +set RL2 [xyzList $log2 $Nodes2 $Index2 $B] +set Length2 [llength $RL2] + +# 3. Compare coordinates of Polygon3Dare + +set Tolerance 1.0e-07 + +if {$Length1 != $Length2} { + puts "Error: Numbers of nodes are not equal" +} else { + puts "OK: Numbers of nodes are equal" + set xyzBad 0 + for {set i 0} {$i < $Length1} {incr i} { + set tmpList1 [lindex $RL1 $i] + set x1 [lindex $tmpList1 0] + set y1 [lindex $tmpList1 1] + set z1 [lindex $tmpList1 2] + #puts "x1=$x1 y1=$y1 z1=$z1" + + set tmpList2 [lindex $RL2 $i] + set x2 [lindex $tmpList2 0] + set y2 [lindex $tmpList2 1] + set z2 [lindex $tmpList2 2] + #puts "x2=$x2 y2=$y2 z2=$z2" + + set xBad 0 + set yBad 0 + set zBad 0 + + if { [expr abs($x1 - $x2)] > $Tolerance } { + set xBad 1 + } + if { [expr abs($y1 - $y2)] > $Tolerance } { + set yBad 1 + } + if { [expr abs($z1 - $z2)] > $Tolerance } { + set zBad 1 + } + if { $xBad !=0 && $yBad !=0 && $zBad !=0 } { + set xyzBad 1 + set j [expr ($i + 1)] + puts "Following coordinates are not equal:" + puts "i=$j x1=$x1 y1=$y1 z1=$z1" + puts "i=$j x2=$x2 y2=$y2 z2=$z2" + break + } + + } + if { $xyzBad !=0 } { + puts "Error: Coordinates of Polygon3Dare are not equal" + } else { + puts "OK: Coordinates of Polygon3Dare are equal" + } +} diff --git a/tests/perf/fclasses/handle b/tests/perf/fclasses/handle index af9f6a5d5e..ac43e5bb4d 100644 --- a/tests/perf/fclasses/handle +++ b/tests/perf/fclasses/handle @@ -1,4 +1,3 @@ -puts "TODO OCC26471 Linux: Error: OCCT DownCast is expected to be faster!" puts "TODO OCC24023 ALL: Checking local reference of handle to base type to temporary handle object" puts "========"