Changeset 48

Timestamp:

04/08/09 13:33:56 (3 years ago)

Author:

mgalloy

Message:

Added error message to failure message when setup or teardown methods fail. This allows a type of test to be done for all tests i.e. like memory leaks.

Files:

• trunk/mgunit/src/mguttestcase__define.pro (modified) (3 diffs)

trunk/mgunit/src/mguttestcase__define.pro

@@ -104 +104 @@
 
 
-
+;+
+; Removes the given prefix from the msg if present.
+; 
+; :Params:
+;    msg : in, required, type=string
+;       string to remove prefix from, may be undefined
+;    prefix : in, required, type=string
+;       prefix to remove from msg
+;-
+pro mguttestcase::_removePrefix, msg, prefix
+  compile_opt strictarr
+  
+  if (n_elements(msg) gt 0 && strpos(msg, prefix) eq 0) then begin
+    prefixLength = strlen(prefix)
+    msg = strmid(msg, prefixLength)
+  endif
+end
+
+  
 ;+
 ; Run the tests for this class (i.e. methods with names that start with "test").
@@ -131 +149 @@
     passed = result && ~setupFailed && ~teardownFailed
     
-    if (setupFailed) then msg = 'setup failed'
-    if (result && teardownFailed) then msg = 'teardown failed'
+    if (setupFailed) then begin
+      msg = !error_state.msg
+      self->_removePrefix, msg, 'ASSERT: '      
+      msg = 'setup failed: ' + msg
+    endif
+    
+    if (result && teardownFailed) then begin
+      msg = !error_state.msg      
+      self->_removePrefix, msg, 'ASSERT: '      
+      msg = 'teardown failed: ' + msg    
+    endif
 
     if (passed) then begin
@@ -140 +167 @@
     endelse
 
-    ; remove prefix from msg if present
-    prefix = obj_class(self) + '::' + (*self.testnames)[t] + ': '
-    if (n_elements(msg) gt 0 && strpos(msg, prefix) eq 0) then begin
-      prefixLength = strlen(prefix)
-      msg = strmid(msg, prefixLength)
-    endif
+    ; remove method name from msg, if present
+    self->_removePrefix, msg, obj_class(self) + '::' + (*self.testnames)[t] + ': '
 
     ; remove ASSERT from msg if present 
-    prefix = 'ASSERT: '
-    if (n_elements(msg) gt 0 && strpos(msg, prefix) eq 0) then begin
-      prefixLength = strlen(prefix)
-      msg = strmid(msg, prefixLength)
-    endif
+    self->_removePrefix, msg, 'ASSERT: '
     
     ; construct the log message for the test