0023788: OCCT tests don't catch Naming failures

Test corrections for catch Naming failure

diff --git a/tests/caf/driver/A1 b/tests/caf/driver/A1
index 8f13d7954dc570d86712d0a05e5c81560d91dc78..3b878197547ab312e17df4eb5f5667e2291857c3 100755 (executable)
--- a/tests/caf/driver/A1
+++ b/tests/caf/driver/A1
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 #1 - create box using more flexible set of commands
 NewCommand D
 set B2 [AddObject D];                  ## add object

diff --git a/tests/caf/driver/A2 b/tests/caf/driver/A2
index a2ca503912dce1409eebc1b12057f55a6a97b6c9..6594debcbd25242a39c6b7f934e39070efe9a9f7 100755 (executable)
--- a/tests/caf/driver/A2
+++ b/tests/caf/driver/A2
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|Revol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
 # order of functions recomputation should be defined out of the tool (by end user)

diff --git a/tests/caf/driver/A3 b/tests/caf/driver/A3
index 4055a0908a4e1de6dbc6e8838fe6206c624348db..ae737e02d3bcd6823b5cd1adf4a7fa4c2dde3662 100755 (executable)
--- a/tests/caf/driver/A3
+++ b/tests/caf/driver/A3
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 #1 Box creation
 NewCommand D

diff --git a/tests/caf/driver/A4 b/tests/caf/driver/A4
index 16464455e0cccf6ca742b833991b0df5fe781cf1..6dc78b729e6f3ca4c07e22da6c0c26208c6e7208 100755 (executable)
--- a/tests/caf/driver/A4
+++ b/tests/caf/driver/A4
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 
 #1 Create Box

diff --git a/tests/caf/driver/A5 b/tests/caf/driver/A5
index 8b5aca2946a49060d1c36933722184a4dd11b329..61b8deb39ae3af41359344552998b2a22b633e13 100755 (executable)
--- a/tests/caf/driver/A5
+++ b/tests/caf/driver/A5
@@ -1,3 +1,4 @@
+puts "TODO ?CR23788 ALL: Failed units"
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 
 #1 Create Box

diff --git a/tests/caf/driver/A6 b/tests/caf/driver/A6
index 24c08bd5513ff81c0910b3c88e76875b7d1a63dd..127e7cde67720d23e451efbb6327672c7d2f84fd 100755 (executable)
--- a/tests/caf/driver/A6
+++ b/tests/caf/driver/A6
@@ -1,3 +1,4 @@
+puts "TODO ?CR23788 ALL: Failed units"
 #1 - create Box using short-cut
 NewCommand D
 AddDriver D Box;                       ## add box driver to driver table

diff --git a/tests/caf/driver/A7 b/tests/caf/driver/A7
index 5f27b06d69ddd9a31484c686ced10e3b7f7d6d97..a9dd32d151c9f4a603a1b9b54d37fd85a80ef388 100755 (executable)
--- a/tests/caf/driver/A7
+++ b/tests/caf/driver/A7
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|SecRevol|FulRevol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
 # order of functions recomputation should be defined out of the tool (by end user)
@@ -118,4 +120,4 @@ NewCommand D
 #set SPnt1 [AttachShape D Box2_1 ${B2} ${B2}]
 #set Sph1 [AddSphere D $SPnt1 30]
 #ComputeFun D $Sph1:1
-#GetShape D $Sph1:1:2 Sph
\ No newline at end of file
+#GetShape D $Sph1:1:2 Sph

diff --git a/tests/caf/driver/A8 b/tests/caf/driver/A8
index 99b93cf306ce126462b983adf47b1ea2091c2323..8cd203cf6c6206a2d090aa4a76d3d7b437f61e9c 100755 (executable)
--- a/tests/caf/driver/A8
+++ b/tests/caf/driver/A8
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|SecRevol|FulRevol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
 # order of functions recomputation should be defined out of the tool (by end user)

diff --git a/tests/caf/driver/A9 b/tests/caf/driver/A9
index d886efac6fd93f9194a503c4b04039386cfa908e..96603c1413b7443cbc608ec0e778185b228305e8 100755 (executable)
--- a/tests/caf/driver/A9
+++ b/tests/caf/driver/A9
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 #1 - create Box using short-cut
 NewCommand D
 AddDriver D Box;                       ## add box driver to driver table

diff --git a/tests/caf/driver/B1 b/tests/caf/driver/B1
index 39427fdcdc703d8a24d0f3ad0dddf9735a67f24c..d97f1c264671cc8a59101b523e85352b374bf14b 100755 (executable)
--- a/tests/caf/driver/B1
+++ b/tests/caf/driver/B1
@@ -1,3 +1,4 @@
+puts "TODO ?CR23788 ALL: Failed units"
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 
 #1 Create Box

diff --git a/tests/caf/driver/B2 b/tests/caf/driver/B2
index c2e5f9507af778f019f5adf33ab26704d1731314..87dde286211fc3896043694f5255d55044a618de 100755 (executable)
--- a/tests/caf/driver/B2
+++ b/tests/caf/driver/B2
@@ -1,3 +1,4 @@
+puts "TODO ?CR23788 ALL: Failed units"
 #1 - create Box using short-cut
 NewCommand D
 AddDriver D Box;                       ## add box driver to driver table

diff --git a/tests/caf/driver/B3 b/tests/caf/driver/B3
index a939afa56102eb95e4c378fa6d338f43c24a3ff6..66151e80e5b74eb952063d675e8ae4dc3b54ff46 100755 (executable)
--- a/tests/caf/driver/B3
+++ b/tests/caf/driver/B3
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 #1 - create Box using short-cut
 NewCommand D
 AddDriver D Box;                       ## add box driver to driver table

diff --git a/tests/caf/driver/B4 b/tests/caf/driver/B4
index bbc49bd626780e3520b2d414026b0d7b219e20fb..fcd3fa1f0b4cc536976da7dbb50221c91ee54f8b 100755 (executable)
--- a/tests/caf/driver/B4
+++ b/tests/caf/driver/B4
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|SecRevol|FulRevol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
 # order of functions recomputation should be defined out of the tool (by end user)

diff --git a/tests/caf/driver/B5 b/tests/caf/driver/B5
index 078ce1a05be77fa83f61599719553f1b5284ca77..a1ba23cc29674f3214e9dc7addb28f2dfc50ff74 100755 (executable)
--- a/tests/caf/driver/B5
+++ b/tests/caf/driver/B5
@@ -1,3 +1,4 @@
+puts "TODO ?CR23788 ALL: Failed units"
 #1 - create 4 Pnts
 NewCommand D
 AddDriver D PntXYZ PntRLT Line3D Attach;

diff --git a/tests/caf/driver/B6 b/tests/caf/driver/B6
index 7087686b5dbcbe031e57f4ae8afb52d31d409c50..75482c66d93442fcc4d889fe75e8cc9cdc4d0366 100755 (executable)
--- a/tests/caf/driver/B6
+++ b/tests/caf/driver/B6
@@ -1,3 +1,4 @@
+puts "TODO ?CR23788 ALL: Failed units"
 #1 - create 4 Pnts
 NewCommand D
 AddDriver D PntXYZ PntRLT Line3D Attach;

diff --git a/tests/caf/driver/B7 b/tests/caf/driver/B7
index 2210375b2866521ab0a47bb6a60a5ae8e5f5d3bd..658fef3dfa31592bc138b0e6348c4d6e3b272d60 100755 (executable)
--- a/tests/caf/driver/B7
+++ b/tests/caf/driver/B7
@@ -1,3 +1,4 @@
+puts "TODO ?CR23788 ALL: Failed units"
 #1 - create 4 Pnts
 NewCommand D
 AddDriver D PntXYZ PntRLT Line3D Attach;

diff --git a/tests/caf/named_shape/E1 b/tests/caf/named_shape/E1
old mode 100644 (file)
new mode 100755 (executable)
index c36b93e..2729ae6
--- a/tests/caf/named_shape/E1
+++ b/tests/caf/named_shape/E1
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # ============= OCAF ============================
 # Naming
 #

diff --git a/tests/caf/named_shape/E2 b/tests/caf/named_shape/E2
old mode 100644 (file)
new mode 100755 (executable)
index 30691cd..0fa9ef8
--- a/tests/caf/named_shape/E2
+++ b/tests/caf/named_shape/E2
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/E3 b/tests/caf/named_shape/E3
old mode 100644 (file)
new mode 100755 (executable)
index c752b15..47f94a6
--- a/tests/caf/named_shape/E3
+++ b/tests/caf/named_shape/E3
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/E4 b/tests/caf/named_shape/E4
old mode 100644 (file)
new mode 100755 (executable)
index ee82d1a..c25cf38
--- a/tests/caf/named_shape/E4
+++ b/tests/caf/named_shape/E4
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/E5 b/tests/caf/named_shape/E5
old mode 100644 (file)
new mode 100755 (executable)
index 62b506a..ff39ced
--- a/tests/caf/named_shape/E5
+++ b/tests/caf/named_shape/E5
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/E6 b/tests/caf/named_shape/E6
old mode 100644 (file)
new mode 100755 (executable)
index ec81f89..eb4a661
--- a/tests/caf/named_shape/E6
+++ b/tests/caf/named_shape/E6
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/E7 b/tests/caf/named_shape/E7
old mode 100644 (file)
new mode 100755 (executable)
index 7a0e2ac..4bbb313
--- a/tests/caf/named_shape/E7
+++ b/tests/caf/named_shape/E7
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/E8 b/tests/caf/named_shape/E8
old mode 100644 (file)
new mode 100755 (executable)
index a8d6864..3f276ee
--- a/tests/caf/named_shape/E8
+++ b/tests/caf/named_shape/E8
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/E9 b/tests/caf/named_shape/E9
old mode 100644 (file)
new mode 100755 (executable)
index 1223e9d..1dffcfe
--- a/tests/caf/named_shape/E9
+++ b/tests/caf/named_shape/E9
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # ============= OCAF ============================
 # Naming
 #

diff --git a/tests/caf/named_shape/F1 b/tests/caf/named_shape/F1
old mode 100644 (file)
new mode 100755 (executable)
index aced514..5add70d
--- a/tests/caf/named_shape/F1
+++ b/tests/caf/named_shape/F1
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # ============= OCAF ============================
 # Naming
 #

diff --git a/tests/caf/named_shape/F2 b/tests/caf/named_shape/F2
old mode 100644 (file)
new mode 100755 (executable)
index d38957a..831631d
--- a/tests/caf/named_shape/F2
+++ b/tests/caf/named_shape/F2
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # ============= OCAF ============================
 # Naming
 #

diff --git a/tests/caf/named_shape/F3 b/tests/caf/named_shape/F3
old mode 100644 (file)
new mode 100755 (executable)
index 74733f9..ec21d6b
--- a/tests/caf/named_shape/F3
+++ b/tests/caf/named_shape/F3
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # ============= OCAF ============================
 # Naming
 #

diff --git a/tests/caf/named_shape/F4 b/tests/caf/named_shape/F4
old mode 100644 (file)
new mode 100755 (executable)
index 8f39e59..2c55479
--- a/tests/caf/named_shape/F4
+++ b/tests/caf/named_shape/F4
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/F5 b/tests/caf/named_shape/F5
old mode 100644 (file)
new mode 100755 (executable)
index 347a550..d3cb14a
--- a/tests/caf/named_shape/F5
+++ b/tests/caf/named_shape/F5
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/named_shape/F6 b/tests/caf/named_shape/F6
index 1e3c83d3b1cd2c26e3b4286d4aa6b68f8f0829b0..c52ccef8f74187ba42fba3565b8f48decb76d345 100755 (executable)
--- a/tests/caf/named_shape/F6
+++ b/tests/caf/named_shape/F6
@@ -1,3 +1,5 @@
+puts "TODO ?CR23788 ALL: Failed units"
+
 # =================== OCAF ======================
 # Naming
 #

diff --git a/tests/caf/parse.rules b/tests/caf/parse.rules
old mode 100644 (file)
new mode 100755 (executable)
index 9c00cd6..9ee55b7
--- a/tests/caf/parse.rules
+++ b/tests/caf/parse.rules
@@ -1,2 +1,4 @@
 FAILED /\binvalid\b/ error
+FAILED /\bFailed\b/ error
+FAILED /\bfailed\b/ error
 IGNORE /^\s*DPrsStd_AISColor\s*:\s*Error\b/ ignore presentation K2 error message