Adjusting testing cases for current state of OCCT

diff --git a/tests/bugs/fclasses/bug23192_1 b/tests/bugs/fclasses/bug23192_1
index 9443460b916fdb38130c2fb1aa36d78c97b8e9c9..be5324df5559cebcb5b159eb09b7846f356e61cc 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 dc37bd733c807d6ce4ee1d31d26ff9c5cde2ace7..7e54e964db7bfa08c6813cbfe2acd448ad5f3f6a 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 936491c57a9df463b8df862110581bea5361b98c..2934f0934cd6f1b2c4b2e0b8aaf2ddb2801a60af 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 de769e641dc8a883e7e6117e211a18db2cb52996..d787ba1c3628ccfaa8192eae4817e6ff61879881 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 dddbbae5243bf9dfd35ca7a30b1ea548dbe48dae..a31a9af828ef6b83040f692417bdf2715694c7e5 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 8f807f4a87faf9e422b950625dfb3dc302d2b3b3..b964c21dabf2b844243f4c220845b880af4d7f47 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 377e28e79ff47f7b33492f13f5e0f41fd6fad848..c849c1941dc991e5e7d3626a2c1b7c2baaf8d81d 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 2148c26f043db4decb334f6eea6bc7578ed825e9..7d85648effa1f4801dc73b42f0a9799037d2ad57 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 64a59bb2bc17c0e5b08b52579eb4763b5bd974a9..13e6d29e2243648f53e4ba0bbc24ca461e510563 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 db2ebaf050fa0241b757a6f5f802346dcb085c22..e53d41f4e60054ecb970a56b2cff0e73ebe844c0 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 895451a887f62a9274074fe2bdce714ef7e03e30..1b0a8094fbf0ccc116b3bdb44c8e10efdbf5cd8b 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 38cf6a60fbe5401317af8ce283f958781c292bb1..244c209106a4479a6dcb2ab65b0efbcc4d513d9b 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 6a613ea21a10be7e3af4e32733f1b25c3f62b222..4bc7c02d913fac10bc3f0e6fe534e796874efd36 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