Adjusting testing cases for current state of OCCT

diff --git a/tests/bugs/fclasses/bug23192_1 b/tests/bugs/fclasses/bug23192_1
index 9443460..be5324d 100755 (executable)
--- a/tests/bugs/fclasses/bug23192_1
+++ b/tests/bugs/fclasses/bug23192_1
@@ -11,7 +11,7 @@ catch { pload XDE }
 set BugNumber OCC23192
 
 set aFile $imagedir/${test_image}.stl
-catch {exec rm -f ${aFile}}
+file delete ${aFile}
 
 set anASCIImode 1
 set InParallel 0
@@ -36,11 +36,7 @@ set nb_shape_good 51
 
   # Check file size
   set size_status 0
-  if [string compare $tcl_platform(platform) "windows"] {
-       set filesize [lindex [exec ls -l ${aFile}] 5]
-  } else {
-       set filesize [lindex [exec ls -l ${aFile}] 4]
-  }
+  set filesize [ file size ${aFile} ]
   if { ${filesize} != 0 } {
      set size_status 0
   } else {

diff --git a/tests/bugs/fclasses/bug23192_2 b/tests/bugs/fclasses/bug23192_2
index dc37bd7..7e54e96 100755 (executable)
--- a/tests/bugs/fclasses/bug23192_2
+++ b/tests/bugs/fclasses/bug23192_2
@@ -11,7 +11,7 @@ catch { pload XDE }
 set BugNumber OCC23192
 
 set aFile $imagedir/${test_image}.stl
-catch {exec rm -f ${aFile}}
+file delete ${aFile}
 
 set anASCIImode 0
 set InParallel 0
@@ -36,11 +36,7 @@ set nb_shape_good 51
 
   # Check file size
   set size_status 0
-  if [string compare $tcl_platform(platform) "windows"] {
-    set filesize [lindex [exec ls -l ${aFile}] 5]
-  } else {
-    set filesize [lindex [exec ls -l ${aFile}] 4]
-  }
+  set filesize [ file size ${aFile} ]
   if { ${filesize} != 0 } {
      set size_status 0
   } else {
@@ -58,3 +54,4 @@ set nb_shape_good 51
 
 set square 600
 set 3dviewer 0
+

diff --git a/tests/bugs/vis/buc60574 b/tests/bugs/vis/buc60574
index 936491c..2934f09 100755 (executable)
--- a/tests/bugs/vis/buc60574
+++ b/tests/bugs/vis/buc60574
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "==========="

diff --git a/tests/bugs/vis/buc60632_1 b/tests/bugs/vis/buc60632_1
index de769e6..d787ba1 100755 (executable)
--- a/tests/bugs/vis/buc60632_1
+++ b/tests/bugs/vis/buc60632_1
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "================"

diff --git a/tests/bugs/vis/buc60632_2 b/tests/bugs/vis/buc60632_2
index dddbbae..a31a9af 100755 (executable)
--- a/tests/bugs/vis/buc60632_2
+++ b/tests/bugs/vis/buc60632_2
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "================"

diff --git a/tests/bugs/vis/bug597_1 b/tests/bugs/vis/bug597_1
index 8f807f4..b964c21 100755 (executable)
--- a/tests/bugs/vis/bug597_1
+++ b/tests/bugs/vis/bug597_1
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="

diff --git a/tests/bugs/vis/bug597_2 b/tests/bugs/vis/bug597_2
index 377e28e..c849c19 100755 (executable)
--- a/tests/bugs/vis/bug597_2
+++ b/tests/bugs/vis/bug597_2
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="

diff --git a/tests/bugs/vis/bug597_3 b/tests/bugs/vis/bug597_3
index 2148c26..7d85648 100755 (executable)
--- a/tests/bugs/vis/bug597_3
+++ b/tests/bugs/vis/bug597_3
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="

diff --git a/tests/bugs/vis/bug597_4 b/tests/bugs/vis/bug597_4
index 64a59bb..13e6d29 100755 (executable)
--- a/tests/bugs/vis/bug597_4
+++ b/tests/bugs/vis/bug597_4
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="

diff --git a/tests/bugs/vis/bug597_5 b/tests/bugs/vis/bug597_5
index db2ebaf..e53d41f 100755 (executable)
--- a/tests/bugs/vis/bug597_5
+++ b/tests/bugs/vis/bug597_5
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="

diff --git a/tests/bugs/vis/bug597_6 b/tests/bugs/vis/bug597_6
index 895451a..1b0a809 100755 (executable)
--- a/tests/bugs/vis/bug597_6
+++ b/tests/bugs/vis/bug597_6
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="

diff --git a/tests/bugs/vis/bug597_7 b/tests/bugs/vis/bug597_7
index 38cf6a6..244c209 100755 (executable)
--- a/tests/bugs/vis/bug597_7
+++ b/tests/bugs/vis/bug597_7
@@ -2,9 +2,9 @@ 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 \\*\\*.*"
-   puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+   puts "TODO ?OCC12345 ALL: An exception was caught"
+   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 

diff --git a/tests/offset/faces_type_i/E7 b/tests/offset/faces_type_i/E7
index 6a613ea..4bc7c02 100755 (executable)
--- a/tests/offset/faces_type_i/E7
+++ b/tests/offset/faces_type_i/E7
@@ -12,7 +12,7 @@ if {
 } 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 : Thr area of face result_5 of the resulting shape is negative."
+  puts "TODO OCC23068 $os: Error : The area of face result_5 of the resulting shape is negative."
 }
 
 ellipse w1 0 0 0 15 10