Changeset 88

Show
Ignore:
Timestamp:
02/04/10 22:01:18 (2 years ago)
Author:
mgalloy
Message:

Cleaning up changes from adding skipped option for a test. Resolves ticket #8.

Location:
trunk/src
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/mgutclirunner__define.pro

    r86 r88  
    5353;       number of failing tests contained in the hierarchy below the test  
    5454;       suite 
     55;    nskip : in, required, type=integer 
     56;       number of skipped tests contained in the hierarchy below the test  
     57;       suite 
    5558;    level : in, required, type=integer 
    5659;       level of test suite 
    5760;- 
    58 pro mgutclirunner::reportTestSuiteResult, npass=npass, nfail=nfail, level=level 
    59   compile_opt strictarr 
    60  
     61pro mgutclirunner::reportTestSuiteResult, npass=npass, nfail=nfail, $ 
     62                                          nskip=nskip, level=level 
     63  compile_opt strictarr 
     64 
     65  format = '(%"%sResults: %d / %d tests passed, %d skipped")' 
    6166  indent = level eq 0 ? '' : string(bytarr(level * self.indent) + self.space) 
    6267  self->_print, self.logLun, $ 
    63                 indent + 'Results: ' $ 
    64                   + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $ 
    65                   + ' tests passed', $ 
     68                string(indent, npass, npass + nfail, nskip, format=format), $ 
    6669                /magenta 
    6770end 
    … …  
    101104;    nfail : in, required, type=integer 
    102105;       number of failing tests 
    103 ;    level : in, required, type=integer 
    104 ;       level of test case 
    105 ;- 
    106 pro mgutclirunner::reportTestCaseResult, npass=npass, nfail=nfail, level=level 
    107   compile_opt strictarr 
    108  
     106;    nskip : in, required, type=integer 
     107;       number of skipped tests 
     108;    level : in, required, type=integer 
     109;       level of test case 
     110;- 
     111pro mgutclirunner::reportTestCaseResult, npass=npass, nfail=nfail, $ 
     112                                         nskip=nskip, level=level 
     113  compile_opt strictarr 
     114 
     115  format = '(%"%sResults: %d / %d tests passed, %d skipped")' 
    109116  indent = string(bytarr(level * self.indent) + self.space) 
    110117  self->_print, self.logLun, $ 
    111                 indent + 'Results: ' $ 
    112                   + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $ 
    113                   + ' tests passed', $ 
     118                string(indent, npass, npass + nfail, nskip, format=format), $ 
    114119                /blue 
    115120end 

  • trunk/src/mgutcompoundrunner__define.pro

    r86 r88  
    4545;       number of failing tests contained in the hierarchy below the test  
    4646;       suite 
     47;    nskip : in, required, type=integer 
     48;       number of skipped tests contained in the hierarchy below the test  
     49;       suite 
    4750;    level : in, required, type=integer 
    4851;       level of test suite 
    4952;- 
    50 pro mgutcompoundrunner::reportTestSuiteResult, npass=npass, nfail=nfail, level=level 
    51   compile_opt strictarr 
    52  
    53   for i = 0L, self->count() - 1L do begin 
    54     r = self->get(position=i) 
    55     r->reportTestSuiteResult, npass=npass, nfail=nfail, level=level 
     53pro mgutcompoundrunner::reportTestSuiteResult, npass=npass, nfail=nfail, $ 
     54                                               nskip=nskip, level=level 
     55  compile_opt strictarr 
     56 
     57  for i = 0L, self->count() - 1L do begin 
     58    r = self->get(position=i) 
     59    r->reportTestSuiteResult, npass=npass, nfail=nfail, nskip=nskip, level=level 
    5660  endfor 
    5761end 
    … …  
    8993;    nfail : in, required, type=integer 
    9094;       number of failing tests 
    91 ;    level : in, required, type=integer 
    92 ;       level of test case 
    93 ;- 
    94 pro mgutcompoundrunner::reportTestCaseResult, npass=npass, nfail=nfail, level=level 
    95   compile_opt strictarr 
    96  
    97   for i = 0L, self->count() - 1L do begin 
    98     r = self->get(position=i) 
    99     r->reportTestCaseResult, npass=npass, nfail=nfail, level=level 
     95;    nskip : in, required, type=integer 
     96;       number of skipped tests 
     97;    level : in, required, type=integer 
     98;       level of test case 
     99;- 
     100pro mgutcompoundrunner::reportTestCaseResult, npass=npass, nfail=nfail, $ 
     101                                              nskip=nskip, level=level 
     102  compile_opt strictarr 
     103 
     104  for i = 0L, self->count() - 1L do begin 
     105    r = self->get(position=i) 
     106    r->reportTestCaseResult, npass=npass, nfail=nfail, nskip=nskip, level=level 
    100107  endfor 
    101108end 

  • trunk/src/mgutguirunner__define.pro

    r86 r88  
    6868;       number of failing tests contained in the hierarchy below the test  
    6969;       suite 
     70;    nskip : in, required, type=integer 
     71;       number of skipped tests contained in the hierarchy below the test  
     72;       suite 
    7073;    level : in, required, type=integer 
    7174;       level of test suite 
    7275;- 
    73 pro mgutguirunner::reportTestSuiteResult, npass=npass, nfail=nfail, level=level 
    74   compile_opt strictarr 
    75  
     76pro mgutguirunner::reportTestSuiteResult, npass=npass, nfail=nfail, $ 
     77                                          nskip=nskip, level=level 
     78  compile_opt strictarr 
     79 
     80  format = '(%"%sResults: %d / %d tests passed, %d skipped")' 
    7681  indent = level eq 0 ? '' : string(bytarr(level * self.indent) + self.space) 
    77   self->_print, indent + 'Results: ' $ 
    78                   + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $ 
    79                   + ' tests passed' 
     82  self->_print, string(indent, npass, npass + nfail, nskip, format=format) 
    8083end 
    8184 
    … …  
    112115;    nfail : in, required, type=integer 
    113116;       number of failing tests 
     117;    nskip : in, required, type=integer 
     118;       number of skipped tests 
    114119;    level : in, required, type=integer 
    115120;       level of test case 
    116121;- 
    117 pro mgutguirunner::reportTestCaseResult, npass=npass, nfail=nfail, level=level 
    118   compile_opt strictarr 
    119  
     122pro mgutguirunner::reportTestCaseResult, npass=npass, nfail=nfail, $ 
     123                                         nskip=nskip, level=level 
     124  compile_opt strictarr 
     125 
     126  format = '(%"%sResults: %d / %d tests passed, %d skipped")' 
    120127  indent = string(bytarr(level * self.indent) + self.space) 
    121   self->_print, indent + 'Results: ' $ 
    122                   + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $ 
    123                   + ' tests passed' 
     128  self->_print, string(indent, npass, npass + nfail, nskip, format=format) 
    124129end 
    125130 

  • trunk/src/mguthtmlrunner__define.pro

    r86 r88  
    5151;       number of failing tests contained in the hierarchy below the test  
    5252;       suite 
     53;    nskip : in, required, type=integer 
     54;       number of skipped tests contained in the hierarchy below the test  
     55;       suite 
    5356;    level : in, required, type=integer 
    5457;       level of test suite 
    5558;- 
    56 pro mguthtmlrunner::reportTestSuiteResult, npass=npass, nfail=nfail, level=level 
    57   compile_opt strictarr 
    58  
    59   self->_print, self.lun, $ 
    60                 '<span class="results">Results: ' $ 
    61                   + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $ 
    62                   + ' tests passed</span></ul>' 
     59pro mguthtmlrunner::reportTestSuiteResult, npass=npass, nfail=nfail, $ 
     60                                           nskip=nskip, level=level 
     61  compile_opt strictarr 
     62 
     63  format = '(%"<span class=\"results\">Results: %d / %d tests passed, %d skipped</span></ul>")' 
     64  self->_print, self.lun, string(npass, npass + nfail, nskip, format=format) 
    6365end 
    6466 
    … …  
    9698;    nfail : in, required, type=integer 
    9799;       number of failing tests 
    98 ;    level : in, required, type=integer 
    99 ;       level of test case 
    100 ;- 
    101 pro mguthtmlrunner::reportTestCaseResult, npass=npass, nfail=nfail, level=level 
    102   compile_opt strictarr 
    103  
     100;    nskip : in, required, type=integer 
     101;       number of skipped tests 
     102;    level : in, required, type=integer 
     103;       level of test case 
     104;- 
     105pro mguthtmlrunner::reportTestCaseResult, npass=npass, nfail=nfail, $ 
     106                                          nskip=nskip, level=level 
     107  compile_opt strictarr 
     108 
     109  format = '(%"<span class=\"results\">Results: %d / %d tests passed, %d skipped</span></ul>")' 
    104110  self->_print, self.lun, '</ol>' 
    105   self->_print, self.lun, $ 
    106                 '<span class="results">Results: ' $ 
    107                   + strtrim(npass, 2) + ' / ' + strtrim(npass + nfail, 2) $ 
    108                   + ' tests passed</span></ul>' 
     111  self->_print, self.lun, string(npass, npass + nfail, nskip, format=format) 
    109112end 
    110113 
    … …  
    150153 
    151154  result = skipped $ 
    152              ? 'skipped' 
    153              : (keyword_set(passed) ? 'passed' : 'failed') $ 
    154    
     155             ? 'skipped' $ 
     156             : (keyword_set(passed) ? 'passed' : 'failed') 
     157 
    155158  s = string(result, $ 
    156159             result, $ 
    157              keyword_set(passed) ? '': (msg eq '' ? '' : ' "' + msg + '"'), $ 
     160             (passed && ~skipped) ? '': (msg eq '' ? '' : ' "' + msg + '"'), $ 
    158161             time, $ 
    159162             format='(%"<span class=\"%s\">%s%s</span> <span class=\"time\">%f seconds</span></li>")') 

  • trunk/src/mgutjunitrunner__define.pro

    r86 r88  
    4444;       number of failing tests contained in the hierarchy below the test  
    4545;       suite 
     46;    nskip : in, required, type=integer 
     47;       number of skipped tests contained in the hierarchy below the test  
     48;       suite 
    4649;    level : in, required, type=integer 
    4750;       level of test suite 
    4851;- 
    49 pro mgutjunitrunner::reportTestSuiteResult, npass=npass, nfail=nfail, level=level 
     52pro mgutjunitrunner::reportTestSuiteResult, npass=npass, nfail=nfail, $ 
     53                                            nskip=nskip, level=level 
    5054  compile_opt strictarr 
    5155 
    … …  
    8791;    nfail : in, required, type=integer 
    8892;       number of failing tests 
    89 ;    level : in, required, type=integer 
    90 ;       level of test case 
    91 ;- 
    92 pro mgutjunitrunner::reportTestCaseResult, npass=npass, nfail=nfail, level=level 
     93;    nskip : in, required, type=integer 
     94;       number of skipped tests 
     95;    level : in, required, type=integer 
     96;       level of test case 
     97;- 
     98pro mgutjunitrunner::reportTestCaseResult, npass=npass, nfail=nfail, $ 
     99                                           nskip=nskip, level=level 
    93100  compile_opt strictarr 
    94101 

  • trunk/src/mguttestcase__define.pro

    r86 r88  
    135135  self.npass = 0L 
    136136  self.nfail = 0L 
     137  self.nskip = 0L 
    137138   
    138139  self.testRunner->reportTestCaseStart, strlowcase(obj_class(self)), $ 
    … …  
    172173      msg = !error_state.msg 
    173174      self->_removePrefix, msg, 'ASSERT: ' 
     175      ++self.nskip 
    174176    endif else begin 
    175177      if (passed) then begin 
    … …  
    187189     
    188190    ; construct the log message for the test 
    189     logMsg = passed $ 
     191    logMsg = (passed && ~self.skipped) $ 
    190192             ? '' $  
    191193             : (n_elements(msg) eq 0 $ 
    192194                ? '' $ 
    193195                : msg) 
    194                        
     196 
    195197    self.testRunner->reportTestResult, logMsg, passed=passed, $ 
    196198                                       skipped=self.skipped, $ 
    … …  
    200202  self.testRunner->reportTestCaseResult, npass=self.npass, $ 
    201203                                         nfail=self.nfail, $ 
     204                                         nskip=self.nskip, $ 
    202205                                         level=self.level 
    203206end 
    … …  
    239242;    nfail : out, optional, type=integer  
    240243;       number of failing tests 
     244;    nskip : out, optional, type=integer  
     245;       number of skipped tests 
    241246;    ntests : out, optional, type=integer 
    242247;       number of tests 
    … …  
    244249;       array of method names which begin with "test" 
    245250;- 
    246 pro mguttestcase::getProperty, npass=npass, nfail=nfail, ntests=ntests, $ 
    247                                testnames=testnames 
     251pro mguttestcase::getProperty, npass=npass, nfail=nfail, nskip=nskip, $ 
     252                               ntests=ntests, testnames=testnames 
    248253  compile_opt strictarr 
    249254   
    250255  npass = self.npass 
    251256  nfail = self.nfail 
     257  nskip = self.nskip 
    252258  ntests = self.ntests 
    253259  if (arg_present(testnames)) then testnames = *self.testnames 
    … …  
    333339             npass: 0L, $ 
    334340             nfail: 0L, $ 
     341             nskip: 0L, $ 
    335342             time: 0.0D, $ 
    336343             skipped: 0B $ 

  • trunk/src/mguttestrunner__define.pro

    r86 r88  
    7676;    nfail : in, required, type=integer 
    7777;       number of failing tests 
     78;    nskip : in, required, type=integer 
     79;       number of skipped tests 
    7880;    level : in, required, type=integer  
    7981;       level of test case 
    8082;- 
    81 pro mguttestrunner::reportTestCaseResult, npass=npass, nfail=nfail, level=level 
     83pro mguttestrunner::reportTestCaseResult, npass=npass, nfail=nfail, $ 
     84                                          nskip=nskip, level=level 
    8285  compile_opt strictarr 
    8386 

  • trunk/src/mguttestsuite__define.pro

    r54 r88  
    8585  self.npass = 0L 
    8686  self.nfail = 0L 
     87  self.nskip = 0L 
    8788   
    8889  self->getProperty, name=name, ntestcases=ntestcases, ntests=ntests 
    … …  
    9899 
    99100    ; accumulate results 
    100     otestcase->getProperty, npass=npass, nfail=nfail 
     101    otestcase->getProperty, npass=npass, nfail=nfail, nskip=nskip 
    101102    self.npass += npass 
    102103    self.nfail += nfail 
     104    self.nskip += nskip 
    103105  endfor 
    104106 
    105107  self.testRunner->reportTestSuiteResult, npass=self.npass, $ 
    106108                                          nfail=self.nfail, $ 
     109                                          nskip=self.nskip, $ 
    107110                                          level=self.level 
    108111end 
    … …  
    201204;    nfail : out, optional, type=integer 
    202205;       number of failing tests contained in the hierarchy below this object 
     206;    nskip : out, optional, type=integer 
     207;       number of skipped tests contained in the hierarchy below this object 
    203208;    ntestcases : out, optional, type=integer 
    204209;       number of directly contained test suites or test cases 
    … …  
    206211;       number of tests contained in the hierarchy below this object 
    207212;- 
    208 pro mguttestsuite::getProperty, name=name, npass=npass, nfail=nfail, $ 
     213pro mguttestsuite::getProperty, name=name, $ 
     214                                npass=npass, nfail=nfail, nskip=nskip, $ 
    209215                                ntestcases=ntestcases, ntests=ntests 
    210216  compile_opt strictarr 
    … …  
    213219  npass = self.npass 
    214220  nfail = self.nfail 
     221  nskip = self.nskip 
     222   
    215223  if (arg_present(ntestcases)) then ntestcases = self.testcases->count() 
    216224 
    … …  
    317325;       number of failing tests contained in the hierarchy below this test  
    318326;       suite 
     327;    nskip 
     328;       number of skipped tests contained in the hierarchy below this test  
     329;       suite 
    319330;- 
    320331pro mguttestsuite__define 
    … …  
    328339             testRunner: obj_new(), $ 
    329340             npass: 0L, $ 
    330              nfail: 0L $ 
     341             nfail: 0L, $ 
     342             nskip: 0L $ 
    331343           } 
    332344end 

  • trunk/src/style.css

    r53 r88  
    66.passed { color: #060; } 
    77.failed { color: #C00; } 
     8.skipped { color: #CC0; } 
    89.time { color: #888; font-size: 9pt; margin-left: 1em; } 
    910.results { }