Changeset 54 for trunk

Timestamp:

04/13/09 12:22:23 (3 years ago)

Author:

mgalloy

Message:

Adding draft of GUI test runner.

Location:

trunk/mgunit

Files:

• RELEASE (modified) (1 diff)
• src/mgunit.pro (modified) (2 diffs)
• src/mgutclirunner__define.pro (modified) (2 diffs)
• src/mgutcompoundrunner__define.pro (modified) (2 diffs)
• src/mgutguirunner__define.pro (modified) (14 diffs)
• src/mguthtmlrunner__define.pro (modified) (1 diff)
• src/mguttestcase__define.pro (modified) (2 diffs)
• src/mguttestrunner__define.pro (modified) (3 diffs)
• src/mguttestsuite__define.pro (modified) (6 diffs)

trunk/mgunit/RELEASE

@@ -19 +19 @@
 
 * Several test runners for outputting test results to various formats are
-  available; output can be sent to stdout, log files, or html files.
+  available; output can be sent to stdout, log files, or html files. In
+  addition, there is a GUI test runner that will show results and re-run tests
+  with the push of a button (also recompiling tests before running them).
 
 * If there is common setup required for each test method in a test case, a

trunk/mgunit/src/mgunit.pro

@@ -16 +16 @@
 ;    html : in, optional, type=boolean
 ;       set to indicate HTML output instead of plain text
+;    gui : in, optional, type=boolean
+;       set to bring up an interactive GUI to run the tests
 ;    npass : out, optional, type=long
 ;       number of tests that passed
@@ -23 +25 @@
 ;       number of tests      
 ;-
-pro mgunit, tests, filename=filename, html=html, $
+pro mgunit, tests, filename=filename, html=html, gui=gui, $
             color=color, $
             npass=npass, nfail=nfail, ntests=ntests
   compile_opt strictarr
 
-  testRunner = obj_new('MGutCompoundRunner')
-  
-  runnerName = keyword_set(html) ? 'MGutHTMLRunner' : 'MGutCliRunner'
-  testRunner->add, obj_new(runnerName, filename=filename, color=color)
-  
-  npass = 0L
-  nfail = 0L
-  
+  case 1 of 
+    keyword_set(gui): runnerName = 'MGutGuiRunner'
+    keyword_set(html): runnerName = 'MGutHtmlRunner'
+    else: runnerName = 'MgutCliRunner'
+  endcase
+    
   if (n_elements(tests) gt 0) then begin
+    testRunner = obj_new('MGutCompoundRunner')
+    
+    npass = 0L
+    nfail = 0L
+
     testsuite = obj_new('MGutTestSuite', $
                         test_runner=testRunner, $
                         name='All tests')
+
+    testRunner->add, obj_new(runnerName, parent=testRunner, $
+                             filename=filename, color=color, $
+                             test_suite=testsuite)
+  
     testsuite->add, tests
     testsuite->run
     testsuite->getProperty, npass=npass, nfail=nfail, ntests=ntests
-    obj_destroy, testsuite
+    
+    if (~keyword_set(gui)) then obj_destroy, testRunner
   endif
-
-  obj_destroy, testRunner
 end

trunk/mgunit/src/mgutclirunner__define.pro

@@ -72 +72 @@
 ; 
 ; :Params:
-;    testcase {in}{required}{type=string} name of test case
+;    testcase : in, required, type=string
+;       name of test case
 ;
 ; :Keywords:
@@ -228 +229 @@
 ;       set to print color output
 ;-
-function mgutclirunner::init, filename=filename, color=color
-  compile_opt strictarr
-
-  if (~self->mguttestrunner::init()) then return, 0B
+function mgutclirunner::init, filename=filename, color=color, _extra=e
+  compile_opt strictarr
+
+  if (~self->mguttestrunner::init(_extra=e)) then return, 0B
 
   if (n_elements(filename) gt 0) then begin

trunk/mgunit/src/mgutcompoundrunner__define.pro

@@ -168 +168 @@
 ;       stdout
 ;-
-function mgutcompoundrunner::init, filename=filename
+function mgutcompoundrunner::init, filename=filename, _extra=e
   compile_opt strictarr
 
-  if (~self->mguttestrunner::init()) then return, 0B
+  if (~self->mguttestrunner::init(_extra=e)) then return, 0B
   if (~self->idl_container::init()) then return, 0B
-
+  
   return, 1B
 end
@@ -184 +184 @@
   compile_opt strictarr
   
-  define = { MGutCompoundRunner, inherits MGutTestRunner, inherits IDL_Container }
+  define = { MGutCompoundRunner, $
+             inherits MGutTestRunner, $
+             inherits IDL_Container $
+           }
 end

trunk/mgunit/src/mgutguirunner__define.pro

@@ -11 +11 @@
   compile_opt strictarr
 
-  widget_control, event.id, get_uvalue=widget
+  widget_control, event.top, get_uvalue=widget
   widget->_eventHandler, event
 end
@@ -45 +45 @@
   compile_opt strictarr
 
-  ;indent = level eq 0 ? '' : string(bytarr(level * self.indent) + self.space)
-  ;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
+  indent = level eq 0 ? '' : string(bytarr(level * self.indent) + self.space)
+  self->_print, 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') $
+                  + ')'
 end
 
@@ -76 +74 @@
   compile_opt strictarr
 
-  ;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
+  indent = level eq 0 ? '' : string(bytarr(level * self.indent) + self.space)
+  self->_print, indent + 'Results: ' $
+                  + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
+                  + ' tests passed'
 end
 
@@ -89 +85 @@
 ; 
 ; :Params:
-;    testcase {in}{required}{type=string} name of test case
+;    testcase : in, required, type=string
+;       name of test case
 ;
 ; :Keywords:
@@ -100 +97 @@
   compile_opt strictarr
 
-  ;indent = string(bytarr(level * self.indent) + self.space)
-  ;self->_print, self.logLun, $
-  ;              indent + '"' + testcase + '" test case starting' $
-  ;                + ' (' + strtrim(ntests, 2) $
-  ;                + ' test' + (ntests eq 1 ? '' : 's') + ')', $
-  ;              /blue 
+  indent = string(bytarr(level * self.indent) + self.space)
+  self->_print, indent + '"' + testcase + '" test case starting' $
+                  + ' (' + strtrim(ntests, 2) $
+                  + ' test' + (ntests eq 1 ? '' : 's') + ')'
 end
 
@@ -123 +118 @@
   compile_opt strictarr
 
-  ;indent = string(bytarr(level * self.indent) + self.space)
-  ;self->_print, self.logLun, $
-  ;              indent + 'Results: ' $
-  ;                + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
-  ;                + ' tests passed', $
-  ;              /blue
+  indent = string(bytarr(level * self.indent) + self.space)
+  self->_print, indent + 'Results: ' $
+                  + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $
+                  + ' tests passed'
 end
 
@@ -146 +139 @@
   compile_opt strictarr
 
-  ;indent = string(bytarr((level + 1L) * self.indent) + self.space)
-  ;self->_print, self.logLun, indent + testname + ': ', format='(A, $)'
+  indent = string(bytarr((level + 1L) * self.indent) + self.space)
+  self->_print, indent + testname + ': ', /continued
 end
 
@@ -167 +160 @@
   compile_opt strictarr
 
-  ;if (passed) then begin
-  ;  self->_print, self.logLun, 'passed', /green
-  ;endif else begin
-  ;  self->_print, self.logLun, 'failed' + (msg eq '' ? '' : ' "' + msg + '"'), /red
-  ;endelse
+  if (passed) then begin
+    self->_print, 'passed', /continued
+  endif else begin
+    self->_print, 'failed' + (msg eq '' ? '' : ' "' + msg + '"'), /continued
+  endelse
+  
+  self->_print, string(time, format='(%" (%f seconds)")')
+end
+
+
+pro mgutguirunner::_print, text, continued=continued, _extra=e
+  compile_opt strictarr
+  
+  if (self.continued) then begin
+    widget_control, self.text, get_value=fullText
+    fullText[n_elements(fullText) - 1L] += text
+    widget_control, self.text, set_value=fullText
+  endif else begin
+    widget_control, self.text, set_value=text, append=~self.cleared
+    self.cleared = 0B
+  endelse
+  
+  self.continued = keyword_set(continued)
 end
 
@@ -181 +192 @@
   compile_opt strictarr
 
+  obj_destroy, [self.suite, self.parent]
   self->mguttestrunner::cleanup
 end
 
 
+;+
+; Creates the user-interface for the GUI test runner.
+;-
 pro mgutguirunner::_createWidgets
   compile_opt strictarr
   
-  self.tlb = widget_base(title='mgunit', /column)
-end
-
-
+  self.tlb = widget_base(title='mgunit', /column, uvalue=self, uname='tlb', $
+                         /tlb_size_events)
+  
+  self.toolbar = widget_base(self.tlb, /toolbar, space=0)
+  
+  resourcedir = ['resource', 'bitmaps']
+  rerun = widget_button(self.toolbar, uname='rerun', $
+                        value=filepath('redo.bmp', subdir=resourcedir), $
+                        /bitmap)
+                        
+  self.text = widget_text(self.tlb, xsize=100, ysize=20, /scroll)
+end
+
+
+;+
+; Realizes the user-interface for the GUI test runner.
+;-
 pro mgutguirunner::_realizeWidgets
   compile_opt strictarr
   
-end
-
-
+  widget_control, self.tlb, /realize
+end
+
+
+;+
+; Starts up XMANAGER.
+;-
 pro mgutguirunner::_startXManager
   compile_opt strictarr
@@ -207 +239 @@
 
 
+;+
+; Handles all events from the GUI test runner.
+; 
+; :Params:
+;    event : in, required, type=structure
+;       event structure from any widget generating events in the GUI test 
+;       runner
+;-
 pro mgutguirunner::_eventHandler, event
   compile_opt strictarr
 
+  uname = widget_info(event.id, /uname)
+  
+  case uname of
+    'tlb': begin
+        tlbG = widget_info(event.top, /geometry)
+        toolbarG = widget_info(self.toolbar, /geometry)
+        
+        xsize = event.x - 2 * tlbG.xpad
+        ysize = event.y - 2 * tlbG.ypad - tlbG.space - toolbarG.scr_ysize
+        
+        widget_control, self.text, scr_xsize=xsize, scr_ysize=ysize
+      end
+    'rerun': begin
+        ; clear text widget
+        widget_control, self.text, set_value=''
+        self.cleared = 1B
+        
+        ; rerun tests
+        self.suite->recompileTestCases
+        self.suite->run
+      end
+    else:
+  endcase
 end
 
@@ -216 +279 @@
   compile_opt strictarr
   
+  obj_destroy, self
 end
 
@@ -225 +289 @@
 ;    1 for success, 0 for failure
 ;-
-function mgutguirunner::init
-  compile_opt strictarr
-
-  if (~self->mguttestrunner::init()) then return, 0B
+function mgutguirunner::init, filename=filename, color=color, _extra=e
+  compile_opt strictarr
+
+  if (~self->mguttestrunner::init(_extra=e)) then return, 0B
 
   self->_createWidgets
   self->_realizeWidgets
   self->_startXManager
+
+  self.cleared = 0B
+  self.indent = 3L
+  self.space = (byte(' '))[0]
   
   return, 1B
@@ -244 +312 @@
 ;    tlb
 ;       top-level base of GUI
+;    text
+;    continued
 ;-
 pro mgutguirunner__define
@@ -249 +319 @@
 
   define = { mgutguirunner, inherits MGutTestRunner, $
-             tlb : 0L $
+             tlb: 0L, $
+             toolbar: 0L, $
+             text: 0L, $
+             continued: 0B, $
+             cleared: 0B, $
+             indent: 0L, $
+             space: '' $
            }
 end

trunk/mgunit/src/mguthtmlrunner__define.pro

@@ -184 +184 @@
 ;       stdout
 ;    color : in, optional, type=boolean
-;       unused for MGutHTMLRunner
-;-
-function mguthtmlrunner::init, filename=filename, color=color
-  compile_opt strictarr
-
-  if (~self->mguttestrunner::init()) then return, 0B
+;       unused for MGutHtmlRunner
+;    _extra : in, optional, type=keywords
+;       keywords to MGutTestRunner::init
+;-
+function mguthtmlrunner::init, filename=filename, color=color, _extra=e
+  compile_opt strictarr
+
+  if (~self->mguttestrunner::init(_extra=e)) then return, 0B
 
   ; make the directory the output file is in if it doesn't exist

trunk/mgunit/src/mguttestcase__define.pro

@@ -133 +133 @@
   compile_opt strictarr, logical_predicate
 
+  self.npass = 0L
+  self.nfail = 0L
+  
   self.testRunner->reportTestCaseStart, strlowcase(obj_class(self)), $
                                         ntests=self.ntests, $
@@ -288 +291 @@
 
   self.level = 0L
-  self.npass = 0L
-  self.nfail = 0L
 
   return, 1B

trunk/mgunit/src/mguttestrunner__define.pro

@@ -127 +127 @@
   compile_opt strictarr
 
+  if (obj_valid(self.parent)) then obj_destroy, self.parent
 end
 
@@ -136 +137 @@
 ;    1 for success, 0 for failure
 ;-
-function mguttestrunner::init
+function mguttestrunner::init, parent=parent, test_suite=testSuite
   compile_opt strictarr
+
+  self.suite = obj_valid(testsuite) ? testsuite : obj_new()
+  self.parent = obj_valid(parent) ? parent : obj_new()
   
   return, 1B
@@ -147 +151 @@
 ;
 ; :Fields:
-;    dummy 
-;       needed because IDL requires at least one field
+;    suite
+;       suite of tests the runner will run
+;    parent
+;       parent compound test, if present
 ;-
 pro mguttestrunner__define
   compile_opt strictarr
 
-  define = { MGutTestRunner, dummy : 0L }
+  define = { MGutTestRunner, $
+             suite: obj_new(), $
+             parent: obj_new() $ 
+           }
 end

trunk/mgunit/src/mguttestsuite__define.pro

@@ -6 +6 @@
 ; use the add method to add test suites/cases.
 ;-
+
 
 ;+
@@ -59 +60 @@
 
 ;+
+; Recompiles all test cases contained by the suite or contained by child 
+; suites.
+;-
+pro mguttestsuite::recompileTestCases
+  compile_opt strictarr
+  
+  for i = 0L, self.testcases->count() - 1L do begin
+    testcase = self.testcases->get(position=i)
+    if (obj_isa(testcase, 'MGutTestSuite')) then begin
+      testcase->recompileTestCases
+    endif else begin
+      self->_recompile, obj_class(testcase)
+    endelse
+  endfor
+end
+
+
+;+
 ; Run the contained test suites or test cases.
 ;-
@@ -64 +83 @@
   compile_opt strictarr
 
+  self.npass = 0L
+  self.nfail = 0L
+  
   self->getProperty, name=name, ntestcases=ntestcases, ntests=ntests
   self.testRunner->reportTestSuiteStart, name, $
@@ -270 +292 @@
   self.testcases = obj_new('IDL_Container')
 
-  self.npass = 0L
-  self.nfail = 0L
-
   return, 1B
 end
@@ -283 +302 @@
 ;    name 
 ;       name of the object
+;    home
+;       directory (with trailing slash) containing the source code for this
+;       test suite
 ;    level 
 ;       number of layers below the top-most containing test suite
@@ -300 +322 @@
 
   define = { MGutTestSuite, $
-             name : '', $
-             home : '', $
-             level : 0L, $
-             testcases : obj_new(), $
-             testRunner : obj_new(), $
-             npass : 0L, $
-             nfail : 0L $
+             name: '', $
+             home: '', $
+             level: 0L, $
+             testcases: obj_new(), $
+             testRunner: obj_new(), $
+             npass: 0L, $
+             nfail: 0L $
            }
 end