SONAR-5343 Replace "Branch coverage" by "Condition coverage"

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb
index 0a182b314e1bf4038552439b9975802443e1e5d7..29dcc3eef58e82af739687f49f0600eee2948cc4 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb
@@ -33,7 +33,7 @@
            if branch_coverage
         %>
           <div class="widget-measure">
-            <span class="widget-label"><%= message('widget.code_coverage.branch_coverage.suffix') -%></span>
+            <span class="widget-label"><%= message('widget.code_coverage.condition_coverage.suffix') -%></span>
             <span class="nowrap">
               <%= format_measure(branch_coverage, :url => url_for_drilldown('uncovered_conditions', :highlight => 'branch_coverage')) %>
               <%= dashboard_configuration.selected_period? ? format_variation(branch_coverage) : trend_icon(branch_coverage) -%>
@@ -76,7 +76,7 @@
                 <% end %>
                 <% if new_branch_coverage %>
                   <div class="widget-measure">
-                    <span class="widget-label"><%= message('widget.code_coverage.branch_coverage.suffix') -%></span>
+                    <span class="widget-label"><%= message('widget.code_coverage.condition_coverage.suffix') -%></span>
                     <%= format_measure(new_branch_coverage,
                                        :period => dashboard_configuration.period_index,
                                        :url => url_for_drilldown('new_uncovered_conditions', :highlight => 'new_branch_coverage', :period => dashboard_configuration.period_index),

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 b9916b0f3ea5d268820d4b3bf8f906c561de90fb..0f0daaafdd245cba5daf228726d878216728e3da 100644 (file)
--- 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
@@ -36,7 +36,7 @@
            if it_branch_coverage
         %>
           <div class="widget-measure">
-            <span class="widget-label"><%= message('widget.it-coverage.branch_coverage.suffix') -%></span>
+            <span class="widget-label"><%= message('widget.it-coverage.condition_coverage.suffix') -%></span>
               <span class="nowrap">
                 <%= format_measure(it_branch_coverage, :url => url_for_drilldown('it_uncovered_conditions', :highlight => 'it_branch_coverage')) %>
                 <%= dashboard_configuration.selected_period? ? format_variation(it_branch_coverage) : trend_icon(it_branch_coverage) -%>
@@ -87,7 +87,7 @@
 
                 <% if new_branch_coverage %>
                   <div class="widget-measure">
-                    <span class="widget-label"><%= message('widget.it-coverage.branch_coverage.suffix') -%></span>
+                    <span class="widget-label"><%= message('widget.it-coverage.condition_coverage.suffix') -%></span>
                       <span class="nowrap">
                         <%= format_measure(new_branch_coverage,
                                            :period => dashboard_configuration.period_index,
@@ -136,7 +136,7 @@
            if overall_branch_coverage
         %>
           <div class="widget-measure">
-            <span class="widget-label"><%= message('widget.overall-coverage.branch_coverage.suffix') -%></span>
+            <span class="widget-label"><%= message('widget.overall-coverage.condition_coverage.suffix') -%></span>
               <span class="nowrap">
                 <%= format_measure(overall_branch_coverage, :url => url_for_drilldown('overall_uncovered_conditions', :highlight => 'overall_branch_coverage')) %>
                 <%= dashboard_configuration.selected_period? ? format_variation(overall_branch_coverage) : trend_icon(overall_branch_coverage) -%>
@@ -189,7 +189,7 @@
 
                 <% if new_branch_coverage %>
                   <div class="widget-measure">
-                    <span class="widget-label"><%= message('widget.overall-coverage.branch_coverage.suffix') -%></span>
+                    <span class="widget-label"><%= message('widget.overall-coverage.condition_coverage.suffix') -%></span>
                       <span class="nowrap">
                         <%= format_measure(new_branch_coverage,
                                            :period => dashboard_configuration.period_index,

diff --git a/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs
index e8f68051bf9ab38a210008b9924c502714bbebc5..96f27fd2125a7cf2451626e74b7c1c4c4a0fda65 100644 (file)
--- a/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs
+++ b/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs
@@ -65,7 +65,7 @@
             <td class="stat {{#if coverage}}{{#if coverage.branchCoverageStatus}}coverage-{{coverage.branchCoverageStatus}}{{/if}}{{/if}}">
               {{#if coverage}}
                 {{#if coverage.branches}}
-                  <span class="coverage-branches" title="{{tp 'coverage_viewer.x_covered_branches' coverage.coveredBranches}}">
+                  <span class="coverage-branches" title="{{tp 'coverage_viewer.x_covered_conditions' coverage.coveredBranches}}">
                     {{coverage.coveredBranches}}/{{coverage.branches}}
                   </span>
                 {{/if}}

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
index 8ba427b716e3d4c093417fee7e5023c7b0a5bfd0..4a8500cd2cbfd2d55c43eb101aaf4589cce462f6 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
@@ -7,7 +7,7 @@
   </td>
   <td class="ind <%= statuses[:conditions] -%>">
     <% if line.conditions && line.conditions>0 -%>
-      <span title="<%= h message('coverage_viewer.x_covered_branches', {:params => line.covered_conditions.to_s}) -%>"><%= line.covered_conditions -%>/<%= line.conditions -%></span>
+      <span title="<%= h message('coverage_viewer.x_covered_conditions', {:params => line.covered_conditions.to_s}) -%>"><%= line.covered_conditions -%>/<%= line.conditions -%></span>
     <% end %>
   </td>
 <% else %>

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 96d85b86381f4a0e3a2d288bf1ebbb9b7ed89599..19c7e2877bcacc1e7b99ed187302faa17c5e31b1 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -999,7 +999,7 @@ widget.alerts.missing_metric=Some information regarding the status of the qualit
 widget.code_coverage.name=Unit Tests 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.condition_coverage.suffix=\ condition coverage
 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=Unit test success
@@ -1013,7 +1013,7 @@ widget.code_coverage.execution_time=Execution Time
 widget.it-coverage.name=Integration Tests Coverage
 widget.it-coverage.description=Reports on code coverage by integration tests. When both the code coverage by unit tests and by integration tests are available, an overall code coverage is also computed and displayed in this widget.
 widget.it-coverage.line_coverage.suffix=\ line coverage
-widget.it-coverage.branch_coverage.suffix=\ branch coverage
+widget.it-coverage.condition_coverage.suffix=\ condition coverage
 widget.it-coverage.lines_to_cover.suffix=\ lines to cover
 widget.it-coverage.on_new_code=On new code
 widget.it-coverage.no_new_lines_to_cover=No new lines to cover
@@ -1022,7 +1022,7 @@ widget.it-coverage.no_new_lines_to_cover=No new lines to cover
 widget.overall-coverage.name=Overall Coverage
 widget.overall-coverage.description=Reports on code coverage by all tests.
 widget.overall-coverage.line_coverage.suffix=\ line coverage
-widget.overall-coverage.branch_coverage.suffix=\ branch coverage
+widget.overall-coverage.condition_coverage.suffix=\ condition coverage
 widget.overall-coverage.lines_to_cover.suffix=\ lines to cover
 widget.overall-coverage.on_new_code=On new code
 widget.overall-coverage.no_new_lines_to_cover=No new lines to cover
@@ -1388,7 +1388,7 @@ coverage_viewer.per_test=Per test
 coverage_viewer.lines_covered_per_test=Covered lines
 coverage_viewer.select_test=Select a test
 coverage_viewer.line_covered_by_x_tests=Line is covered by {0} tests
-coverage_viewer.x_covered_branches={0} branches are covered by tests
+coverage_viewer.x_covered_conditions={0} conditions are covered by tests
 
 #------------------------------------------------------------------------------
 #
@@ -2183,32 +2183,32 @@ metric.new_line_coverage.description=Line coverage of added/changed code
 metric.coverage_line_hits_data.name=Coverage hits by line
 metric.coverage_line_hits_data.description=Coverage hits by line
 
-metric.conditions_to_cover.name=Branches to cover
-metric.conditions_to_cover.description=Branches to cover
+metric.conditions_to_cover.name=Conditions to cover
+metric.conditions_to_cover.description=Conditions to cover
 
-metric.new_conditions_to_cover.name=Branches to cover on new code
-metric.new_conditions_to_cover.description=Branches to cover on new code
+metric.new_conditions_to_cover.name=Conditions to cover on new code
+metric.new_conditions_to_cover.description=Conditions to cover on new code
 
-metric.covered_conditions.name=Covered branches
-metric.covered_conditions.description=Covered branches
+metric.covered_conditions.name=Covered conditions
+metric.covered_conditions.description=Covered conditions
 
-metric.uncovered_conditions.name=Uncovered branches
-metric.uncovered_conditions.description=Uncovered branches
+metric.uncovered_conditions.name=Uncovered conditions
+metric.uncovered_conditions.description=Uncovered conditions
 
-metric.new_uncovered_conditions.name=Uncovered branches on new code
-metric.new_uncovered_conditions.description=Uncovered branches on new code
+metric.new_uncovered_conditions.name=Uncovered conditions on new code
+metric.new_uncovered_conditions.description=Uncovered conditions on new code
 
-metric.branch_coverage.name=Branch coverage
-metric.branch_coverage.description=Branch coverage
+metric.branch_coverage.name=Condition coverage
+metric.branch_coverage.description=Condition coverage
 
-metric.new_branch_coverage.name=Branch coverage on new code
-metric.new_branch_coverage.description=Branch coverage of new/changed code
+metric.new_branch_coverage.name=Condition coverage on new code
+metric.new_branch_coverage.description=Condition coverage of new/changed code
 
-metric.conditions_by_line.name=Branches by line
-metric.conditions_by_line.description=Branches by line
+metric.conditions_by_line.name=Conditions by line
+metric.conditions_by_line.description=Conditions by line
 
-metric.covered_conditions_by_line.name=Covered branches by line
-metric.covered_conditions_by_line.description=Covered branches by line
+metric.covered_conditions_by_line.name=Covered conditions by line
+metric.covered_conditions_by_line.description=Covered conditions by line
 
 
 #--------------------------------------------------------------------------------------------------------------------
@@ -2232,20 +2232,20 @@ 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=IT branches to cover
-metric.it_conditions_to_cover.description=Branches to cover by integration tests
+metric.it_conditions_to_cover.name=IT conditions to cover
+metric.it_conditions_to_cover.description=Conditions to cover by integration tests
 
-metric.it_uncovered_conditions.name=IT uncovered branches
-metric.it_uncovered_conditions.description=Uncovered branches by integration tests
+metric.it_uncovered_conditions.name=IT uncovered conditions
+metric.it_uncovered_conditions.description=Uncovered conditions by integration tests
 
-metric.it_branch_coverage.name=IT branch coverage
-metric.it_branch_coverage.description=Branch coverage by integration tests
+metric.it_branch_coverage.name=IT condition coverage
+metric.it_branch_coverage.description=Condition coverage by integration tests
 
-metric.it_conditions_by_line.name=IT branches by line
-metric.it_conditions_by_line.description=IT branches by line
+metric.it_conditions_by_line.name=IT conditions by line
+metric.it_conditions_by_line.description=IT conditions 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.it_covered_conditions_by_line.name=IT covered conditions by line
+metric.it_covered_conditions_by_line.description=IT covered conditions by line
 
 metric.new_it_coverage.name=Coverage by IT on new code
 metric.new_it_coverage.description=Integration tests coverage of new/changed code
@@ -2259,14 +2259,14 @@ metric.new_it_uncovered_lines.description=New lines that are not covered by inte
 metric.new_it_line_coverage.name=Line coverage by IT on new code
 metric.new_it_line_coverage.description=Integration tests line coverage of added/changed code
 
-metric.new_it_conditions_to_cover.name=Branches to cover by IT on new code
-metric.new_it_conditions_to_cover.description=New branches to cover by integration tests
+metric.new_it_conditions_to_cover.name=Conditions to cover by IT on new code
+metric.new_it_conditions_to_cover.description=New conditions to cover by integration tests
 
-metric.new_it_uncovered_conditions.name=Uncovered branches by IT on new code
-metric.new_it_uncovered_conditions.description=New branches that are not covered by integration tests
+metric.new_it_uncovered_conditions.name=Uncovered conditions by IT on new code
+metric.new_it_uncovered_conditions.description=New conditions that are not covered by integration tests
 
-metric.new_it_branch_coverage.name=Branch coverage by IT on new code
-metric.new_it_branch_coverage.description=Integration tests branch coverage of new/changed code
+metric.new_it_branch_coverage.name=Condition coverage by IT on new code
+metric.new_it_branch_coverage.description=Integration tests condition coverage of new/changed code
 
 #--------------------------------------------------------------------------------------------------------------------
 #
@@ -2289,20 +2289,20 @@ metric.overall_line_coverage.description=Line coverage by all tests
 metric.overall_coverage_line_hits_data.name=Overall coverage hits by line
 metric.overall_coverage_line_hits_data.description=Coverage hits by all tests and by line
 
-metric.overall_conditions_to_cover.name=Overall branches to cover
-metric.overall_conditions_to_cover.description=Branches to cover by all tests
+metric.overall_conditions_to_cover.name=Overall conditions to cover
+metric.overall_conditions_to_cover.description=Conditions to cover by all tests
 
-metric.overall_uncovered_conditions.name=Overall uncovered branches
-metric.overall_uncovered_conditions.description=Uncovered branches by all tests
+metric.overall_uncovered_conditions.name=Overall uncovered conditions
+metric.overall_uncovered_conditions.description=Uncovered conditions by all tests
 
-metric.overall_branch_coverage.name=Overall branch coverage
-metric.overall_branch_coverage.description=Branch coverage by all tests
+metric.overall_branch_coverage.name=Overall condition coverage
+metric.overall_branch_coverage.description=Condition coverage by all tests
 
-metric.overall_conditions_by_line.name=Overall branches by line
-metric.overall_conditions_by_line.description=Overall branches by all tests and by line
+metric.overall_conditions_by_line.name=Overall conditions by line
+metric.overall_conditions_by_line.description=Overall conditions by all tests and by line
 
-metric.overall_covered_conditions_by_line.name=Overall covered branches by line
-metric.overall_covered_conditions_by_line.description=Overall covered branches by all tests and by line
+metric.overall_covered_conditions_by_line.name=Overall covered conditions by line
+metric.overall_covered_conditions_by_line.description=Overall covered conditions by all tests and by line
 
 metric.new_overall_coverage.name=Overall coverage on new code
 metric.new_overall_coverage.description=Overall coverage of new/changed code
@@ -2316,14 +2316,14 @@ metric.new_overall_uncovered_lines.description=New lines that are not covered by
 metric.new_overall_line_coverage.name=Overall line coverage on new code
 metric.new_overall_line_coverage.description=Line coverage of added/changed code by all tests
 
-metric.new_overall_conditions_to_cover.name=Overall branches to cover on new code
-metric.new_overall_conditions_to_cover.description=New branches to cover by all tests
+metric.new_overall_conditions_to_cover.name=Overall conditions to cover on new code
+metric.new_overall_conditions_to_cover.description=New conditions to cover by all tests
 
-metric.new_overall_uncovered_conditions.name=Overall uncovered branches on new code
-metric.new_overall_uncovered_conditions.description=New branches that are not covered by any test
+metric.new_overall_uncovered_conditions.name=Overall uncovered conditions on new code
+metric.new_overall_uncovered_conditions.description=New conditions that are not covered by any test
 
-metric.new_overall_branch_coverage.name=Overall branch coverage on new code
-metric.new_overall_branch_coverage.description=Branch coverage of new/changed code by all tests
+metric.new_overall_branch_coverage.name=Overall condition coverage on new code
+metric.new_overall_branch_coverage.description=Condition coverage of new/changed code by all tests
 
 #--------------------------------------------------------------------------------------------------------------------
 #

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 152cd5a9979b6ccddee7d2cc2798b2ccceaa9bb0..3269bd9933650f1bce1edd718d85beff7711808d 100644 (file)
--- 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
@@ -646,8 +646,8 @@ public final class CoreMetrics {
     .create();
 
   public static final String BRANCH_COVERAGE_KEY = "branch_coverage";
-  public static final Metric<Double> BRANCH_COVERAGE = new Metric.Builder(BRANCH_COVERAGE_KEY, "Branch coverage", Metric.ValueType.PERCENT)
-    .setDescription("Branch coverage")
+  public static final Metric<Double> BRANCH_COVERAGE = new Metric.Builder(BRANCH_COVERAGE_KEY, "Condition coverage", Metric.ValueType.PERCENT)
+    .setDescription("Condition coverage")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
     .setDomain(DOMAIN_TESTS)
@@ -656,8 +656,8 @@ public final class CoreMetrics {
     .create();
 
   public static final String NEW_BRANCH_COVERAGE_KEY = "new_branch_coverage";
-  public static final Metric<Double> NEW_BRANCH_COVERAGE = new Metric.Builder(NEW_BRANCH_COVERAGE_KEY, "Branch coverage on new code", Metric.ValueType.PERCENT)
-    .setDescription("Branch coverage of new/changed code")
+  public static final Metric<Double> NEW_BRANCH_COVERAGE = new Metric.Builder(NEW_BRANCH_COVERAGE_KEY, "Condition coverage on new code", Metric.ValueType.PERCENT)
+    .setDescription("Condition coverage of new/changed code")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
     .setDomain(DOMAIN_TESTS)
@@ -922,8 +922,8 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric<Double> IT_BRANCH_COVERAGE = new Metric.Builder(IT_BRANCH_COVERAGE_KEY, "IT branch coverage", Metric.ValueType.PERCENT)
-    .setDescription("IT Branch coverage")
+  public static final Metric<Double> IT_BRANCH_COVERAGE = new Metric.Builder(IT_BRANCH_COVERAGE_KEY, "IT condition coverage", Metric.ValueType.PERCENT)
+    .setDescription("IT condition coverage")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
@@ -939,8 +939,8 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric<Double> NEW_IT_BRANCH_COVERAGE = new Metric.Builder(NEW_IT_BRANCH_COVERAGE_KEY, "Branch coverage by IT on new code", Metric.ValueType.PERCENT)
-    .setDescription("Branch coverage by Integration Tests of new/changed code")
+  public static final Metric<Double> NEW_IT_BRANCH_COVERAGE = new Metric.Builder(NEW_IT_BRANCH_COVERAGE_KEY, "Condition coverage by IT on new code", Metric.ValueType.PERCENT)
+    .setDescription("Condition coverage by Integration Tests of new/changed code")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
@@ -957,7 +957,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric<String> IT_CONDITIONS_BY_LINE = new Metric.Builder(IT_CONDITIONS_BY_LINE_KEY, "IT branches by line", Metric.ValueType.DATA)
+  public static final Metric<String> IT_CONDITIONS_BY_LINE = new Metric.Builder(IT_CONDITIONS_BY_LINE_KEY, "IT conditions by line", Metric.ValueType.DATA)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
     .setDeleteHistoricalData(true)
     .create();
@@ -970,7 +970,7 @@ public final class CoreMetrics {
   /**
    * @since 2.12
    */
-  public static final Metric<String> 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<String> IT_COVERED_CONDITIONS_BY_LINE = new Metric.Builder(IT_COVERED_CONDITIONS_BY_LINE_KEY, "IT covered conditions by line", Metric.ValueType.DATA)
     .setDomain(DOMAIN_INTEGRATION_TESTS)
     .setDeleteHistoricalData(true)
     .create();
@@ -1209,8 +1209,8 @@ public final class CoreMetrics {
   /**
    * @since 3.3
    */
-  public static final Metric<Double> OVERALL_BRANCH_COVERAGE = new Metric.Builder(OVERALL_BRANCH_COVERAGE_KEY, "Overall branch coverage", Metric.ValueType.PERCENT)
-    .setDescription("Branch coverage by all tests")
+  public static final Metric<Double> OVERALL_BRANCH_COVERAGE = new Metric.Builder(OVERALL_BRANCH_COVERAGE_KEY, "Overall condition coverage", Metric.ValueType.PERCENT)
+    .setDescription("Condition coverage by all tests")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
     .setDomain(DOMAIN_OVERALL_TESTS)
@@ -1226,9 +1226,9 @@ public final class CoreMetrics {
   /**
    * @since 3.3
    */
-  public static final Metric<Double> NEW_OVERALL_BRANCH_COVERAGE = new Metric.Builder(NEW_OVERALL_BRANCH_COVERAGE_KEY, "Overall branch coverage on new code",
+  public static final Metric<Double> NEW_OVERALL_BRANCH_COVERAGE = new Metric.Builder(NEW_OVERALL_BRANCH_COVERAGE_KEY, "Overall condition coverage on new code",
     Metric.ValueType.PERCENT)
-    .setDescription("Branch coverage of new/changed code by all tests")
+    .setDescription("Condition coverage of new/changed code by all tests")
     .setDirection(Metric.DIRECTION_BETTER)
     .setQualitative(true)
     .setDomain(DOMAIN_OVERALL_TESTS)
@@ -1245,8 +1245,8 @@ public final class CoreMetrics {
   /**
    * @since 3.3
    */
-  public static final Metric<String> OVERALL_CONDITIONS_BY_LINE = new Metric.Builder(OVERALL_CONDITIONS_BY_LINE_KEY, "Overall branches by line", Metric.ValueType.DATA)
-    .setDescription("Overall branches by all tests and by line")
+  public static final Metric<String> OVERALL_CONDITIONS_BY_LINE = new Metric.Builder(OVERALL_CONDITIONS_BY_LINE_KEY, "Overall conditions by line", Metric.ValueType.DATA)
+    .setDescription("Overall conditions by all tests and by line")
     .setDomain(DOMAIN_OVERALL_TESTS)
     .setDeleteHistoricalData(true)
     .create();

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
index 8498d328eac3c2657f529ac982e12ff308d1f3f3..aae2be99ea3a70c27ddcbc728cab94cfc803fa62 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
@@ -645,9 +645,9 @@ public interface RulesDefinition extends ServerExtension {
      * of the function parameter (= "effort to fix") must be set. This description
      * explains what 1 point of "effort to fix" represents for the rule.
      * <p/>
-     * Example : : for the "Insufficient branch coverage", this description for the
+     * Example : : for the "Insufficient condition coverage", this description for the
      * remediation function coefficient/offset would be something like
-     * "Effort to test one uncovered branch".
+     * "Effort to test one uncovered condition".
      */
     public NewRule setEffortToFixDescription(@Nullable String s) {
       this.effortToFixDescription = s;

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java
index 562fdc8bd50f5a5897c9556fdc446b1c11111612..aa4c87cffdedfa7b83eb7d8c399be51dfe0ddb54 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java
@@ -107,8 +107,8 @@ public class RulesDefinitionTest {
   public void define_rules_with_technical_debt() {
     RulesDefinition.NewRepository newRepo = context.createRepository("common-java", "java");
     RulesDefinition.NewRule newRule = newRepo.createRule("InsufficientBranchCoverage")
-      .setName("Insufficient branch coverage")
-      .setHtmlDescription("Insufficient branch coverage by unit tests")
+      .setName("Insufficient condition coverage")
+      .setHtmlDescription("Insufficient condition coverage by unit tests")
       .setSeverity(Severity.MAJOR)
       .setDebtSubCharacteristic(RulesDefinition.SubCharacteristics.UNIT_TESTS)
       .setEffortToFixDescription("Effort to test one uncovered branch");