SONAR-2963 rename some labels and metrics

4 files changed, 57 insertions, 33 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ItCoverageWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ItCoverageWidget.java
index 7008ebbd7dd..e4abe328b16 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ItCoverageWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ItCoverageWidget.java
@@ -33,7 +33,7 @@ public class ItCoverageWidget extends AbstractRubyTemplate implements RubyRailsW
   }
 
   public String getTitle() {
-    return "Coverage by Integration Tests";
+    return "Integration Test Coverage";
   }
 
   @Override
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb
index 67ea9e9b9bc..03a9474c9e0 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb
@@ -4,7 +4,7 @@
 %>
 <table width="100%">
 	<tr>
-		<td nowrap>
+		<td nowrap width="50%">
       <div class="dashbox">
         <p class="title"><%= message('widget.it_coverage.name') -%></p>
         <p>
@@ -25,8 +25,11 @@
             <%= dashboard_configuration.selected_period? ? format_variation(it_branch_coverage) : trend_icon(it_branch_coverage) -%>
           </p>
         <% end %>
-
-        <%
+      </div>
+    </td>
+    <td nowrap>
+      <div class="dashbox">
+    <%
         if dashboard_configuration.selected_period?
           new_lines_to_cover_measure=measure('new_it_lines_to_cover')
           if new_lines_to_cover_measure
@@ -35,7 +38,7 @@
               new_coverage=measure('new_it_coverage')
               new_line_coverage=measure('new_it_line_coverage')
               new_branch_coverage=measure('new_it_branch_coverage')
-        %>  <br/>
+        %>
             <h3><%= message('widget.it_coverage.on_new_code') -%>: </h3>
             <% if new_lines.to_i==0 %>
               <p><%= message('widget.it_coverage.no_new_lines_to_cover') -%></p>
@@ -64,7 +67,7 @@
           end
         end
         %>
-      </div>
+        </div>
     </td>
 </tr>
 </table>
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 7f58fb1ba24..e25642d4c48 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -451,20 +451,20 @@ widget.alerts.description=Display current alerts on the project.
 widget.alerts.no_alert=No alerts
 widget.alerts.alerts=Alerts
 
-widget.code_coverage.name=Code coverage
+widget.code_coverage.name=Code Coverage
 widget.code_coverage.description=Reports on units tests and code coverage by unit tests.
 widget.code_coverage.line_coverage.suffix=\ line coverage
 widget.code_coverage.branch_coverage.suffix=\ branch coverage
 widget.code_coverage.lines_to_cover.suffix=\ lines to cover
 widget.code_coverage.on_new_code=On new code
 widget.code_coverage.no_new_lines_to_cover=No new lines to cover
-widget.code_coverage.test_success=Test success
+widget.code_coverage.test_success=Unit Test Success
 widget.code_coverage.failures.suffix=\ failures
 widget.code_coverage.errors.suffix=\ errors
 widget.code_coverage.tests.suffix=\ tests
 widget.code_coverage.skipped.suffix=\ skipped
 
-widget.it_coverage.name=Coverage by Integration Tests
+widget.it_coverage.name=Integration Test Coverage
 widget.it_coverage.description=Reports code coverage by integration tests
 widget.it_coverage.line_coverage.suffix=\ line coverage
 widget.it_coverage.branch_coverage.suffix=\ branch coverage
@@ -1130,35 +1130,56 @@ metric.covered_conditions_by_line.description=Covered branches by line
 #--------------------------------------------------------------------------------------------------------------------
 
 metric.it_coverage.name=IT Coverage
-metric.it_coverage.description=Coverage by Integration Tests
+metric.it_coverage.description=Integration Test Coverage
 
-metric.it_lines_to_cover.name=Lines to cover by IT
+metric.it_lines_to_cover.name=IT Lines to Cover
 metric.it_lines_to_cover.description=Lines to cover by Integration Tests
 
-metric.it_uncovered_lines.name=Uncovered lines by IT
+metric.it_uncovered_lines.name=IT Uncovered Lines
 metric.it_uncovered_lines.description=Uncovered lines by Integration Tests
 
-metric.it_line_coverage.name=Line coverage by IT
+metric.it_line_coverage.name=IT Line Coverage
 metric.it_line_coverage.description=Line coverage by Integration Tests
 
 metric.it_coverage_line_hits_data.name=IT Coverage hits by line
 metric.it_coverage_line_hits_data.description=Coverage hits by line by Integration Tests
 
-metric.it_conditions_to_cover.name=Branches to cover by IT
+metric.it_conditions_to_cover.name=IT Branches to Cover
 metric.it_conditions_to_cover.description=Branches to cover by Integration Tests
 
-metric.it_uncovered_conditions.name=Uncovered branches by IT
+metric.it_uncovered_conditions.name=IT Uncovered Branches
 metric.it_uncovered_conditions.description=Uncovered branches by Integration Tests
 
-metric.it_branch_coverage.name=Branch coverage by IT
+metric.it_branch_coverage.name=IT Branch Coverage
 metric.it_branch_coverage.description=Branch coverage by Integration Tests
 
-metric.it_conditions_by_line.name=IT Branches by line
+metric.it_conditions_by_line.name=IT Branches by Line
 metric.it_conditions_by_line.description=IT Branches by line
 
-metric.it_covered_conditions_by_line.name=IT Covered branches by line
+metric.it_covered_conditions_by_line.name=IT Covered Branches by Line
 metric.it_covered_conditions_by_line.description=IT Covered branches by line
 
+metric.new_it_coverage.name=New IT Coverage
+metric.new_it_coverage.description=Integration Test Coverage of new/changed code
+
+metric.new_it_lines_to_cover.name=New Lines to Cover by IT
+metric.new_it_lines_to_cover.description=New lines to cover by integration tests
+
+metric.new_it_uncovered_lines.name=New Lines Uncovered by IT
+metric.new_it_uncovered_lines.description=New lines that are not covered by integration tests
+
+metric.new_it_line_coverage.name=New IT Line Coverage
+metric.new_it_line_coverage.description=Integration Test Line coverage of added/changed code
+
+metric.new_it_conditions_to_cover.name=New Branches to Cover by IT
+metric.new_it_conditions_to_cover.description=New branches to cover by integration tests
+
+metric.new_it_uncovered_conditions.name=New Branches Uncovered by IT
+metric.new_it_uncovered_conditions.description=New branches that are not covered by IT
+
+metric.new_it_branch_coverage.name=New IT Branch Coverage
+metric.new_it_branch_coverage.description=Integration Test Branch Coverage of new/changed code
+
 #--------------------------------------------------------------------------------------------------------------------
 #
 # DUPLICATIONS
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
index cccbdbcf5eb..5431a06c381 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
@@ -633,7 +633,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric NEW_IT_COVERAGE = new Metric.Builder(NEW_IT_COVERAGE_KEY, "New IT coverage", Metric.ValueType.PERCENT)
+  public static final Metric NEW_IT_COVERAGE = new Metric.Builder(NEW_IT_COVERAGE_KEY, "New Coverage by IT", Metric.ValueType.PERCENT)
     .setDescription("Integration Tests Coverage of new/changed code")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
@@ -650,7 +650,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_LINES_TO_COVER = new Metric.Builder(IT_LINES_TO_COVER_KEY, "IT Lines to cover", Metric.ValueType.INT)
+  public static final Metric IT_LINES_TO_COVER = new Metric.Builder(IT_LINES_TO_COVER_KEY, "IT Lines to Cover", Metric.ValueType.INT)
     .setDescription("Lines to cover by Integration Tests")
     .setDirection(Metric.DIRECTION_BETTER)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
@@ -667,7 +667,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric NEW_IT_LINES_TO_COVER = new Metric.Builder(NEW_IT_LINES_TO_COVER_KEY, "New lines to cover by IT", Metric.ValueType.INT)
+  public static final Metric NEW_IT_LINES_TO_COVER = new Metric.Builder(NEW_IT_LINES_TO_COVER_KEY, "New Lines to Cover by IT", Metric.ValueType.INT)
     .setDescription("New lines to cover by Integration Tests")
     .setDirection(Metric.DIRECTION_WORST)
     .setQualitative(false)
@@ -683,7 +683,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_UNCOVERED_LINES = new Metric.Builder(IT_UNCOVERED_LINES_KEY, "IT Uncovered lines", Metric.ValueType.INT)
+  public static final Metric IT_UNCOVERED_LINES = new Metric.Builder(IT_UNCOVERED_LINES_KEY, "IT Uncovered Lines", Metric.ValueType.INT)
     .setDescription("IT uncovered lines")
     .setDirection(Metric.DIRECTION_WORST)
     .setQualitative(false)
@@ -699,7 +699,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric NEW_IT_UNCOVERED_LINES = new Metric.Builder(NEW_IT_UNCOVERED_LINES_KEY, "New uncovered lines by IT", Metric.ValueType.INT)
+  public static final Metric NEW_IT_UNCOVERED_LINES = new Metric.Builder(NEW_IT_UNCOVERED_LINES_KEY, "New Uncovered Lines by IT", Metric.ValueType.INT)
     .setDescription("New uncovered lines by Integration Tests")
     .setDirection(Metric.DIRECTION_WORST)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
@@ -730,7 +730,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric NEW_IT_LINE_COVERAGE = new Metric.Builder(NEW_IT_LINE_COVERAGE_KEY, "New line coverage by IT", Metric.ValueType.PERCENT)
+  public static final Metric NEW_IT_LINE_COVERAGE = new Metric.Builder(NEW_IT_LINE_COVERAGE_KEY, "New Line Coverage by IT", Metric.ValueType.PERCENT)
     .setDescription("Line Coverage by Integration Tests of added/changed code")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
@@ -747,7 +747,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_COVERAGE_LINE_HITS_DATA = new Metric.Builder(IT_COVERAGE_LINE_HITS_DATA_KEY, "IT Coverage hits data", Metric.ValueType.DATA)
+  public static final Metric IT_COVERAGE_LINE_HITS_DATA = new Metric.Builder(IT_COVERAGE_LINE_HITS_DATA_KEY, "IT Coverage Hits Data", Metric.ValueType.DATA)
     .setDescription("IT Code coverage line hits data")
     .setDirection(Metric.DIRECTION_NONE)
     .setQualitative(false)
@@ -762,7 +762,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_CONDITIONS_TO_COVER = new Metric.Builder(IT_CONDITIONS_TO_COVER_KEY, "IT Branches to cover", Metric.ValueType.INT)
+  public static final Metric IT_CONDITIONS_TO_COVER = new Metric.Builder(IT_CONDITIONS_TO_COVER_KEY, "IT Branches to Cover", Metric.ValueType.INT)
     .setDescription("IT Conditions to cover")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(false)
@@ -779,7 +779,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric NEW_IT_CONDITIONS_TO_COVER = new Metric.Builder(NEW_IT_CONDITIONS_TO_COVER_KEY, "New conditions to cover by IT", Metric.ValueType.INT)
+  public static final Metric NEW_IT_CONDITIONS_TO_COVER = new Metric.Builder(NEW_IT_CONDITIONS_TO_COVER_KEY, "New Conditions to Cover by IT", Metric.ValueType.INT)
     .setDescription("New conditions to cover by Integration Tests")
     .setDomain(DOMAIN_INTEGRATION_TESTS)
     .setFormula(new SumChildValuesFormula(false))
@@ -793,7 +793,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_UNCOVERED_CONDITIONS = new Metric.Builder(IT_UNCOVERED_CONDITIONS_KEY, "IT Uncovered branches", Metric.ValueType.INT)
+  public static final Metric IT_UNCOVERED_CONDITIONS = new Metric.Builder(IT_UNCOVERED_CONDITIONS_KEY, "IT Uncovered Branches", Metric.ValueType.INT)
     .setDescription("IT Uncovered conditions")
     .setDirection(Metric.DIRECTION_WORST)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
@@ -808,7 +808,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric NEW_IT_UNCOVERED_CONDITIONS = new Metric.Builder(NEW_IT_UNCOVERED_CONDITIONS_KEY, "New uncovered conditions by IT", Metric.ValueType.INT)
+  public static final Metric NEW_IT_UNCOVERED_CONDITIONS = new Metric.Builder(NEW_IT_UNCOVERED_CONDITIONS_KEY, "New Uncovered Conditions by IT", Metric.ValueType.INT)
     .setDescription("New uncovered conditions by Integration Tests")
     .setDirection(Metric.DIRECTION_WORST)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
@@ -824,7 +824,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_BRANCH_COVERAGE = new Metric.Builder(IT_BRANCH_COVERAGE_KEY, "IT Branch coverage", Metric.ValueType.PERCENT)
+  public static final Metric IT_BRANCH_COVERAGE = new Metric.Builder(IT_BRANCH_COVERAGE_KEY, "IT Branch Coverage", Metric.ValueType.PERCENT)
     .setDescription("IT Branch coverage")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
@@ -841,7 +841,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric NEW_IT_BRANCH_COVERAGE = new Metric.Builder(NEW_IT_BRANCH_COVERAGE_KEY, "New branch coverage by IT", Metric.ValueType.PERCENT)
+  public static final Metric NEW_IT_BRANCH_COVERAGE = new Metric.Builder(NEW_IT_BRANCH_COVERAGE_KEY, "New Branch Coverage by IT", Metric.ValueType.PERCENT)
     .setDescription("Branch coverage by Integration Tests of new/changed code")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
@@ -858,7 +858,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_CONDITIONS_BY_LINE = new Metric.Builder(IT_CONDITIONS_BY_LINE_KEY, "IT Branches by line", Metric.ValueType.DATA)
+  public static final Metric IT_CONDITIONS_BY_LINE = new Metric.Builder(IT_CONDITIONS_BY_LINE_KEY, "IT Branches by Line", Metric.ValueType.DATA)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
     .create();
 
@@ -870,7 +870,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric IT_COVERED_CONDITIONS_BY_LINE = new Metric.Builder(IT_COVERED_CONDITIONS_BY_LINE_KEY, "IT Covered branches by line", Metric.ValueType.DATA)
+  public static final Metric IT_COVERED_CONDITIONS_BY_LINE = new Metric.Builder(IT_COVERED_CONDITIONS_BY_LINE_KEY, "IT Covered Branches by Line", Metric.ValueType.DATA)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
     .create();