Changeset 31

Timestamp:

03/06/09 13:54:24 (3 years ago)

Author:

mgalloy

Message:

Adding color to test case/suite start/ends.

Location:

trunk/mgunit/src

Files:

• mgutclirunner__define.pro (modified) (7 diffs)
• mg_ansicode.pro (modified) (2 diffs)

trunk/mgunit/src/mgutclirunner__define.pro

@@ -29 +29 @@
 
   indent = level eq 0 ? '' : string(bytarr(level * self.indent) + self.space)
-  printf, self.logLun, $
-          indent + '"' + testsuite $
-          + '" 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') $
-          + ')'
+  self->_print, self.logLun, $
+                indent + '"' + testsuite $
+                  + '" 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') $
+                  + ')', $
+                /magenta
 end
 
@@ -58 +59 @@
   compile_opt strictarr
 
-  indent = string(bytarr((level + 1L) * self.indent) + self.space)
-  printf, self.logLun, $
-          indent + 'Results: ' $
-          + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
-          + ' tests passed'
+  indent = level eq 0 ? '' : string(bytarr(level * self.indent) + self.space)
+  self->_print, self.logLun, $
+                indent + 'Results: ' $
+                  + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
+                  + ' tests passed', $
+                /magenta
 end
 
@@ -82 +84 @@
 
   indent = string(bytarr(level * self.indent) + self.space)
-  printf, self.logLun, $
-          indent + '"' + testcase + '" test case starting'$
-          + ' (' + strtrim(ntests, 2) + ' test' + (ntests eq 1 ? '' : 's') + ')' 
+  self->_print, self.logLun, $
+                indent + '"' + testcase + '" test case starting' $
+                  + ' (' + strtrim(ntests, 2) $
+                  + ' test' + (ntests eq 1 ? '' : 's') + ')', $
+                /blue 
 end
 
@@ -102 +106 @@
   compile_opt strictarr
 
-  indent = string(bytarr((level + 1L) * self.indent) + self.space)
-  printf, self.logLun, $
-          indent + 'Results: ' $
-          + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
-          + ' tests passed'
+  indent = string(bytarr(level * self.indent) + self.space)
+  self->_print, self.logLun, $
+                indent + 'Results: ' $
+                  + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
+                  + ' tests passed', $
+                /blue
 end
 
@@ -125 +130 @@
 
   indent = string(bytarr((level + 1L) * self.indent) + self.space)
-  printf, self.logLun, indent + testname + ': ', format='(A, $)'
+  self->_print, self.logLun, indent + testname + ': ', format='(A, $)'
 end
 
@@ -168 +173 @@
   
   if (self.isTty) then begin
-    printf, lun, mg_ansicode(text, _extra=e)
+    printf, lun, mg_ansicode(text, _extra=e), _extra=e
   endif else begin
-    printf, lun, text
+    printf, lun, text, _extra=e
   endelse
 end
@@ -238 +243 @@
   self.indent = 3L
   self.space = (byte(' '))[0]
-  self.isTty = keyword_set(color) || self->_findIfTty()
+  self.isTty = n_elements(color) gt 0L ? keyword_set(color) : self->_findIfTty()
   
   !quiet = 1

trunk/mgunit/src/mg_ansicode.pro

@@ -30 +30 @@
 ;-
 function mg_ansicode, text, $
+                      bold=bold, $
                       bright=bright, $
                       black=black, red=red, green=green, yellow=yellow, $
@@ -74 +75 @@
   if (keyword_set(backgroundBright)) then background += 60  
 
-  if (n_elements(foreground) gt 0L || n_elements(background) gt 0L) then begin
+  if (n_elements(foreground) gt 0L || n_elements(background) gt 0L $
+        || keyword_set(bold)) then begin
     codes = ''
+    codes += keyword_set(bold) ? string(esc, 1, format='(%"%s[%dm")') : ''
     codes += (n_elements(foreground) gt 0L) $
                ? string(esc, foreground, format='(%"%s[%dm")') $