0023922: Systematic review of TODO tests

Small corrections for test cases with "TEST INCOMPLETE" result.

TODO statements with "TEST INCOMPLETE" were checked and corrected.

diff --git a/tests/3rdparty/fonts/B1 b/tests/3rdparty/fonts/B1
index 1a310f26f562074709e7178a3fef262eb4186426..f30ae58203f1c0db9e963f2c4e9930452cf65761 100644 (file)
--- a/tests/3rdparty/fonts/B1
+++ b/tests/3rdparty/fonts/B1
@@ -1,7 +1,3 @@
-puts "TODO ?OCC12345 Debian60-64: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 Debian60-64: An exception was caught"
-puts "TODO ?OCC12345 Debian60-64: TEST INCOMPLETE"
-
 puts "============"
 puts "OCC24181 Render text as BRep"
 puts "============"

diff --git a/tests/blend/tolblend_simple/C9 b/tests/blend/tolblend_simple/C9
index b4029adcb5fa9600b44ed0fa13339039da6267f6..a023354b17c35ab6fc6d98b1625cf23edc2fd9d5 100644 (file)
--- a/tests/blend/tolblend_simple/C9
+++ b/tests/blend/tolblend_simple/C9
@@ -1,12 +1,6 @@
-puts "TODO ?OCC22817 All:An exception was caught"
-puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO ?OCC22817 All:TEST INCOMPLETE"
-
 restore [locate_data_file CFI_11_d2ffd.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
 blend result s 20*SCALE1 s_16
-explode result So
-tcopy result_1 result 
 
 set square 1.85726e+06

diff --git a/tests/blend/tolblend_simple/F5 b/tests/blend/tolblend_simple/F5
index 9f82df7be5167d5b4bb6fd6cd9a9a0cfdf89d37b..6f84fc014051541d7efecf79d6fa5592e0aab622 100644 (file)
--- a/tests/blend/tolblend_simple/F5
+++ b/tests/blend/tolblend_simple/F5
@@ -1,12 +1,6 @@
-puts "TODO ?OCC22817 All:An exception was caught"
-puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO ?OCC22817 All:TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_c1ffk.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 4*SCALE1 s_9 5*SCALE1 s_10  6*SCALE1 s_2 4*SCALE1 s_1
-explode result So
-tcopy result_1 result
 
 set square 165055

diff --git a/tests/blend/tolblend_simple/F6 b/tests/blend/tolblend_simple/F6
index 6dab7b7beb74975e75281b0d8bdec04d6b32a467..881f7e58f6614d0afc1c46cdd4d2c6d03afdded9 100644 (file)
--- a/tests/blend/tolblend_simple/F6
+++ b/tests/blend/tolblend_simple/F6
@@ -1,12 +1,6 @@
-puts "TODO ?OCC22817 All:An exception was caught"
-puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO ?OCC22817 All:TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_c1ffk.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 5*SCALE1 s_9 5*SCALE1 s_10  5*SCALE1 s_2
-explode result So
-tcopy result_1 result
 
 set square 165929

diff --git a/tests/blend/tolblend_simple/F9 b/tests/blend/tolblend_simple/F9
index dfa2c7085b7d0df672e89378e4528619eadc116e..0a7ec2d60fd10f9100e796dd1c0f4c9d1fd65a4f 100644 (file)
--- a/tests/blend/tolblend_simple/F9
+++ b/tests/blend/tolblend_simple/F9
@@ -1,12 +1,6 @@
-puts "TODO ?OCC22817 All:An exception was caught"
-puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO ?OCC22817 All:TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_e1ffm.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 5*SCALE1 s_2 5*SCALE1 s_12 5*SCALE1 s_9  5*SCALE1 s_1
-explode result So
-tcopy result_1 result
 
 set square 670347

diff --git a/tests/blend/tolblend_simple/G1 b/tests/blend/tolblend_simple/G1
index dc5b3c7ea6e2aa455c2545923945e8104e41d731..5c02f16f9f881f9113bdfa29774f60523d8d6d1c 100644 (file)
--- a/tests/blend/tolblend_simple/G1
+++ b/tests/blend/tolblend_simple/G1
@@ -1,12 +1,6 @@
-puts "TODO ?OCC22817 All:An exception was caught"
-puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO ?OCC22817 All:TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_e1ffm.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
 blend result s 7*SCALE1 s_2 7*SCALE1 s_12  7*SCALE1 s_1
-explode result So
-tcopy result_1 result
 
 set square 669202

diff --git a/tests/boolean/bsection/N7 b/tests/boolean/bsection/N7
index 94d9f544dfab8e1ac91e1df60f80cf87eaabd10e..6d49a4937bcaffc074d015b3228dc027328369c4 100644 (file)
--- a/tests/boolean/bsection/N7
+++ b/tests/boolean/bsection/N7
@@ -1,8 +1,3 @@
-puts "TODO ?#22911 ALL: An exception was caught"
-puts "TODO ?#22911 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 ALL: Process killed by CPU limit"
-puts "TODO ?#22911 ALL: TEST INCOMPLETE"
-
 cpulimit 1200
 
 restore [locate_data_file lh3d_ro1.brep] a

diff --git a/tests/bugs/fclasses/bug63 b/tests/bugs/fclasses/bug63
index 2c765aa4ba90844a1717190bcfbededf31179115..87bf2e197aed2f9b39a108e04910be07f8e8e157 100755 (executable)
--- a/tests/bugs/fclasses/bug63
+++ b/tests/bugs/fclasses/bug63
@@ -6,9 +6,12 @@ puts "OCC63"
 puts "================"
 puts ""
 
-restore [locate_data_file box__simplifiée.brep] result
-checkshape result
+set s [encoding convertto iso8859-2 "\xE9"]
+set path [locate_data_file box__simplifie.brep]
 
-set 2dviewer 0
+file copy -force "${path}" "${imagedir}/box__simplifi${s}e.brep"
+restore "${imagedir}/box__simplifi${s}e.brep" result
 
+checkshape result
 
+set 2dviewer 0

diff --git a/tests/bugs/modalg_2/bug426 b/tests/bugs/modalg_2/bug426
index 732935b0b9fa482ff8ad6a3b9a60260389db354f..9425e5f311d93030b165e14cb725e30a6883ac10 100755 (executable)
--- a/tests/bugs/modalg_2/bug426
+++ b/tests/bugs/modalg_2/bug426
@@ -2,9 +2,9 @@ if {[array get env os_type] != ""} {
     set os $env(os_type)
 }
 if {[string compare $os "windows"] != 0 } {
-    puts "TODO ?OCC12345 Debian60-64 MacOS: \\*\\* Exception"
-    puts "TODO ?OCC12345 Debian60-64 MacOS: An exception was caught"
-    puts "TODO ?OCC12345 Debian60-64 MacOS: TEST INCOMPLETE"
+    puts "TODO ?OCC12345 MacOS: \\*\\* Exception"
+    puts "TODO ?OCC12345 MacOS: An exception was caught"
+    puts "TODO ?OCC12345 MacOS: TEST INCOMPLETE"
 }
 
 pload QAcommands

diff --git a/tests/bugs/moddata_2/bug2569_2 b/tests/bugs/moddata_2/bug2569_2
index 50ce271b3bb0e88cf7140188b0a184897870f286..6c996849a0ac2ec11649b2ae1da6c7499a91f6b8 100755 (executable)
--- a/tests/bugs/moddata_2/bug2569_2
+++ b/tests/bugs/moddata_2/bug2569_2
@@ -1,6 +1,8 @@
+# Incompleted behavior of test case is OK.
+# Exception should be thrown.
+
 puts "TODO OCC11111 ALL: \\*\\* Exception"
 puts "TODO OCC11111 ALL: An exception was caught"
-puts "TODO OCC11111 ALL: TEST INCOMPLETE"
 
 pload QAcommands
 
@@ -15,6 +17,8 @@ puts ""
 cpulimit 60
 vinit
 
-OCC2569 29 result
-
-set 3dviewer 0
+if { [catch {OCC2569 29 result} anException] } {
+  puts "OCC2569 : OK"
+} else {
+  puts "Error : OCC2569"
+}

diff --git a/tests/bugs/vis/buc60915 b/tests/bugs/vis/buc60915
index f07f01c78fa2deb0e2ab9e31d17abb12b6de2ec3..315ec93cd9c5d72f87cf0a1b19fef38b8851b691 100755 (executable)
--- a/tests/bugs/vis/buc60915
+++ b/tests/bugs/vis/buc60915
@@ -1,9 +1,3 @@
-puts "TODO ?OCC12345 ALL: An exception was caught"
-puts "TODO ?OCC12345 ALL: Error : Colors are not equal in default coordinate and in the near coordinates too"
-puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 ALL: Error : Cannot set the arrow size when using AIS_LengthDimension or AIS_RadiusDimensin."
-puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
-
 puts "==========="
 puts "BUC60915"
 puts "==========="

diff --git a/tests/bugs/vis/pro20342 b/tests/bugs/vis/pro20342
index ebfaeb68f16f05c47c2ca55c2c503cc3d63e49dc..f7964a4094d2de01109cef768471f07e1539ab03 100755 (executable)
--- a/tests/bugs/vis/pro20342
+++ b/tests/bugs/vis/pro20342
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Tcl Exception: result_1 is not a topological shape!!!"
-puts "TODO OCC12345 ALL: TEST INCOMPLETE"
 puts "============="
 puts "PRO20342"
 puts "============="
@@ -13,12 +11,12 @@ pload XDE
 
 igesbrep [locate_data_file fra62523a.igs] result *
 
-checkshape result_1 r
+checkshape result r
 
 vinit
-tclean result_1
-vdisplay result_1
-vsetshading result_1 0.1
+tclean result
+vdisplay result
+vsetshading result 0.1
 vfit
 
 set only_screen 1