diff options
Diffstat (limited to 'non-puppet/qtmetrics2/templates/testset_testfunctions.html')
| -rw-r--r-- | non-puppet/qtmetrics2/templates/testset_testfunctions.html | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/non-puppet/qtmetrics2/templates/testset_testfunctions.html b/non-puppet/qtmetrics2/templates/testset_testfunctions.html index 04b989d..d2ee081 100644 --- a/non-puppet/qtmetrics2/templates/testset_testfunctions.html +++ b/non-puppet/qtmetrics2/templates/testset_testfunctions.html @@ -34,7 +34,7 @@ /** * Testset page (list of test functions) - * @since 17-09-2015 + * @since 21-09-2015 * @author Juha Sippola */ @@ -102,7 +102,8 @@ <li>results: <span class="glyphicon glyphicon-remove red"></span> = {{ constant('TestfunctionRun::RESULT_FAILURE') }}, <span class="glyphicon glyphicon-ok-sign red"></span> = {{ constant('TestfunctionRun::RESULT_SUCCESS_UNEXPECTED') }}, <span class="glyphicon glyphicon-remove-sign green"></span> = {{ constant('TestfunctionRun::RESULT_FAILURE_EXPECTED') }}, -<span class="glyphicon glyphicon-ban-circle gray"></span> = {{ constant('TestfunctionRun::RESULT_SKIP') }}</li> +<span class="glyphicon glyphicon-ban-circle gray"></span> = {{ constant('TestfunctionRun::RESULT_SKIP') }}, +<span class="glyphicon glyphicon-ok green"></span> = {{ constant('TestfunctionRun::RESULT_SUCCESS') }} (blacklisted only)</li> </ul> </li> <li>Details on the runs are available as tooltip on result icon</li> @@ -116,7 +117,7 @@ <div class="panel panel-primary"> <div class="panel-heading"> -<h4 class="panel-title bold">Test Function Results in Branches <small>(failures and skipped only)</small></h4> +<h4 class="panel-title bold">Test Function Results in Branches <small>(failures, skipped or blacklisted only)</small></h4> </div> </div> @@ -247,21 +248,23 @@ {% if key > buildKeyIndexPrinted and not buildKeyFound %} {% if buildKey == run.getBuildKey %} {# Print result #} -{% if run.getResult == constant('TestfunctionRun::RESULT_FAILURE') %} -{% set resultIcon = 'glyphicon glyphicon-remove red' %} +{% if run.getResult == constant('TestfunctionRun::RESULT_SUCCESS') %} +{% set resultIcon = 'glyphicon glyphicon-ok green' %} +{% elseif run.getResult == constant('TestfunctionRun::RESULT_FAILURE') %} +{% set resultIcon = 'glyphicon glyphicon-remove red' %} {% elseif run.getResult == constant('TestfunctionRun::RESULT_FAILURE_EXPECTED') %} -{% set resultIcon = 'glyphicon glyphicon-remove-sign green' %} +{% set resultIcon = 'glyphicon glyphicon-remove-sign green' %} {% elseif run.getResult == constant('TestfunctionRun::RESULT_SUCCESS_UNEXPECTED') %} -{% set resultIcon = 'glyphicon glyphicon-ok-sign red' %} +{% set resultIcon = 'glyphicon glyphicon-ok-sign red' %} {% elseif run.getResult == constant('TestfunctionRun::RESULT_SKIP') %} -{% set resultIcon = 'glyphicon glyphicon-ban-circle gray' %} +{% set resultIcon = 'glyphicon glyphicon-ban-circle gray' %} {% else %} -{% set resultIcon = '' %} +{% set resultIcon = '' %} {% endif %} {% if (run.getDuration / 10) > 60 %} -{% set durationFormatted = ' (00:' ~ ((run.getDuration/10)|round)|date("i:s") ~ ')' %} +{% set durationFormatted = ' (00:' ~ ((run.getDuration/10)|round)|date("i:s") ~ ')' %} {% else %} -{% set durationFormatted = '' %} +{% set durationFormatted = '' %} {% endif %} {% if run.getChildren %} {% set testrowResult = '(in test rows)' %} |