Changeset 28

Timestamp:

02/20/09 12:37:46 (3 years ago)

Author:

mgalloy

Message:

Fix to handle setup/teardown methods crashing.

Files:

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

trunk/mgunit/src/mguttestcase__define.pro

@@ -59 +59 @@
 
 ;+
+; Run setup method before each test.
+;
+; :Keywords:
+;    fail : out, optional, type=boolean
+;       set to a named variable to determine if the setup method failed
+;-
+pro mguttestcase::_runSetup, fail=fail
+  compile_opt strictarr
+
+  fail = 0L
+  
+  catch, error
+  if (error ne 0L) then begin
+    catch, /cancel
+    fail = 1L
+    return
+  endif
+    
+  self->setup
+end
+
+
+;+
+; Run teardown method before each test.
+;
+; :Keywords:
+;    fail : out, optional, type=boolean
+;       set to a named variable to determine if the teardown method failed
+;-
+pro mguttestcase::_runTeardown, fail=fail
+  compile_opt strictarr
+
+  fail = 0L
+  
+  catch, error
+  if (error ne 0L) then begin
+    catch, /cancel
+    fail = 1L
+    return
+  endif
+    
+  self->teardown
+end
+
+
+
+;+
 ; Run the tests for this class (i.e. methods with names that start with "test").
 ;-
@@ -71 +118 @@
   for t = 0L, self.ntests - 1L do begin
     self.testRunner->reportTestStart, (*self.testnames)[t], level=self.level
-    self->setup
-    result = self->runTest((*self.testnames)[t], message=msg) 
-    if (result) then ++self.npass else ++self.nfail
+
+    result = 0L         ; assume test failed
+    setupFailed = 0L    ; assume setup/teardown worked unless otherwise told
+    teardownFailed = 0L
+    
+    self->_runSetup, fail=setupFailed
+    if (~setupFailed) then begin
+      result = self->runTest((*self.testnames)[t], message=msg)
+      self->_runTeardown, fail=teardownFailed  
+    endif
+    
+    passed = result && ~setupFailed && ~teardownFailed
+    
+    if (setupFailed) then msg = 'setup failed'
+    if (result && teardownFailed) then msg = 'teardown failed'
+
+    if (passed) then begin
+      ++self.npass 
+    endif else begin
+      ++self.nfail
+    endelse
 
     ; remove prefix from msg if present
@@ -90 +155 @@
     
     ; construct the log message for the test
-    logMsg = result $
+    logMsg = passed $
              ? '' $ 
              : (n_elements(msg) eq 0 $
                 ? '' $
                 : msg)
-
-    self->teardown    
-    self.testRunner->reportTestResult, logMsg, passed=result
+                      
+    self.testRunner->reportTestResult, logMsg, passed=passed
   endfor