From a6844d20f127436945eca64ad8469b17c26db757 Mon Sep 17 00:00:00 2001 From: mkv Date: Mon, 29 Sep 2014 15:28:56 +0400 Subject: [PATCH] Update of testing cases due to changes in issue 23106 --- tests/mesh/data/advanced/A1 | 16 ++++++++-------- tests/mesh/data/standard/A4 | 4 ++-- tests/mesh/data/standard/B3 | 6 ++++-- tests/mesh/data/standard/B9 | 20 ++++++++++---------- tests/mesh/data/standard/C7 | 3 ++- tests/mesh/data/standard/C9 | 6 ++++-- tests/mesh/data/standard/E9 | 7 +++++++ tests/mesh/data/standard/U6 | 12 ++++++------ tests/mesh/data/standard/V4 | 2 +- tests/mesh/data/standard/W4 | 26 +++++++++++++------------- tests/mesh/data/standard/W5 | 4 ++-- 11 files changed, 59 insertions(+), 47 deletions(-) diff --git a/tests/mesh/data/advanced/A1 b/tests/mesh/data/advanced/A1 index 5614b50c71..f075e95ae4 100755 --- a/tests/mesh/data/advanced/A1 +++ b/tests/mesh/data/advanced/A1 @@ -1,11 +1,11 @@ set TheFileName shading_018.brep set bug_withouttri "OCC22687" set nbwithouttri(ALL) 1 -if { [string compare $command "mesh"] != 0 } { - set bug_freenodes "OCC22687" - set nbfreenodes(All) 1 -} -if { [string compare $command "incmesh"] == 0 } { - set bug_freelinks "OCC22687" - set nbfree(All) 2 -} +###if { [string compare $command "mesh"] != 0 } { +### set bug_freenodes "OCC22687" +### set nbfreenodes(All) 1 +###} +###if { [string compare $command "incmesh"] == 0 } { +### set bug_freelinks "OCC22687" +### set nbfree(All) 2 +###} diff --git a/tests/mesh/data/standard/A4 b/tests/mesh/data/standard/A4 index b1c3b4901b..2ffdbcb957 100755 --- a/tests/mesh/data/standard/A4 +++ b/tests/mesh/data/standard/A4 @@ -1,3 +1,3 @@ set TheFileName shading_004.brep -set bug_withouttri "OCC22687" -set nbwithouttri(All) 1 +###set bug_withouttri "OCC22687" +###set nbwithouttri(All) 1 diff --git a/tests/mesh/data/standard/B3 b/tests/mesh/data/standard/B3 index fdb179982c..7c47739ceb 100755 --- a/tests/mesh/data/standard/B3 +++ b/tests/mesh/data/standard/B3 @@ -1,3 +1,5 @@ set TheFileName shading_012.brep -set bug_withouttri "OCC22687" -set nbwithouttri(All) 1 +###set bug_withouttri "OCC22687" +###set nbwithouttri(All) 1 +set bug_freelinks "OCC23106" +set nbfree(All) 4 diff --git a/tests/mesh/data/standard/B9 b/tests/mesh/data/standard/B9 index fabcbe6fae..b5c403183b 100755 --- a/tests/mesh/data/standard/B9 +++ b/tests/mesh/data/standard/B9 @@ -1,13 +1,13 @@ set TheFileName shading_018.brep set bug_withouttri "OCC22687" set nbwithouttri(All) 1 -if { [string compare $command "shading"] == 0 } { - set bug_freenodes "OCC22687" - set nbfreenodes(All) 1 -} -if { [string compare $command "incmesh"] == 0 } { - set bug_freenodes "OCC22687" - set nbfreenodes(All) 1 - set bug_freelinks "OCC22687" - set nbfree(All) 2 -} +###if { [string compare $command "shading"] == 0 } { +### set bug_freenodes "OCC22687" +### set nbfreenodes(All) 1 +###} +###if { [string compare $command "incmesh"] == 0 } { +### set bug_freenodes "OCC22687" +### set nbfreenodes(All) 1 +### set bug_freelinks "OCC22687" +### set nbfree(All) 2 +###} diff --git a/tests/mesh/data/standard/C7 b/tests/mesh/data/standard/C7 index 8e35dc3894..7ef98b8187 100755 --- a/tests/mesh/data/standard/C7 +++ b/tests/mesh/data/standard/C7 @@ -6,7 +6,8 @@ if { [string compare $command "shading"] == 0 } { set bug_freelinks "OCC23105" ### set nbfree(ALL) 4 if { [string compare $command "mesh"] == 0 } { - set nbfree(ALL) 8 +### set nbfree(ALL) 8 ### OCC23106 + set nbfree(ALL) 2 } else { set nbfree(ALL) 2 } diff --git a/tests/mesh/data/standard/C9 b/tests/mesh/data/standard/C9 index 3621a9f3da..bf6e37dd45 100755 --- a/tests/mesh/data/standard/C9 +++ b/tests/mesh/data/standard/C9 @@ -1,5 +1,7 @@ set TheFileName shading_027.brep ##if { [string compare $command "shading"] != 0 } { - set bug_freenodes "OCC23105" - set nbfreenodes(All) 3 +## set bug_freenodes "OCC23105" +## set nbfreenodes(All) 3 ##} +set bug_withouttri "OCC23106" +set nbwithouttri(All) 1 diff --git a/tests/mesh/data/standard/E9 b/tests/mesh/data/standard/E9 index dc7eeaa6b0..2fb6436508 100755 --- a/tests/mesh/data/standard/E9 +++ b/tests/mesh/data/standard/E9 @@ -1 +1,8 @@ set TheFileName shading_045.brep +set bug_freenodes "OCC23106" +set nbfreenodes(All) 3 +if { [string compare $command "shading"] == 0 && [string compare $group "standard"] == 0} { + set nbfreenodes(All) 7 + set bug_freelinks "OCC23106" + set nbfree(All) 2 +} diff --git a/tests/mesh/data/standard/U6 b/tests/mesh/data/standard/U6 index 95d2eb9c95..e91b4fcddf 100755 --- a/tests/mesh/data/standard/U6 +++ b/tests/mesh/data/standard/U6 @@ -1,9 +1,9 @@ set TheFileName shading_wrongshape_008.brep set bug_withouttri "OCC22687" set nbwithouttri(All) 2 -set bug_freelinks "OCC22687" -if { [string compare $command "shading"] == 0 } { - set nbfree(All) 8 -} else { - set nbfree(All) 16 -} +###set bug_freelinks "OCC22687" +###if { [string compare $command "shading"] == 0 } { +### set nbfree(All) 8 +###} else { +### set nbfree(All) 16 +###} diff --git a/tests/mesh/data/standard/V4 b/tests/mesh/data/standard/V4 index 1a567def76..fbef7882b8 100755 --- a/tests/mesh/data/standard/V4 +++ b/tests/mesh/data/standard/V4 @@ -4,4 +4,4 @@ if { [string compare $command "shading"] != 0 } { set bug_freenodes "OCC23105" set nbfreenodes(ALL) 4 } -set nbwithouttri(All) 5 +set nbwithouttri(All) 7 diff --git a/tests/mesh/data/standard/W4 b/tests/mesh/data/standard/W4 index c270c7f18a..aee1bcae77 100755 --- a/tests/mesh/data/standard/W4 +++ b/tests/mesh/data/standard/W4 @@ -17,19 +17,19 @@ if { [string compare $command "shading"] == 0 } { set nbfreenodes(ALL) 2 set nbwithouttri(ALL) 5 } -if { [string compare $command "mesh"] == 0 } { - set os "ALL" - if {[array get env os_type] != ""} { - set os $env(os_type) - } - set bug_freelinks "OCC22687" - if {[string compare $os "Mandriva2008"] == 0 || [string compare $os "MacOS"] == 0 || [string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian40"] == 0 || [string compare $os "Debian60-64"] == 0 || [string compare $os "windows"] == 0} { - set nb 4 - } else { - set nb 6 - } - set nbfree($os) $nb -} +###if { [string compare $command "mesh"] == 0 } { +### set os "ALL" +### if {[array get env os_type] != ""} { +### set os $env(os_type) +### } +### set bug_freelinks "OCC22687" +### if {[string compare $os "Mandriva2008"] == 0 || [string compare $os "MacOS"] == 0 || [string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian40"] == 0 || [string compare $os "Debian60-64"] == 0 || [string compare $os "windows"] == 0} { +### set nb 4 +### } else { +### set nb 6 +### } +### set nbfree($os) $nb +###} ###if { [string compare $command "shading"] == 0 } { ### set bug_freelinks "OCC22687" ### set nbfree(ALL) 2 diff --git a/tests/mesh/data/standard/W5 b/tests/mesh/data/standard/W5 index 586c0fadce..7c555dd9a1 100755 --- a/tests/mesh/data/standard/W5 +++ b/tests/mesh/data/standard/W5 @@ -4,12 +4,12 @@ set rel_tol 36.8 set bug_withouttri "OCC22687" set bug_cross "OCC22687" if { [string compare $command "shading"] == 0 } { - set nbwithouttri(All) 91 + set nbwithouttri(All) 90 set nbcross(All) 12 set bug_freenodes "OCC22687" set nbfreenodes(All) 10 } else { - set nbwithouttri(All) 91 + set nbwithouttri(All) 90 set nbcross(All) 11 set bug_freenodes "OCC23473" set nbfreenodes(All) 11 -- 2.20.1