From 3113d5208c6b1dbefbe0264728f1d7b1b8797f76 Mon Sep 17 00:00:00 2001 From: mkv Date: Fri, 1 Mar 2013 13:37:49 +0400 Subject: [PATCH] 0023788: OCCT tests don't catch Naming failures Test corrections for catch Naming failure --- tests/caf/driver/A1 | 2 ++ tests/caf/driver/A2 | 2 ++ tests/caf/driver/A3 | 2 ++ tests/caf/driver/A4 | 2 ++ tests/caf/driver/A5 | 1 + tests/caf/driver/A6 | 1 + tests/caf/driver/A7 | 4 +++- tests/caf/driver/A8 | 2 ++ tests/caf/driver/A9 | 2 ++ tests/caf/driver/B1 | 1 + tests/caf/driver/B2 | 1 + tests/caf/driver/B3 | 2 ++ tests/caf/driver/B4 | 2 ++ tests/caf/driver/B5 | 1 + tests/caf/driver/B6 | 1 + tests/caf/driver/B7 | 1 + tests/caf/named_shape/E1 | 2 ++ tests/caf/named_shape/E2 | 2 ++ tests/caf/named_shape/E3 | 2 ++ tests/caf/named_shape/E4 | 2 ++ tests/caf/named_shape/E5 | 2 ++ tests/caf/named_shape/E6 | 2 ++ tests/caf/named_shape/E7 | 2 ++ tests/caf/named_shape/E8 | 2 ++ tests/caf/named_shape/E9 | 2 ++ tests/caf/named_shape/F1 | 2 ++ tests/caf/named_shape/F2 | 2 ++ tests/caf/named_shape/F3 | 2 ++ tests/caf/named_shape/F4 | 2 ++ tests/caf/named_shape/F5 | 2 ++ tests/caf/named_shape/F6 | 2 ++ tests/caf/parse.rules | 2 ++ 32 files changed, 58 insertions(+), 1 deletion(-) mode change 100644 => 100755 tests/caf/named_shape/E1 mode change 100644 => 100755 tests/caf/named_shape/E2 mode change 100644 => 100755 tests/caf/named_shape/E3 mode change 100644 => 100755 tests/caf/named_shape/E4 mode change 100644 => 100755 tests/caf/named_shape/E5 mode change 100644 => 100755 tests/caf/named_shape/E6 mode change 100644 => 100755 tests/caf/named_shape/E7 mode change 100644 => 100755 tests/caf/named_shape/E8 mode change 100644 => 100755 tests/caf/named_shape/E9 mode change 100644 => 100755 tests/caf/named_shape/F1 mode change 100644 => 100755 tests/caf/named_shape/F2 mode change 100644 => 100755 tests/caf/named_shape/F3 mode change 100644 => 100755 tests/caf/named_shape/F4 mode change 100644 => 100755 tests/caf/named_shape/F5 mode change 100644 => 100755 tests/caf/parse.rules diff --git a/tests/caf/driver/A1 b/tests/caf/driver/A1 index 8f13d7954d..3b87819754 100755 --- 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 a2ca503912..6594debcbd 100755 --- 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 4055a0908a..ae737e02d3 100755 --- 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 16464455e0..6dc78b729e 100755 --- 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 8b5aca2946..61b8deb39a 100755 --- 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 24c08bd551..127e7cde67 100755 --- 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 5f27b06d69..a9dd32d151 100755 --- 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 99b93cf306..8cd203cf6c 100755 --- 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 d886efac6f..96603c1413 100755 --- 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 39427fdcdc..d97f1c2646 100755 --- 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 c2e5f9507a..87dde28621 100755 --- 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 a939afa561..66151e80e5 100755 --- 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 bbc49bd626..fcd3fa1f0b 100755 --- 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 078ce1a05b..a1ba23cc29 100755 --- 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 7087686b5d..75482c66d9 100755 --- 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 2210375b28..658fef3dfa 100755 --- 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 new mode 100755 index c36b93e0f5..2729ae6672 --- 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 new mode 100755 index 30691cd6e0..0fa9ef8841 --- 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 new mode 100755 index c752b15efc..47f94a6963 --- 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 new mode 100755 index ee82d1a9cc..c25cf38595 --- 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 new mode 100755 index 62b506a7ca..ff39ced69b --- 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 new mode 100755 index ec81f8981e..eb4a661d91 --- 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 new mode 100755 index 7a0e2ac99f..4bbb313438 --- 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 new mode 100755 index a8d6864fe2..3f276eec39 --- 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 new mode 100755 index 1223e9d578..1dffcfebe8 --- 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 new mode 100755 index aced514bb1..5add70d973 --- 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 new mode 100755 index d38957ad4d..831631d5dc --- 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 new mode 100755 index 74733f9783..ec21d6b350 --- 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 new mode 100755 index 8f39e59b87..2c55479673 --- 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 new mode 100755 index 347a550c8c..d3cb14a425 --- 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 1e3c83d3b1..c52ccef8f7 100755 --- 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 new mode 100755 index 9c00cd6a5f..9ee55b78eb --- 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