Changeset 85 for trunk

Timestamp:

02/04/10 09:47:52 (2 years ago)

Author:

mgalloy

Message:

Added ability for test to determine if it should be counted in the final results tally, i.e., if itis "valid". Set self.invalid from within the test method if the test should not count.

Location:

trunk

Files:

• RELEASE (modified) (1 diff)
• src/mgutclirunner__define.pro (modified) (1 diff)
• src/mgutcompoundrunner__define.pro (modified) (1 diff)
• src/mgutguirunner__define.pro (modified) (1 diff)
• src/mguthtmlrunner__define.pro (modified) (1 diff)
• src/mgutjunitrunner__define.pro (modified) (1 diff)
• src/mguttestcase__define.pro (modified) (4 diffs)
• src/mguttestrunner__define.pro (modified) (1 diff)

trunk/RELEASE

@@ -11 +11 @@
 * Added XML and JUnit output formats (and corresponding XML and JUNIT keywords 
   to MGUNIT to turn them on).
+  
+* Added ability for a test to determine if it should count in the final 
+  results tally, i.e., if it is "valid". Set "self.invalid" from within a test
+  if it should not count.
   
   

trunk/src/mgutclirunner__define.pro

@@ -149 +149 @@
 ;    level : in, required, type=integer
 ;       level of test case
-;-
-pro mgutclirunner::reportTestResult, msg, passed=passed, time=time, level=level
-  compile_opt strictarr
-
-  if (passed) then begin
+;    valid : in, required, type=boolean
+;       indicates whether the test should be counted in the results
+;-
+pro mgutclirunner::reportTestResult, msg, passed=passed, time=time, $
+                                     valid=valid, level=level
+  compile_opt strictarr
+
+  if (~keyword_set(valid)) then begin
+    self->_print, self.logLun, 'invalid', /cyan, format='(A, $)'
+  endif else if (passed) then begin
     self->_print, self.logLun, 'passed', /green, format='(A, $)'
   endif else begin

trunk/src/mgutcompoundrunner__define.pro

@@ -137 +137 @@
 ;    level : in, required, type=integer
 ;       level of test case
+;    valid : in, required, type=boolean
+;       indicates whether the test should be counted in the results
 ;-
-pro mgutcompoundrunner::reportTestResult, msg, passed=passed, time=time, level=level
+pro mgutcompoundrunner::reportTestResult, msg, passed=passed, time=time, $
+                                          valid=valid, level=level
   compile_opt strictarr
 
   for i = 0L, self->count() - 1L do begin
     r = self->get(position=i)
-    r->reportTestResult, msg, passed=passed, time=time, level=level
+    r->reportTestResult, msg, passed=passed, time=time, valid=valid, level=level
   endfor
 end

trunk/src/mgutguirunner__define.pro

@@ -158 +158 @@
 ;    level : in, required, type=integer
 ;       level of test case
-;-
-pro mgutguirunner::reportTestResult, msg, passed=passed, time=time, level=level
-  compile_opt strictarr
-
-  if (passed) then begin
+;    valid : in, required, type=boolean
+;       indicates whether the test should be counted in the results
+;-
+pro mgutguirunner::reportTestResult, msg, passed=passed, time=time, $
+                                     valid=valid, level=level
+  compile_opt strictarr
+
+  if (~keyword_set(valid)) then begin
+    self->_print, 'invalid', /continued
+  endif else if (passed) then begin
     self->_print, 'passed', /continued
   endif else begin

trunk/src/mguthtmlrunner__define.pro

@@ -142 +142 @@
 ;    level : in, required, type=integer
 ;       level of test case
-;-
-pro mguthtmlrunner::reportTestResult, msg, passed=passed, time=time, level=level
-  compile_opt strictarr
-
-  result = keyword_set(passed) ? 'passed' : 'failed'
-
+;    valid : in, required, type=boolean
+;       indicates whether the test should be counted in the results
+;-
+pro mguthtmlrunner::reportTestResult, msg, passed=passed, time=time, $
+                                      valid=valid, level=level
+  compile_opt strictarr
+
+  result = keyword_set(valid) $
+             ? (keyword_set(passed) ? 'passed' : 'failed') $
+             : 'invalid'
+  
   s = string(result, $
              result, $

trunk/src/mgutjunitrunner__define.pro

@@ -133 +133 @@
 ;    level : in, required, type=integer
 ;       level of test case
-;-
-pro mgutjunitrunner::reportTestResult, msg, passed=passed, time=time, level=level
-  compile_opt strictarr
-
-  indent = level eq 0L ? '' : string(bytarr(2 * level) + 32B)
-  
-  if (~keyword_set(passed)) then begin
+;    valid : in, required, type=boolean
+;       indicates whether the test should be counted in the results
+;-
+pro mgutjunitrunner::reportTestResult, msg, passed=passed, time=time, $
+                                       valid=valid, level=level
+  compile_opt strictarr
+
+  indent = level eq 0L ? '' : string(bytarr(2 * level) + 32B)
+  
+  if (~keyword_set(valid)) then begin
+    _msg = string(indent, msg, format='(%"%s    <failure>invalid test</failure>")')
+    self->_print, self.lun, _msg    
+  endif else if (~keyword_set(passed)) then begin
     _msg = string(indent, msg, format='(%"%s    <failure>%s</failure>")')
     self->_print, self.lun, _msg

trunk/src/mguttestcase__define.pro

@@ -150 +150 @@
     self->_runSetup, fail=setupFailed
     if (~setupFailed) then begin
+      self.invalid = 0B
       result = self->runTest((*self.testnames)[t], message=msg)
       self->_runTeardown, fail=teardownFailed  
@@ -168 +169 @@
     endif
 
-    if (passed) then begin
-      ++self.npass 
-    endif else begin
-      ++self.nfail
-    endelse
-
+    if (~self.invalid) then begin
+      if (passed) then begin
+        ++self.npass 
+      endif else begin
+        ++self.nfail
+      endelse
+    endif
+    
     ; remove method name from msg, if present
     self->_removePrefix, msg, obj_class(self) + '::' + (*self.testnames)[t] + ': '
@@ -187 +190 @@
                 : msg)
                       
-    self.testRunner->reportTestResult, logMsg, passed=passed, time=self.time, level=self.level
+    self.testRunner->reportTestResult, logMsg, passed=passed, valid=~self.invalid, $
+                                       time=self.time, level=self.level
   endfor
 
@@ -325 +329 @@
              npass: 0L, $
              nfail: 0L, $
-             time: 0.0D $
+             time: 0.0D, $
+             invalid: 0B $
              }             
 end

trunk/src/mguttestrunner__define.pro

@@ -116 +116 @@
 ;    level : in, required, type=integer
 ;       level of test case
+;    valid : in, required, type=boolean
+;       indicates whether the test should be counted in the results
 ;-
-pro mguttestrunner::reportTestResult, msg, passed=passed, time=time, level=level
+pro mguttestrunner::reportTestResult, msg, passed=passed, time=time, $
+                                      valid=valid, level=level
   compile_opt strictarr