Changeset 59

Timestamp:

04/20/09 07:58:25 (3 years ago)

Author:

mgalloy

Message:

Merging 57:58 from trunk to the mgunit-1.0 branch.

Location:

branches/mgunit-1.0/mgunit/src

Files:

• mgutclirunner__define.pro (modified) (1 diff)
• mguthtmlrunner__define.pro (modified) (9 diffs)

branches/mgunit-1.0/mgunit/src/mgutclirunner__define.pro

@@ -182 +182 @@
     printf, lun, text, _extra=e
   endelse
+  
+  if (lun gt 0L) then flush, lun
 end
 

branches/mgunit-1.0/mgunit/src/mguthtmlrunner__define.pro

@@ -22 +22 @@
 ;-
 pro mguthtmlrunner::reportTestSuiteStart, testsuite, $
-                                           ntestcases=ntestcases, $
-                                           ntests=ntests, $
-                                           level=level
-  compile_opt strictarr
-
-  printf, self.lun, $
-          '<ul class="testsuite"><li><span class="suitename">' $
-          + testsuite $
-          + '</span> test suite starting (' $
-          + strtrim(ntestcases, 2) + ' test suite' $
-          + (ntestcases eq 1 ? '' : 's') $
-          + '/case' $
-          + (ntestcases eq 1 ? '' : 's') $
-          + ', ' $
-          + strtrim(ntests, 2) + ' test' + (ntests eq 1 ? '' : 's') $
-          + ')</li>'
+                                          ntestcases=ntestcases, $
+                                          ntests=ntests, $
+                                          level=level
+  compile_opt strictarr
+
+  self->_print, self.lun, $
+                '<ul class="testsuite"><li><span class="suitename">' $
+                  + testsuite $
+                  + '</span> test suite starting (' $
+                  + strtrim(ntestcases, 2) + ' test suite' $
+                  + (ntestcases eq 1 ? '' : 's') $
+                  + '/case' $
+                  + (ntestcases eq 1 ? '' : 's') $
+                  + ', ' $
+                  + strtrim(ntests, 2) + ' test' + (ntests eq 1 ? '' : 's') $
+                  + ')</li>'
 end
 
@@ -57 +57 @@
   compile_opt strictarr
 
-  printf, self.lun, $
-          '<span class="results">Results: ' $
-          + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
-          + ' tests passed</span></ul>'
+  self->_print, self.lun, $
+                '<span class="results">Results: ' $
+                  + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
+                  + ' tests passed</span></ul>'
 end
 
@@ -80 +80 @@
   compile_opt strictarr
 
-  printf, self.lun, $
-          '<ul class="testcase"><li><span class="casename">' + testcase $
-          + '</span> test case starting (' + strtrim(ntests, 2) $
-          + ' test' + (ntests eq 1 ? '' : 's') + ')</li>' 
-  printf, self.lun, '<ol>'
+  self->_print, self.lun, $
+                '<ul class="testcase"><li><span class="casename">' + testcase $
+                  + '</span> test case starting (' + strtrim(ntests, 2) $
+                  + ' test' + (ntests eq 1 ? '' : 's') + ')</li>' 
+  self->_print, self.lun, '<ol>'
 end
 
@@ -102 +102 @@
   compile_opt strictarr
 
-  printf, self.lun, '</ol>'
-  printf, self.lun, $
-          '<span class="results">Results: ' $
-          + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
-          + ' tests passed</span></ul>'
+  self->_print, self.lun, '</ol>'
+  self->_print, self.lun, $
+                '<span class="results">Results: ' $
+                  + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
+                  + ' tests passed</span></ul>'
 end
 
@@ -124 +124 @@
   compile_opt strictarr
 
-  printf, self.lun, '<li>' + testname + ': ', format='(A, $)'
+  self->_print, self.lun, '<li>' + testname + ': ', format='(A, $)'
 end
 
@@ -145 +145 @@
 
   result = keyword_set(passed) ? 'passed' : 'failed'
-  ;printf, self.lun, $
-  ;  '<span class="' + result + '">' $
-  ;  + result $
-  ;  + (keyword_set(passed) ? '': (msg eq '' ? '' : ' "' + msg + '"')) $
-  ;  + '</span> (seconds)</li>'
-
-  printf, self.lun, $
-          result, $
-          result, $
-          keyword_set(passed) ? '': (msg eq '' ? '' : ' "' + msg + '"'), $
-          time, $
-          format='(%"<span class=\"%s\">%s%s</span> <span class=\"time\">%f seconds</span></li>")'   
+
+  s = string(result, $
+             result, $
+             keyword_set(passed) ? '': (msg eq '' ? '' : ' "' + msg + '"'), $
+             time, $
+             format='(%"<span class=\"%s\">%s%s</span> <span class=\"time\">%f seconds</span></li>")')
+
+  self->_print, self.lun, s
+end
+
+
+;+
+; Prints a message to a LUN.
+;
+; :Params:
+;    lun : in, required, type=long
+;       logical unit number to print to
+;    text : in, required, type=string
+;       text to print
+;
+; :Keywords:
+;    _extra : in, optional, type=keywords
+;       keywords to MG_ANSICODE i.e. RED or GREEN
+;-
+pro mguthtmlrunner::_print, lun, text, _extra=e
+  compile_opt strictarr
+  
+  printf, lun, text, _extra=e
+  if (lun gt 0L) then flush, lun
 end
 
@@ -166 +183 @@
   compile_opt strictarr
 
-  printf, self.lun, '<span id="dateline">Test results from ' + systime() + '</span>'
-  printf, self.lun, '</body></html>'
+  self->_print, self.lun, '<span id="dateline">Test results from ' + systime() + '</span>'
+  self->_print, self.lun, '</body></html>'
+  
   if (self.lun gt 0) then free_lun, self.lun
   self->mguttestrunner::cleanup
@@ -207 +225 @@
   endelse
 
-  printf, self.lun, '<html><head>'
-  printf, self.lun, '<title>Test results</title>'
-  printf, self.lun, '<style type="text/css" media="all">'
+  self->_print, self.lun, '<html><head>'
+  self->_print, self.lun, '<title>Test results</title>'
+  self->_print, self.lun, '<style type="text/css" media="all">'
+  
   styleFilename = mg_src_root() + 'style.css'
   styles = strarr(file_lines(styleFilename))
@@ -215 +234 @@
   readf, styleLun, styles
   free_lun, styleLun
-  printf, self.lun, transpose(styles)
-  printf, self.lun, '</style></head><body>'
+  
+  self->_print, self.lun, transpose(styles)
+  self->_print, self.lun, '</style></head><body>'
+  
   return, 1B
 end