Changeset 90

Timestamp:

02/05/10 12:48:47 (2 years ago)

Author:

mgalloy

Message:

Added a SKIP keyword to ASSERT which skips the test instead of causing it to fail if its condition is false.

Location:

trunk/src

Files:

• assert.pro (modified) (1 diff)
• mguttestcase__define.pro (modified) (1 diff)

trunk/src/assert.pro

@@ -13 +13 @@
 ;    msg : in, optional, type=string, default="Assertion failed"
 ;       message to throw if condition is not met
-;    arg : in, optional, type=string
+;    arg1 : in, optional, type=string
 ;       argument for any C format codes in msg
+;    arg2 : in, optional, type=string
+;       argument for any C format codes in msg
+;    arg3 : in, optional, type=string
+;       argument for any C format codes in msg
+;
+; :Keywords:
+;    skip : in, optional, type=boolean
+;       set to skip test instead of fail
 ;-
-pro assert, condition, msg, arg
+pro assert, condition, msg, arg1, arg2, arg3, skip=skip
   compile_opt strictarr, logical_predicate, hidden
   on_error, 2
 
-  case n_params() of
-    0: 
-    1: if (~condition) then message, 'Assertion failed'
-    2: if (~condition) then message, msg
-    3: if (~condition) then message, string(arg, format='(%"' + msg + '")')
-  endcase
+  if (~condition) then begin
+    if (keyword_set(skip)) then (scope_varfetch('self', level=-1))->skip
+
+    case n_params() of
+      0: 
+      1: message, 'Assertion failed'
+      2: message, msg
+      3: message, string(arg1, format='(%"' + msg + '")')
+      4: message, string(arg1, arg2, format='(%"' + msg + '")')
+      5: message, string(arg1, arg2, arg3, format='(%"' + msg + '")')
+    endcase
+  endif
 end

trunk/src/mguttestcase__define.pro

@@ -22 +22 @@
   compile_opt strictarr
 
+end
+
+
+;+
+; Set this test to be skipped.
+;-
+pro mguttestcase::skip
+  compile_opt strictarr
+  
+  self.skipped = 1
 end