Qt Metrics 2 (0.27): Terminology change

Terms 'testfunction' and 'testrow' changed to 'test function'
and 'test row'.
Some table titles changed to reflect the column content
better by using the terms mentioned above.

Change-Id: Ibdbcb35c2d781e80bd2894e85a91b4afa018baba
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>

6 files changed, 24 insertions, 24 deletions

diff --git a/non-puppet/qtmetrics2/templates/about.html b/non-puppet/qtmetrics2/templates/about.html
index 39a63d2..a89ca85 100644
--- a/non-puppet/qtmetrics2/templates/about.html
+++ b/non-puppet/qtmetrics2/templates/about.html
@@ -52,4 +52,4 @@ and the global Qt developer community are the target audience. For detailed desc
 <p>See the <strong><a href="https://wiki.qt.io/Qt_Metrics_2_Backlog" target="_blank">backlog</a></strong>
 for development items currently identified or in progress.</p>
 
-<p><small>Version 0.26 (16-Sep-2015)</small></p>
+<p><small>Version 0.27 (16-Sep-2015)</small></p>
diff --git a/non-puppet/qtmetrics2/templates/build_project.html b/non-puppet/qtmetrics2/templates/build_project.html
index 70f0b2e..fa12d6b 100644
--- a/non-puppet/qtmetrics2/templates/build_project.html
+++ b/non-puppet/qtmetrics2/templates/build_project.html
@@ -34,7 +34,7 @@
 
 /**
  * Build project page
- * @since     03-08-2015
+ * @since     16-09-2015
  * @author    Juha Sippola
  */
 
@@ -242,7 +242,7 @@ title="<table>
 <table class="table table-striped">
 <thead>
 <tr>
-<th class="bold">{{ project.getName }}</th>
+<th class="bold">configuration</th>
 <th class="bold rightBorder">flags</th>
 {%              for key, buildKey in buildKeys %}
 <th class="center">
diff --git a/non-puppet/qtmetrics2/templates/testfunction.html b/non-puppet/qtmetrics2/templates/testfunction.html
index 6c1f616..e9c269e 100644
--- a/non-puppet/qtmetrics2/templates/testfunction.html
+++ b/non-puppet/qtmetrics2/templates/testfunction.html
@@ -33,8 +33,8 @@
 #############################################################################
 
 /**
- * Testfunction page
- * @since     09-09-2015
+ * Test function page (list of test rows)
+ * @since     16-09-2015
  * @author    Juha Sippola
  */
 
@@ -86,12 +86,12 @@
 
 <div class="collapse" id="info">
 <div class="well infoWell">
-<span class="glyphicon glyphicon-info-sign"></span> <strong>Testfunction</strong><br>
+<span class="glyphicon glyphicon-info-sign"></span> <strong>Test Function</strong><br>
 <ul>
-<li><strong>Testrow Results in Branches</strong> shows the {{ testfunction }} <strong>failed and skipped</strong> results in configuration
+<li><strong>Test Row Results in Branches</strong> shows the {{ testfunction }} <strong>failed and skipped</strong> results in configuration
 {{ conf }} by branch on <strong>{{ masterProject }} {{ masterState }}</strong> builds
 <ul>
-<li>flags: <span class="label label-default">b</span> = blacklisted flag set for the testrow on the latest build shown</li>
+<li>flags: <span class="label label-default">b</span> = blacklisted flag set for the test row on the latest build shown</li>
 <li>results: <span class="glyphicon glyphicon-remove red"></span> = {{ constant('TestrowRun::RESULT_FAILURE') }},
 <span class="glyphicon glyphicon-ok-sign red"></span> = {{ constant('TestrowRun::RESULT_SUCCESS_UNEXPECTED') }},
 <span class="glyphicon glyphicon-remove-sign green"></span> = {{ constant('TestrowRun::RESULT_FAILURE_EXPECTED') }},
@@ -109,7 +109,7 @@
 
 <div class="panel panel-primary">
 <div class="panel-heading">
-<h4 class="panel-title bold">Testrow Results in Branches <small>(failures and skipped only)</small></h4>
+<h4 class="panel-title bold">Test Row Results in Branches <small>(failures and skipped only)</small></h4>
 </div>
 </div>
 
@@ -155,7 +155,7 @@
 <table class="table table-striped">
 <thead>
 <tr>
-<th class="bold">{{ testfunction }}</th>
+<th class="bold">test row</th>
 <th class="bold rightBorder">flags</th>
 {%              for key, buildKey in buildKeys %}
 <th class="center">
@@ -265,7 +265,7 @@ title="<table>
 
 {% else %}{# runsAvailable #}
 <div class="alert alert-success" role="alert">
-No failed or skipped testrows in testfunction {{ testfunction }} in testset {{ testset }} in configuration {{ conf }}!
+No failed or skipped test rows in test function {{ testfunction }} in testset {{ testset }} in configuration {{ conf }}!
 </div>
 {% endif %}{# runsAvailable #}
 </div> {# .col... #}
diff --git a/non-puppet/qtmetrics2/templates/testset.html b/non-puppet/qtmetrics2/templates/testset.html
index f7aba31..f9be9c1 100644
--- a/non-puppet/qtmetrics2/templates/testset.html
+++ b/non-puppet/qtmetrics2/templates/testset.html
@@ -33,8 +33,8 @@
 #############################################################################
 
 /**
- * Testset page
- * @since     03-08-2015
+ * Testset page (list of configurations)
+ * @since     16-09-2015
  * @author    Juha Sippola
  */
 
@@ -259,7 +259,7 @@ and their configuration on <strong>{{ masterProject }} {{ masterState }}</strong
 <table class="table table-striped">
 <thead>
 <tr>
-<th class="bold">{{ testset.getName }}</th>
+<th class="bold">configuration</th>
 <th class="bold rightBorder">flags</th>
 {%              for key, buildKey in buildKeys %}
 <th class="center">
diff --git a/non-puppet/qtmetrics2/templates/testset_project_data_results.html b/non-puppet/qtmetrics2/templates/testset_project_data_results.html
index e953e29..2538b90 100644
--- a/non-puppet/qtmetrics2/templates/testset_project_data_results.html
+++ b/non-puppet/qtmetrics2/templates/testset_project_data_results.html
@@ -34,7 +34,7 @@
 
 /**
  * Testset project results data
- * @since     04-08-2015
+ * @since     16-09-2015
  * @author    Juha Sippola
  */
 
@@ -100,7 +100,7 @@
 <table class="table table-striped">
 <thead>
 <tr>
-<th class="bold rightBorder">{{ project }}</th>
+<th class="bold rightBorder">configuration</th>
 {%              for key, buildKey in buildKeys %}
 <th class="center">
 {%                  if buildKey|length > 6 %}
diff --git a/non-puppet/qtmetrics2/templates/testset_testfunctions.html b/non-puppet/qtmetrics2/templates/testset_testfunctions.html
index b15e2d1..fe4216c 100644
--- a/non-puppet/qtmetrics2/templates/testset_testfunctions.html
+++ b/non-puppet/qtmetrics2/templates/testset_testfunctions.html
@@ -33,7 +33,7 @@
 #############################################################################
 
 /**
- * Testfunctions page
+ * Testset page (list of test functions)
  * @since     16-09-2015
  * @author    Juha Sippola
  */
@@ -94,11 +94,11 @@
 <div class="well infoWell">
 <span class="glyphicon glyphicon-info-sign"></span> <strong>Testset</strong><br>
 <ul>
-<li><strong>Testfunction Results in Branches</strong> shows the {{ testset.getName }} <strong>failed and skipped</strong> results in configuration
+<li><strong>Test Function Results in Branches</strong> shows the {{ testset.getName }} <strong>failed and skipped</strong> results in configuration
 {{ conf }} by branch on <strong>{{ masterProject }} {{ masterState }}</strong> builds
 <ul>
-<li>testfunction name has link to list of testrows if testrows are available</li>
-<li>flags: <span class="label label-default">b</span> = blacklisted flag set for the testfunction on the latest build shown</li>
+<li>test function name has link to list of test rows if test rows are available</li>
+<li>flags: <span class="label label-default">b</span> = blacklisted flag set for the test function on the latest build shown</li>
 <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') }},
@@ -116,7 +116,7 @@
 
 <div class="panel panel-primary">
 <div class="panel-heading">
-<h4 class="panel-title bold">Testfunction Results in Branches <small>(failures and skipped only)</small></h4>
+<h4 class="panel-title bold">Test Function Results in Branches <small>(failures and skipped only)</small></h4>
 </div>
 </div>
 
@@ -162,7 +162,7 @@
 <table class="table table-striped">
 <thead>
 <tr>
-<th class="bold">{{ testset.getName }}</th>
+<th class="bold">test function</th>
 <th class="bold rightBorder">flags</th>
 {%              for key, buildKey in buildKeys %}
 <th class="center">
@@ -243,7 +243,7 @@
 {%                                   set durationFormatted = '' %}
 {%                              endif %}
 {%                              if run.getChildren %}
-{%                                  set testrowResult = '(in testrows)' %}
+{%                                  set testrowResult = '(in test rows)' %}
 {%                              else %}
 {%                                  set testrowResult = '' %}
 {%                              endif %}
@@ -285,7 +285,7 @@ title="<table>
 
 {% else %}{# runsAvailable #}
 <div class="alert alert-success" role="alert">
-No failed or skipped testfunctions in testset {{ testset.getName }} in project {{ testset.getProjectName }} and configuration {{ conf }}!
+No failed or skipped test functions in testset {{ testset.getName }} in project {{ testset.getProjectName }} and configuration {{ conf }}!
 </div>
 {% endif %}{# runsAvailable #}
 </div> {# .col... #}