Changeset 106

Timestamp:

01/25/11 21:11:54 (16 months ago)

Author:

mgalloy

Message:

Added FAILURES_ONLY keyword to display only failed tests.

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• RELEASE (modified) (2 diffs)
• src/mgunit.pro (modified) (3 diffs)
• src/mguttestcase__define.pro (modified) (6 diffs)
• src/mguttestsuite__define.pro (modified) (10 diffs)

trunk/Makefile

@@ -1 @@
-VERSION=1.1
+VERSION=1.2dev
 REVISION=r`svn info | sed -n 's/Revision: \(.*\)/\1/p'`
 RELEASE="$(VERSION)-$(REVISION)"

trunk/RELEASE

@@ -2 +2 @@
 Release notes
 -------------
+
+mgunit 1.2
+----------
+
+* Added FAILURES_ONLY keyword to display only failured tests.
+
 
 mgunit 1.1
@@ -20 +26 @@
 * Fixed memory leak.
 
-  
   
 mgunit 1.0

trunk/src/mgunit.pro

@@ -53 +53 @@
 pro mgunit, tests, filename=filename, html=html, xml=xml, gui=gui, junit=junit, $
             color=color, $
-            npass=npass, nfail=nfail, nskip=nskip, ntests=ntests
+            npass=npass, nfail=nfail, nskip=nskip, ntests=ntests, $
+            failures_only=failuresOnly
   compile_opt strictarr
 
@@ -74 +75 @@
     testsuite = obj_new('MGutTestSuite', $
                         test_runner=testRunner, $
-                        name='All tests')
+                        name='All tests', $
+                        failures_only=failuresOnly)
 
     testRunner->add, obj_new(runnerName, parent=testRunner, $
@@ -82 +84 @@
     testsuite->add, tests
     testsuite->run
+    if (keyword_set(failuresOnly)) then testsuite->display
     testsuite->getProperty, npass=npass, nfail=nfail, nskip=nskip, $
                             ntests=ntests

trunk/src/mguttestcase__define.pro

@@ -136 +136 @@
 end
 
-  
+
+pro mguttestcase::display
+  compile_opt strictarr
+
+  if (self.nfail eq 0L) then return
+  
+  self.testRunner->reportTestCaseStart, strlowcase(obj_class(self)), $
+                                        ntests=self.ntests, $
+                                        level=self.level
+  for t = 0L, self.ntests - 1L do begin
+    if ((*self.passes)[t] eq 0B) then begin
+      self.testRunner->reportTestStart, (*self.testnames)[t], level=self.level
+      self.testRunner->reportTestResult, (*self.logmsgs)[t], passed=(*self.passes)[t], $
+                                         skipped=self.skipped, $
+                                         time=self.time, level=self.level
+    endif
+  endfor
+
+  self.testRunner->reportTestCaseResult, npass=self.npass, $
+                                         nfail=self.nfail, $
+                                         nskip=self.nskip, $
+                                         level=self.level  
+end
+
+
 ;+
 ; Run the tests for this class (i.e. methods with names that start with 
@@ -148 +172 @@
   self.nskip = 0L
   
-  self.testRunner->reportTestCaseStart, strlowcase(obj_class(self)), $
-                                        ntests=self.ntests, $
-                                        level=self.level
+  if (~self.failuresOnly) then begin
+    self.testRunner->reportTestCaseStart, strlowcase(obj_class(self)), $
+                                          ntests=self.ntests, $
+                                          level=self.level
+  endif
 
   ; run each test
   for t = 0L, self.ntests - 1L do begin
-    self.testRunner->reportTestStart, (*self.testnames)[t], level=self.level
+    if (~self.failuresOnly) then begin
+      self.testRunner->reportTestStart, (*self.testnames)[t], level=self.level
+    endif
 
     result = 0L         ; assume test failed
@@ -205 +233 @@
                 ? '' $
                 : msg)
-
-    self.testRunner->reportTestResult, logMsg, passed=passed, $
-                                       skipped=self.skipped, $
-                                       time=self.time, level=self.level
+                
+    (*self.logmsgs)[t] = logMsg
+    (*self.passes)[t] = passed
+    if (~self.failuresOnly) then begin
+      self.testRunner->reportTestResult, logMsg, passed=passed, $
+                                         skipped=self.skipped, $
+                                         time=self.time, level=self.level
+    endif
   endfor
 
-  self.testRunner->reportTestCaseResult, npass=self.npass, $
-                                         nfail=self.nfail, $
-                                         nskip=self.nskip, $
-                                         level=self.level
+  if (~self.failuresOnly) then begin
+    self.testRunner->reportTestCaseResult, npass=self.npass, $
+                                           nfail=self.nfail, $
+                                           nskip=self.nskip, $
+                                           level=self.level
+  endif
 end
 
@@ -307 +341 @@
 ;       subclass of `MGutTestRunner`
 ;-
-function mguttestcase::init, test_runner=testRunner
+function mguttestcase::init, test_runner=testRunner, failures_only=failuresOnly
   compile_opt strictarr
 
   self.testRunner = testRunner
-
+  self.failuresOnly = keyword_set(failuresOnly)
+  
   self.testnames = ptr_new(/allocate_heap)
+  self.logmsgs = ptr_new(/allocate_heap)
+  self.passes = ptr_new(/allocate_heap)
+  
   self->findTestnames
 
+  *self.logmsgs = strarr(n_elements(*self.testnames))
+  *self.passes = bytarr(n_elements(*self.testnames))
+  
   self.level = 0L
 
@@ -346 +387 @@
              testRunner: obj_new(), $
              testnames: ptr_new(), $
+             logmsgs: ptr_new(), $
+             passes: ptr_new(), $
              level: 0L, $
              ntests: 0L, $
@@ -352 +395 @@
              nskip: 0L, $
              time: 0.0D, $
-             skipped: 0B $
+             skipped: 0B, $
+             failuresOnly: 0B $             
              }             
 end

trunk/src/mguttestsuite__define.pro

@@ -41 +41 @@
 ;       0 if no error and 1 if an error
 ;    _extra : in, optional, type=keywords
-;       keywords to OBJ_NEW for test cases and test suites
+;       keywords to `OBJ_NEW` for test cases and test suites
 ;-
 function mguttestsuite::_makeTestCase, testName, error=error, _extra=e
@@ -55 +55 @@
   self->_recompile, testName
 
-  return, obj_new(testName, test_runner=self.testRunner, _strict_extra=e)
+  return, obj_new(testName, test_runner=self.testRunner, $
+                  failures_only=self.failuresOnly, _strict_extra=e)
 end
 
@@ -77 +78 @@
 
 
-;+
-; Run the contained test suites or test cases.
-;-
-pro mguttestsuite::run
-  compile_opt strictarr
-
-  self.npass = 0L
-  self.nfail = 0L
-  self.nskip = 0L
-  
+pro mguttestsuite::display
+  compile_opt strictarr
+
+  if (self.nfail eq 0L) then return
+   
   self->getProperty, name=name, ntestcases=ntestcases, ntests=ntests
   self.testRunner->reportTestSuiteStart, name, $
@@ -92 +88 @@
                                          ntests=ntests, $
                                          level=self.level
+
+  for t = 0L, ntestcases - 1L do begin
+    otestcase = self.testcases->get(position=t)
+    otestcase->display
+  endfor
+  
+  self.testRunner->reportTestSuiteResult, npass=self.npass, $
+                                          nfail=self.nfail, $
+                                          nskip=self.nskip, $
+                                          level=self.level  
+end
+
+
+;+
+; Run the contained test suites or test cases.
+;-
+pro mguttestsuite::run
+  compile_opt strictarr
+
+  self.npass = 0L
+  self.nfail = 0L
+  self.nskip = 0L
+  
+  if (~self.failuresOnly) then begin
+    self->getProperty, name=name, ntestcases=ntestcases, ntests=ntests
+    self.testRunner->reportTestSuiteStart, name, $
+                                           ntestcases=ntestcases, $
+                                           ntests=ntests, $
+                                           level=self.level
+  endif
 
   ntestcases = self.testcases->count()
@@ -105 +131 @@
   endfor
 
-  self.testRunner->reportTestSuiteResult, npass=self.npass, $
-                                          nfail=self.nfail, $
-                                          nskip=self.nskip, $
-                                          level=self.level
+  if (~self.failuresOnly) then begin
+    self.testRunner->reportTestSuiteResult, npass=self.npass, $
+                                            nfail=self.nfail, $
+                                            nskip=self.nskip, $
+                                            level=self.level
+  endif
 end
 
@@ -170 +198 @@
       otestsuite = obj_new('MGutTestSuite', home=testDirs[d], $
                            name=file_basename(testDirs[d]), $
-                           test_runner=self.testRunner)
+                           test_runner=self.testRunner, $
+                           failures_only=self.failuresOnly)
       otestsuite->add, /all
       self.testcases->add, otestsuite
@@ -278 +307 @@
 ;       subclass of MGtestRunner
 ;-
-function mguttestsuite::init, name=name, home=home, test_runner=testRunner
+function mguttestsuite::init, name=name, home=home, test_runner=testRunner, $
+                              failures_only=failuresOnly
   compile_opt strictarr
 
@@ -297 +327 @@
 
   self.testRunner = testRunner
-
+  self.failuresOnly = keyword_set(failuresOnly)
+  
   self.testcases = obj_new('IDL_Container')
 
@@ -316 +347 @@
 ;       number of layers below the top-most containing test suite
 ;    testcases
-;       IDL_Container holding test suites or test cases
+;       `IDL_Container` holding test suites or test cases
 ;    testRunner
-;       subclass of MGutTestRunner
+;       subclass of `MGutTestRunner`
 ;    npass 
 ;       number of passing tests contained in the hierarchy below this test 
@@ -340 +371 @@
              npass: 0L, $
              nfail: 0L, $
-             nskip: 0L $
+             nskip: 0L, $
+             failuresOnly: 0B $
            }
 end