Changeset 53

Timestamp:

04/09/09 15:45:01 (3 years ago)

Author:

mgalloy

Message:

Added timings.

Location:

trunk/mgunit/src

Files:

• mgutclirunner__define.pro (modified) (1 diff)
• mgutcompoundrunner__define.pro (modified) (1 diff)
• mgutguirunner__define.pro (modified) (1 diff)
• mguthtmlrunner__define.pro (modified) (1 diff)
• mguttestcase__define.pro (modified) (5 diffs)
• mguttestrunner__define.pro (modified) (1 diff)
• style.css (modified) (1 diff)

trunk/mgunit/src/mgutclirunner__define.pro

@@ -144 +144 @@
 ;    passed : in, required, type=boolean
 ;       whether the test passed
-;-
-pro mgutclirunner::reportTestResult, msg, passed=passed
+;    time : in, required, type=float
+;       time for the test to run
+;-
+pro mgutclirunner::reportTestResult, msg, passed=passed, time=time
   compile_opt strictarr
 
   if (passed) then begin
-    self->_print, self.logLun, 'passed', /green
+    self->_print, self.logLun, 'passed', /green, format='(A, $)'
   endif else begin
-    self->_print, self.logLun, 'failed' + (msg eq '' ? '' : ' "' + msg + '"'), /red
+    self->_print, self.logLun, 'failed' + (msg eq '' ? '' : ' "' + msg + '"'), /red, format='(A, $)'
   endelse
+  
+  self->_print, self.logLun, string(time, format='(%" (%f seconds)")')
 end
 

trunk/mgunit/src/mgutcompoundrunner__define.pro

@@ -133 +133 @@
 ;    passed : in, required, type=boolean
 ;       whether the test passed
+;    time : in, required, type=float
+;       time for the test to run
 ;-
-pro mgutcompoundrunner::reportTestResult, msg, passed=passed
+pro mgutcompoundrunner::reportTestResult, msg, passed=passed, time=time
   compile_opt strictarr
 
   for i = 0L, self->count() - 1L do begin
     r = self->get(position=i)
-    r->reportTestResult, msg, passed=passed
+    r->reportTestResult, msg, passed=passed, time=time
   endfor
 end

trunk/mgunit/src/mgutguirunner__define.pro

@@ -161 +161 @@
 ;    passed : in, required, type=boolean
 ;       whether the test passed
-;-
-pro mgutguirunner::reportTestResult, msg, passed=passed
+;    time : in, required, type=float
+;       time for the test to run
+;-
+pro mgutguirunner::reportTestResult, msg, passed=passed, time=time
   compile_opt strictarr
 

trunk/mgunit/src/mguthtmlrunner__define.pro

@@ -138 +138 @@
 ;    passed : in, required, type=boolean
 ;       whether the test passed
-;-
-pro mguthtmlrunner::reportTestResult, msg, passed=passed
+;    time : in, required, type=float
+;       time for the test to run
+;-
+pro mguthtmlrunner::reportTestResult, msg, passed=passed, time=time
   compile_opt strictarr
 
   result = keyword_set(passed) ? 'passed' : 'failed'
-  printf, self.lun, $
-    '<span class="' + result + '">' $
-    + result $
-    + (keyword_set(passed) ? '': (msg eq '' ? '' : ' "' + msg + '"')) $
-    + '</span></li>'
+  ;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>")'   
 end
 

trunk/mgunit/src/mguttestcase__define.pro

@@ -43 +43 @@
   compile_opt strictarr, logical_predicate
 
-  error = 0L
   catch, error
   if (error ne 0L) then begin
     catch, /cancel
+    self.time = systime(/seconds) - self.time
     msg = !error_state.msg
     return, 0L   ; fail
@@ -52 +52 @@
 
   !error_state.msg = ''
+  
+  self.time = systime(/seconds)
   result = call_method(testname, self)
+  self.time = systime(/seconds) - self.time
+  
   if (~result) then msg = !error_state.msg
   return, keyword_set(result)
@@ -180 +184 @@
                 : msg)
                       
-    self.testRunner->reportTestResult, logMsg, passed=passed
+    self.testRunner->reportTestResult, logMsg, passed=passed, time=self.time
   endfor
 
@@ -307 +311 @@
 ;    nfail 
 ;       number of failing tests
+;    time
+;       time for the current test to run
 ;-
 pro mguttestcase__define
@@ -312 +318 @@
 
   define = { MGutTestCase, $
-             testRunner : obj_new(), $
-             testnames : ptr_new(), $
-             level : 0L, $
-             ntests : 0L, $
-             npass : 0L, $
-             nfail : 0L $
+             testRunner: obj_new(), $
+             testnames: ptr_new(), $
+             level: 0L, $
+             ntests: 0L, $
+             npass: 0L, $
+             nfail: 0L, $
+             time: 0.0D $
              }             
 end

trunk/mgunit/src/mguttestrunner__define.pro

@@ -112 +112 @@
 ;    passed : in, required, type=boolean
 ;       whether the test passed
+;    time : in, required, type=float
+;       time for the test to run
 ;-
-pro mguttestrunner::reportTestResult, msg, passed=passed
+pro mguttestrunner::reportTestResult, msg, passed=passed, time=time
   compile_opt strictarr
 

trunk/mgunit/src/style.css

@@ -6 +6 @@
 .passed { color: #060; }
 .failed { color: #C00; }
+.time { color: #888; font-size: 9pt; margin-left: 1em; }
 .results { }