SONAR-2804 changes based on feedback

17 files changed, 344 insertions, 375 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
index 7dacd86b642..49b7f8b8ac1 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
@@ -48,9 +48,9 @@ import org.sonar.plugins.core.filters.ProjectFilter;
 import org.sonar.plugins.core.filters.TreeMapFilter;
 import org.sonar.plugins.core.security.ApplyProjectRolesDecorator;
 import org.sonar.plugins.core.security.DefaultResourcePermissions;
-import org.sonar.plugins.core.sensors.AllTestsBranchCoverageDecorator;
-import org.sonar.plugins.core.sensors.AllTestsCoverageDecorator;
-import org.sonar.plugins.core.sensors.AllTestsLineCoverageDecorator;
+import org.sonar.plugins.core.sensors.OverallBranchCoverageDecorator;
+import org.sonar.plugins.core.sensors.OverallCoverageDecorator;
+import org.sonar.plugins.core.sensors.OverallLineCoverageDecorator;
 import org.sonar.plugins.core.sensors.BranchCoverageDecorator;
 import org.sonar.plugins.core.sensors.CheckAlertThresholds;
 import org.sonar.plugins.core.sensors.CommentDensityDecorator;
@@ -89,7 +89,6 @@ import org.sonar.plugins.core.timemachine.ViolationPersisterDecorator;
 import org.sonar.plugins.core.timemachine.ViolationTrackingDecorator;
 import org.sonar.plugins.core.web.Lcom4Viewer;
 import org.sonar.plugins.core.widgets.AlertsWidget;
-import org.sonar.plugins.core.widgets.AllTestsCoverageWidget;
 import org.sonar.plugins.core.widgets.CommentsDuplicationsWidget;
 import org.sonar.plugins.core.widgets.ComplexityWidget;
 import org.sonar.plugins.core.widgets.CoverageWidget;
@@ -345,7 +344,6 @@ public final class CorePlugin extends SonarPlugin {
         AlertsWidget.class,
         CoverageWidget.class,
         ItCoverageWidget.class,
-        AllTestsCoverageWidget.class,
         CommentsDuplicationsWidget.class,
         DescriptionWidget.class,
         ComplexityWidget.class,
@@ -403,9 +401,9 @@ public final class CorePlugin extends SonarPlugin {
         ItLineCoverageDecorator.class,
         ItCoverageDecorator.class,
         ItBranchCoverageDecorator.class,
-        AllTestsLineCoverageDecorator.class,
-        AllTestsCoverageDecorator.class,
-        AllTestsBranchCoverageDecorator.class,
+        OverallLineCoverageDecorator.class,
+        OverallCoverageDecorator.class,
+        OverallBranchCoverageDecorator.class,
         DefaultResourcePermissions.class,
         ApplyProjectRolesDecorator.class,
         ExcludedResourceFilter.class,
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AllTestsBranchCoverageDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecorator.java
index bdc66eae8df..c9e459b937d 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AllTestsBranchCoverageDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecorator.java
@@ -28,45 +28,45 @@ import org.sonar.api.measures.Metric;
 
 import java.util.List;
 
-public final class AllTestsBranchCoverageDecorator extends AbstractCoverageDecorator {
+public final class OverallBranchCoverageDecorator extends AbstractCoverageDecorator {
   @DependsUpon
   public List<Metric> dependsUponMetrics() {
-    return ImmutableList.of(CoreMetrics.MERGED_UNCOVERED_CONDITIONS, CoreMetrics.MERGED_CONDITIONS_TO_COVER,
-        CoreMetrics.NEW_MERGED_UNCOVERED_CONDITIONS, CoreMetrics.NEW_MERGED_CONDITIONS_TO_COVER);
+    return ImmutableList.of(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS, CoreMetrics.OVERALL_CONDITIONS_TO_COVER,
+        CoreMetrics.NEW_OVERALL_UNCOVERED_CONDITIONS, CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER);
   }
 
   @Override
   protected Metric getGeneratedMetric() {
-    return CoreMetrics.MERGED_BRANCH_COVERAGE;
+    return CoreMetrics.OVERALL_BRANCH_COVERAGE;
   }
 
   @Override
   protected Long countElements(DecoratorContext context) {
-    return MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_CONDITIONS_TO_COVER), 0L);
+    return MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER), 0L);
   }
 
   @Override
   protected long countCoveredElements(DecoratorContext context) {
-    long uncoveredConditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_CONDITIONS), 0L);
-    long conditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_CONDITIONS_TO_COVER), 0L);
+    long uncoveredConditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS), 0L);
+    long conditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER), 0L);
 
     return conditions - uncoveredConditions;
   }
 
   @Override
   protected Metric getGeneratedMetricForNewCode() {
-    return CoreMetrics.NEW_MERGED_BRANCH_COVERAGE;
+    return CoreMetrics.NEW_OVERALL_BRANCH_COVERAGE;
   }
 
   @Override
   protected Long countElementsForNewCode(DecoratorContext context, int periodIndex) {
-    return MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_CONDITIONS_TO_COVER), periodIndex);
+    return MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER), periodIndex);
   }
 
   @Override
   protected long countCoveredElementsForNewCode(DecoratorContext context, int periodIndex) {
-    long uncoveredConditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_UNCOVERED_CONDITIONS), periodIndex, 0L);
-    long conditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_CONDITIONS_TO_COVER), periodIndex, 0L);
+    long uncoveredConditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_UNCOVERED_CONDITIONS), periodIndex, 0L);
+    long conditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER), periodIndex, 0L);
 
     return conditions - uncoveredConditions;
   }
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AllTestsCoverageDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallCoverageDecorator.java
index 5cd791570c8..70c74386d42 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AllTestsCoverageDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallCoverageDecorator.java
@@ -28,60 +28,60 @@ import org.sonar.api.measures.Metric;
 
 import java.util.Collection;
 
-public final class AllTestsCoverageDecorator extends AbstractCoverageDecorator {
+public final class OverallCoverageDecorator extends AbstractCoverageDecorator {
   @DependsUpon
   public Collection<Metric> usedMetrics() {
-    return ImmutableList.of(CoreMetrics.MERGED_LINES_TO_COVER, CoreMetrics.MERGED_UNCOVERED_LINES, CoreMetrics.NEW_MERGED_LINES_TO_COVER,
-        CoreMetrics.NEW_MERGED_UNCOVERED_LINES, CoreMetrics.MERGED_CONDITIONS_TO_COVER, CoreMetrics.MERGED_UNCOVERED_CONDITIONS,
-        CoreMetrics.NEW_MERGED_CONDITIONS_TO_COVER, CoreMetrics.NEW_MERGED_UNCOVERED_CONDITIONS);
+    return ImmutableList.of(CoreMetrics.OVERALL_LINES_TO_COVER, CoreMetrics.OVERALL_UNCOVERED_LINES, CoreMetrics.NEW_OVERALL_LINES_TO_COVER,
+        CoreMetrics.NEW_OVERALL_UNCOVERED_LINES, CoreMetrics.OVERALL_CONDITIONS_TO_COVER, CoreMetrics.OVERALL_UNCOVERED_CONDITIONS,
+        CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER, CoreMetrics.NEW_OVERALL_UNCOVERED_CONDITIONS);
   }
 
   @Override
   protected Metric getGeneratedMetric() {
-    return CoreMetrics.MERGED_COVERAGE;
+    return CoreMetrics.OVERALL_COVERAGE;
   }
 
   @Override
   protected Long countElements(DecoratorContext context) {
-    long lines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_LINES_TO_COVER), 0L);
-    long conditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_CONDITIONS_TO_COVER), 0L);
+    long lines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER), 0L);
+    long conditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER), 0L);
 
     return lines + conditions;
   }
 
   @Override
   protected long countCoveredElements(DecoratorContext context) {
-    long uncoveredLines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_LINES), 0L);
-    long lines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_LINES_TO_COVER), 0L);
-    long uncoveredConditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_CONDITIONS), 0L);
-    long conditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_CONDITIONS_TO_COVER), 0L);
+    long uncoveredLines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_LINES), 0L);
+    long lines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER), 0L);
+    long uncoveredConditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS), 0L);
+    long conditions = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER), 0L);
 
     return lines + conditions - uncoveredConditions - uncoveredLines;
   }
 
   @Override
   protected Metric getGeneratedMetricForNewCode() {
-    return CoreMetrics.NEW_MERGED_COVERAGE;
+    return CoreMetrics.NEW_OVERALL_COVERAGE;
   }
 
   @Override
   protected Long countElementsForNewCode(DecoratorContext context, int periodIndex) {
-    Long newLinesToCover = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_LINES_TO_COVER), periodIndex);
+    Long newLinesToCover = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_LINES_TO_COVER), periodIndex);
     if (newLinesToCover == null) {
       return null;
     }
 
-    long newConditionsToCover = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_CONDITIONS_TO_COVER), periodIndex, 0L);
+    long newConditionsToCover = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER), periodIndex, 0L);
 
     return newLinesToCover + newConditionsToCover;
   }
 
   @Override
   protected long countCoveredElementsForNewCode(DecoratorContext context, int periodIndex) {
-    long newLines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_LINES_TO_COVER), periodIndex, 0L);
-    long newUncoveredLines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_UNCOVERED_LINES), periodIndex, 0L);
-    long newUncoveredConditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_UNCOVERED_CONDITIONS), periodIndex, 0L);
-    long newConditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_CONDITIONS_TO_COVER), periodIndex, 0L);
+    long newLines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_LINES_TO_COVER), periodIndex, 0L);
+    long newUncoveredLines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_UNCOVERED_LINES), periodIndex, 0L);
+    long newUncoveredConditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_UNCOVERED_CONDITIONS), periodIndex, 0L);
+    long newConditions = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER), periodIndex, 0L);
 
     return newLines + newConditions - newUncoveredConditions - newUncoveredLines;
   }
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AllTestsLineCoverageDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecorator.java
index e815cdc3244..ccf73faa3f5 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AllTestsLineCoverageDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecorator.java
@@ -28,45 +28,45 @@ import org.sonar.api.measures.Metric;
 
 import java.util.List;
 
-public final class AllTestsLineCoverageDecorator extends AbstractCoverageDecorator {
+public final class OverallLineCoverageDecorator extends AbstractCoverageDecorator {
   @DependsUpon
   public List<Metric> dependsUponMetrics() {
-    return ImmutableList.of(CoreMetrics.MERGED_UNCOVERED_LINES, CoreMetrics.MERGED_LINES_TO_COVER, CoreMetrics.NEW_MERGED_UNCOVERED_LINES,
-        CoreMetrics.NEW_MERGED_LINES_TO_COVER);
+    return ImmutableList.of(CoreMetrics.OVERALL_UNCOVERED_LINES, CoreMetrics.OVERALL_LINES_TO_COVER, CoreMetrics.NEW_OVERALL_UNCOVERED_LINES,
+        CoreMetrics.NEW_OVERALL_LINES_TO_COVER);
   }
 
   @Override
   protected Metric getGeneratedMetric() {
-    return CoreMetrics.MERGED_LINE_COVERAGE;
+    return CoreMetrics.OVERALL_LINE_COVERAGE;
   }
 
   @Override
   protected Long countElements(DecoratorContext context) {
-    return MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_LINES_TO_COVER), 0L);
+    return MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER), 0L);
   }
 
   @Override
   protected long countCoveredElements(DecoratorContext context) {
-    long uncoveredLines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_LINES), 0L);
-    long lines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.MERGED_LINES_TO_COVER), 0L);
+    long uncoveredLines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_LINES), 0L);
+    long lines = MeasureUtils.getValueAsLong(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER), 0L);
 
     return lines - uncoveredLines;
   }
 
   @Override
   protected Metric getGeneratedMetricForNewCode() {
-    return CoreMetrics.NEW_MERGED_LINE_COVERAGE;
+    return CoreMetrics.NEW_OVERALL_LINE_COVERAGE;
   }
 
   @Override
   protected Long countElementsForNewCode(DecoratorContext context, int periodIndex) {
-    return MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_LINES_TO_COVER), periodIndex);
+    return MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_LINES_TO_COVER), periodIndex);
   }
 
   @Override
   protected long countCoveredElementsForNewCode(DecoratorContext context, int periodIndex) {
-    long uncoveredLines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_UNCOVERED_LINES), periodIndex, 0L);
-    long lines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_MERGED_LINES_TO_COVER), periodIndex, 0L);
+    long uncoveredLines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_UNCOVERED_LINES), periodIndex, 0L);
+    long lines = MeasureUtils.getVariationAsLong(context.getMeasure(CoreMetrics.NEW_OVERALL_LINES_TO_COVER), periodIndex, 0L);
 
     return lines - uncoveredLines;
   }
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/AllTestsCoverageWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/AllTestsCoverageWidget.java
deleted file mode 100644
index 619352fd3fa..00000000000
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/AllTestsCoverageWidget.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.core.widgets;
-
-import org.sonar.api.web.AbstractRubyTemplate;
-import org.sonar.api.web.RubyRailsWidget;
-import org.sonar.api.web.UserRole;
-import org.sonar.api.web.WidgetCategory;
-
-@WidgetCategory("Tests")
-@UserRole(UserRole.USER)
-public class AllTestsCoverageWidget extends AbstractRubyTemplate implements RubyRailsWidget {
-  public String getId() {
-    return "merged-coverage";
-  }
-
-  public String getTitle() {
-    return "All Tests Coverage";
-  }
-
-  @Override
-  protected String getTemplatePath() {
-    return "/org/sonar/plugins/core/widgets/merged_coverage.html.erb";
-  }
-}
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 563a2c217a0..94175a42bc5 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -709,7 +709,7 @@ 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=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
@@ -722,7 +722,7 @@ widget.code_coverage.tests.suffix=\ tests
 widget.code_coverage.skipped.suffix=\ skipped
 
 # id of this widget does not use underscore in order to be backward-compatible with previous version of JaCoCo plugin
-widget.it-coverage.name=Integration test coverage
+widget.it-coverage.name=Integration tests coverage
 widget.it-coverage.description=Reports on code coverage by integration tests
 widget.it-coverage.line_coverage.suffix=\ line coverage
 widget.it-coverage.branch_coverage.suffix=\ branch coverage
@@ -731,13 +731,13 @@ widget.it-coverage.on_new_code=On new code
 widget.it-coverage.no_new_lines_to_cover=No new lines to cover
 
 # id of this widget does not use underscore in order to be backward-compatible with previous version of JaCoCo plugin
-widget.merged-coverage.name=All tests coverage
-widget.merged-coverage.description=Reports on code coverage by all tests
-widget.merged-coverage.line_coverage.suffix=\ line coverage
-widget.merged-coverage.branch_coverage.suffix=\ branch coverage
-widget.merged-coverage.lines_to_cover.suffix=\ lines to cover
-widget.merged-coverage.on_new_code=On new code
-widget.merged-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.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
 
 widget.comments_duplications.name=Comments & Duplications
 widget.comments_duplications.description=Reports on copy/paste and documentation
@@ -969,9 +969,11 @@ duplications.collapse=Collapse
 #
 #------------------------------------------------------------------------------
 coverage_viewer.on_new_code=On new code
+coverage_viewer.by.unit_tests=By UTs
 coverage_viewer.unit_tests=Unit Tests
+coverage_viewer.by.integration_tests=By ITs
 coverage_viewer.integration_tests=Integration Tests
-coverage_viewer.all_tests=All Tests
+coverage_viewer.overall_tests=All Tests
 
 
 #------------------------------------------------------------------------------
@@ -1555,16 +1557,16 @@ metric.tests.description=Number of unit tests
 metric.test_execution_time.name=Unit tests duration
 metric.test_execution_time.description=Execution duration of unit tests
 
-metric.test_errors.name=Unit test errors
+metric.test_errors.name=Unit tests errors
 metric.test_errors.description=Number of unit test errors
 
 metric.skipped_tests.name=Skipped unit tests
 metric.skipped_tests.description=Number of skipped unit tests
 
-metric.test_failures.name=Unit test failures
+metric.test_failures.name=Unit tests failures
 metric.test_failures.description=Number of unit test failures
 
-metric.test_success_density.name=Unit test success (%)
+metric.test_success_density.name=Unit tests success (%)
 metric.test_success_density.description=Density of successful unit tests
 
 metric.test_data.name=Unit tests details
@@ -1631,56 +1633,113 @@ metric.covered_conditions_by_line.description=Covered branches by line
 #
 #--------------------------------------------------------------------------------------------------------------------
 
-metric.it_coverage.name=IT Coverage
-metric.it_coverage.description=Integration Test Coverage
+metric.it_coverage.name=IT coverage
+metric.it_coverage.description=Integration tests coverage
 
-metric.it_lines_to_cover.name=IT Lines to Cover
-metric.it_lines_to_cover.description=Lines to cover by Integration Tests
+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=IT Uncovered Lines
-metric.it_uncovered_lines.description=Uncovered lines by Integration Tests
+metric.it_uncovered_lines.name=IT uncovered lines
+metric.it_uncovered_lines.description=Uncovered lines by integration tests
 
-metric.it_line_coverage.name=IT Line Coverage
-metric.it_line_coverage.description=Line coverage by Integration Tests
+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_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 branches to cover
+metric.it_conditions_to_cover.description=Branches 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 branches
+metric.it_uncovered_conditions.description=Uncovered branches 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 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.description=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.description=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_coverage.name=New IT coverage
+metric.new_it_coverage.description=Integration tests coverage of new/changed code
 
-metric.new_it_lines_to_cover.name=New Lines to Cover by IT
+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.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_line_coverage.name=New IT line coverage
+metric.new_it_line_coverage.description=Integration tests 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.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_uncovered_conditions.name=New branches uncovered by IT
+metric.new_it_uncovered_conditions.description=New branches that are not covered by integration tests
 
-metric.new_it_branch_coverage.name=New IT Branch Coverage
-metric.new_it_branch_coverage.description=Integration Test Branch Coverage of new/changed code
+metric.new_it_branch_coverage.name=New IT branch coverage
+metric.new_it_branch_coverage.description=Integration tests branch coverage of new/changed code
+
+#--------------------------------------------------------------------------------------------------------------------
+#
+# OVERALL TESTS
+#
+#--------------------------------------------------------------------------------------------------------------------
+
+metric.overall_coverage.name=Overall coverage
+metric.overall_coverage.description=Overall test coverage
+
+metric.overall_lines_to_cover.name=Overall lines to cover
+metric.overall_lines_to_cover.description=Lines to cover by all tests
+
+metric.overall_uncovered_lines.name=Overall uncovered lines
+metric.overall_uncovered_lines.description=Uncovered lines by all tests
+
+metric.overall_line_coverage.name=Overall line coverage
+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_uncovered_conditions.name=Overall uncovered branches
+metric.overall_uncovered_conditions.description=Uncovered branches by all tests
+
+metric.overall_branch_coverage.name=Overall branch coverage
+metric.overall_branch_coverage.description=Branch 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_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.new_overall_coverage.name=Overall new coverage
+metric.new_overall_coverage.description=Overall coverage of new/changed code
+
+metric.new_overall_lines_to_cover.name=Overall new lines to cover
+metric.new_overall_lines_to_cover.description=New lines to cover by all tests
+
+metric.new_overall_uncovered_lines.name=Overall new lines uncovered
+metric.new_overall_uncovered_lines.description=New lines that are not covered by any tests
+
+metric.new_overall_line_coverage.name=Overall new line coverage
+metric.new_overall_line_coverage.description=Line coverage of added/changed code by all tests
+
+metric.new_overall_conditions_to_cover.name=Overall new branches to cover
+metric.new_overall_conditions_to_cover.description=New branches to cover by all tests
+
+metric.new_overall_uncovered_conditions.name=Overall new branches uncovered
+metric.new_overall_uncovered_conditions.description=New branches that are not covered by any test
+
+metric.new_overall_branch_coverage.name=Overall new branch coverage
+metric.new_overall_branch_coverage.description=Branch coverage of new/changed code by all tests
 
 #--------------------------------------------------------------------------------------------------------------------
 #
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 f039205bc53..e21eb58dbe0 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
@@ -1,76 +1,147 @@
 <%
-  coverage_measure=measure('it_coverage')
-  if coverage_measure
-%>
-<table width="100%">
-  <tr>
-    <td nowrap valign="top">
-      <div class="dashbox">
-        <p class="title"><%= message('widget.it-coverage.name') -%></p>
-        <p>
-          <span class="big"><%= format_measure(coverage_measure, :suffix => '', :url => url_for_drilldown('it_coverage'), :default => '-') %></span>
-          <%= dashboard_configuration.selected_period? ? format_variation(coverage_measure) : trend_icon(coverage_measure) -%>
-        </p>
-        <% it_line_coverage=measure('it_line_coverage')
-          if it_line_coverage %>
-          <p>
-            <%= format_measure(it_line_coverage, :suffix => message('widget.it-coverage.line_coverage.suffix'), :url => url_for_drilldown('it_uncovered_lines', :highlight =>  'it_line_coverage')) %>
-            <%= dashboard_configuration.selected_period? ? format_variation(it_line_coverage) : trend_icon(it_line_coverage) -%>
-          </p>
-        <% end %>
-        <% it_branch_coverage=measure('it_branch_coverage')
-          if it_branch_coverage %>
-          <p>
-            <%= format_measure(it_branch_coverage, :suffix => message('widget.it-coverage.branch_coverage.suffix'), :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) -%>
-          </p>
-        <% end %>
-      </div>
-    </td>
-    <td nowrap valign="top">
-      <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
-            new_lines=new_lines_to_cover_measure.variation(dashboard_configuration.period_index)
-            if new_lines
-              new_coverage=measure('new_it_coverage')
-              new_line_coverage=measure('new_it_line_coverage')
-              new_branch_coverage=measure('new_it_branch_coverage')
-        %>
-            <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>
-            <% else %>
-              <% if new_coverage %>
-                <p>
+   it_coverage=measure('it_coverage')
+   overall_coverage=measure('overall_coverage')
+
+   if it_coverage || overall_coverage
+-%>
+  <table width="100%">
+    <tr>
+      <% if it_coverage -%>
+        <td nowrap valign="top">
+          <div class="dashbox">
+            <p class="title"><%= message('widget.it-coverage.name') -%></p>
+
+            <p>
+              <span class="big"><%= format_measure(it_coverage, :suffix => '', :url => url_for_drilldown('it_coverage'), :default => '-') %></span>
+              <%= dashboard_configuration.selected_period? ? format_variation(it_coverage) : trend_icon(it_coverage) -%>
+            </p>
+            <% it_line_coverage=measure('it_line_coverage')
+               if it_line_coverage %>
+              <p>
+                <%= format_measure(it_line_coverage, :suffix => message('widget.it-coverage.line_coverage.suffix'), :url => url_for_drilldown('it_uncovered_lines', :highlight => 'it_line_coverage')) %>
+                <%= dashboard_configuration.selected_period? ? format_variation(it_line_coverage) : trend_icon(it_line_coverage) -%>
+              </p>
+            <% end %>
+            <% it_branch_coverage=measure('it_branch_coverage')
+               if it_branch_coverage %>
+              <p>
+                <%= format_measure(it_branch_coverage, :suffix => message('widget.it-coverage.branch_coverage.suffix'), :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) -%>
+              </p>
+            <% end %>
+          </div>
+        </td>
+        <td nowrap valign="top">
+          <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
+                   new_lines=new_lines_to_cover_measure.variation(dashboard_configuration.period_index)
+                   if new_lines
+                     new_coverage=measure('new_it_coverage')
+                     new_line_coverage=measure('new_it_line_coverage')
+                     new_branch_coverage=measure('new_it_branch_coverage')
+            %>
+                  <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>
+                  <% else %>
+                    <% if new_coverage %>
+                      <p>
                   <span class="big">
                     <a href="<%= url_for_drilldown('new_it_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_coverage, :style => 'none', :default => '-') -%></a>
                   </span>
-                </p>
-              <% end %>
+                      </p>
+                    <% end %>
+                    <p>
+                      <a href="<%= url_for_drilldown('new_it_lines_to_cover', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_lines_to_cover_measure, :style => 'none', :default => '-') -%><%= message('widget.it-coverage.lines_to_cover.suffix') -%></a>
+                    </p>
+                    <% if new_line_coverage %>
+                      <p>
+                        <a href="<%= url_for_drilldown('new_it_uncovered_lines', :highlight => 'new_it_line_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_line_coverage, :style => 'none', :default => '-') -%><%= message('widget.it-coverage.line_coverage.suffix') -%></a>
+                      </p>
+                    <% end %>
+                    <% if new_branch_coverage %>
+                      <p>
+                        <a href="<%= url_for_drilldown('new_it_uncovered_conditions', :highlight => 'new_it_branch_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_branch_coverage, :style => 'none', :default => '-') -%><%= message('widget.it-coverage.branch_coverage.suffix') -%></a>
+                      </p>
+                    <% end -%>
+                  <% end -%>
+                <% end -%>
+              <% end -%>
+            <% end -%>
+          </div>
+        </td>
+      <% end -%>
+      <% if overall_coverage -%>
+        <td nowrap valign="top">
+          <div class="dashbox">
+            <p class="title"><%= message('widget.overall-coverage.name') -%></p>
+
+            <p>
+              <span class="big"><%= format_measure(overall_coverage, :suffix => '', :url => url_for_drilldown('overall_coverage'), :default => '-') %></span>
+              <%= dashboard_configuration.selected_period? ? format_variation(overall_coverage) : trend_icon(overall_coverage) -%>
+            </p>
+            <% it_line_coverage=measure('overall_line_coverage')
+               if it_line_coverage %>
               <p>
-                <a href="<%= url_for_drilldown('new_it_lines_to_cover', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_lines_to_cover_measure, :style => 'none', :default => '-') -%><%= message('widget.it-coverage.lines_to_cover.suffix') -%></a>
+                <%= format_measure(it_line_coverage, :suffix => message('widget.overall-coverage.line_coverage.suffix'), :url => url_for_drilldown('overall_uncovered_lines', :highlight => 'overall_line_coverage')) %>
+                <%= dashboard_configuration.selected_period? ? format_variation(it_line_coverage) : trend_icon(it_line_coverage) -%>
               </p>
-              <% if new_line_coverage %>
-                <p>
-                  <a href="<%= url_for_drilldown('new_it_uncovered_lines', :highlight => 'new_it_line_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_line_coverage, :style => 'none', :default => '-') -%><%= message('widget.it-coverage.line_coverage.suffix') -%></a>
-                </p>
-              <% end %>
-              <% if new_branch_coverage %>
-                <p>
-                  <a href="<%= url_for_drilldown('new_it_uncovered_conditions', :highlight => 'new_it_branch_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_branch_coverage, :style => 'none', :default => '-') -%><%= message('widget.it-coverage.branch_coverage.suffix') -%></a>
-                </p>
-              <%
-                 end
-               end
-            end
-          end
-        end
-        %>
-        </div>
-    </td>
-</tr>
-</table>
+            <% end %>
+            <% it_branch_coverage=measure('overall_branch_coverage')
+               if it_branch_coverage %>
+              <p>
+                <%= format_measure(it_branch_coverage, :suffix => message('widget.overall-coverage.branch_coverage.suffix'), :url => url_for_drilldown('overall_uncovered_conditions', :highlight => 'overall_branch_coverage')) %>
+                <%= dashboard_configuration.selected_period? ? format_variation(it_branch_coverage) : trend_icon(it_branch_coverage) -%>
+              </p>
+            <% end %>
+          </div>
+        </td>
+        <td nowrap valign="top">
+          <div class="dashbox">
+            <%
+               if dashboard_configuration.selected_period?
+                 new_lines_to_cover_measure=measure('new_overall_lines_to_cover')
+                 if new_lines_to_cover_measure
+                   new_lines=new_lines_to_cover_measure.variation(dashboard_configuration.period_index)
+                   if new_lines
+                     new_coverage=measure('new_overall_coverage')
+                     new_line_coverage=measure('new_overall_line_coverage')
+                     new_branch_coverage=measure('new_overall_branch_coverage')
+            %>
+                  <h3><%= message('widget.overall-coverage.on_new_code') -%>: </h3>
+                  <% if new_lines.to_i==0 %>
+                    <p><%= message('widget.overall-coverage.no_new_lines_to_cover') -%></p>
+                  <% else %>
+                    <% if new_coverage %>
+                      <p>
+                  <span class="big">
+                    <a href="<%= url_for_drilldown('new_overall_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_coverage, :style => 'none', :default => '-') -%></a>
+                  </span>
+                      </p>
+                    <% end %>
+                    <p>
+                      <a href="<%= url_for_drilldown('new_overall_lines_to_cover', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_lines_to_cover_measure, :style => 'none', :default => '-') -%><%= message('widget.merged-coverage.lines_to_cover.suffix') -%></a>
+                    </p>
+                    <% if new_line_coverage %>
+                      <p>
+                        <a href="<%= url_for_drilldown('new_overall_uncovered_lines', :highlight => 'new_overall_line_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_line_coverage, :style => 'none', :default => '-') -%><%= message('widget.merged-coverage.line_coverage.suffix') -%></a>
+                      </p>
+                    <% end %>
+                    <% if new_branch_coverage %>
+                      <p>
+                        <a href="<%= url_for_drilldown('new_overall_uncovered_conditions', :highlight => 'new_overall_branch_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_branch_coverage, :style => 'none', :default => '-') -%><%= message('widget.merged-coverage.branch_coverage.suffix') -%></a>
+                      </p>
+                    <% end -%>
+                  <% end -%>
+                <% end -%>
+              <% end -%>
+            <% end -%>
+          </div>
+        </td>
+      <% end -%>
+    </tr>
+  </table>
 <% end %>
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/merged_coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/merged_coverage.html.erb
deleted file mode 100644
index 8fae498e7ff..00000000000
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/merged_coverage.html.erb
+++ /dev/null
@@ -1,76 +0,0 @@
-<%
-  coverage_measure=measure('merged_coverage')
-  if coverage_measure
-%>
-<table width="100%">
-  <tr>
-    <td nowrap valign="top">
-      <div class="dashbox">
-        <p class="title"><%= message('widget.merged-coverage.name') -%></p>
-        <p>
-          <span class="big"><%= format_measure(coverage_measure, :suffix => '', :url => url_for_drilldown('merged_coverage'), :default => '-') %></span>
-          <%= dashboard_configuration.selected_period? ? format_variation(coverage_measure) : trend_icon(coverage_measure) -%>
-        </p>
-        <% it_line_coverage=measure('merged_line_coverage')
-          if it_line_coverage %>
-          <p>
-            <%= format_measure(it_line_coverage, :suffix => message('widget.merged-coverage.line_coverage.suffix'), :url => url_for_drilldown('merged_uncovered_lines', :highlight =>  'merged_line_coverage')) %>
-            <%= dashboard_configuration.selected_period? ? format_variation(it_line_coverage) : trend_icon(it_line_coverage) -%>
-          </p>
-        <% end %>
-        <% it_branch_coverage=measure('merged_branch_coverage')
-          if it_branch_coverage %>
-          <p>
-            <%= format_measure(it_branch_coverage, :suffix => message('widget.merged-coverage.branch_coverage.suffix'), :url => url_for_drilldown('merged_uncovered_conditions', :highlight =>  'merged_branch_coverage')) %>
-            <%= dashboard_configuration.selected_period? ? format_variation(it_branch_coverage) : trend_icon(it_branch_coverage) -%>
-          </p>
-        <% end %>
-      </div>
-    </td>
-    <td nowrap valign="top">
-      <div class="dashbox">
-    <%
-        if dashboard_configuration.selected_period?
-          new_lines_to_cover_measure=measure('new_merged_lines_to_cover')
-          if new_lines_to_cover_measure
-            new_lines=new_lines_to_cover_measure.variation(dashboard_configuration.period_index)
-            if new_lines
-              new_coverage=measure('new_merged_coverage')
-              new_line_coverage=measure('new_merged_line_coverage')
-              new_branch_coverage=measure('new_merged_branch_coverage')
-        %>
-            <h3><%= message('widget.merged-coverage.on_new_code') -%>: </h3>
-            <% if new_lines.to_i==0 %>
-              <p><%= message('widget.merged-coverage.no_new_lines_to_cover') -%></p>
-            <% else %>
-              <% if new_coverage %>
-                <p>
-                  <span class="big">
-                    <a href="<%= url_for_drilldown('new_merged_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_coverage, :style => 'none', :default => '-') -%></a>
-                  </span>
-                </p>
-              <% end %>
-              <p>
-                <a href="<%= url_for_drilldown('new_merged_lines_to_cover', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_lines_to_cover_measure, :style => 'none', :default => '-') -%><%= message('widget.merged-coverage.lines_to_cover.suffix') -%></a>
-              </p>
-              <% if new_line_coverage %>
-                <p>
-                  <a href="<%= url_for_drilldown('new_merged_uncovered_lines', :highlight => 'new_merged_line_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_line_coverage, :style => 'none', :default => '-') -%><%= message('widget.merged-coverage.line_coverage.suffix') -%></a>
-                </p>
-              <% end %>
-              <% if new_branch_coverage %>
-                <p>
-                  <a href="<%= url_for_drilldown('new_merged_uncovered_conditions', :highlight => 'new_merged_branch_coverage', :period => dashboard_configuration.period_index) -%>"><%= format_variation(new_branch_coverage, :style => 'none', :default => '-') -%><%= message('widget.merged-coverage.branch_coverage.suffix') -%></a>
-                </p>
-              <%
-                 end
-               end
-            end
-          end
-        end
-        %>
-        </div>
-    </td>
-</tr>
-</table>
-<% end %>
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AllTestsBranchCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecoratorTest.java
index 58f79a7ad4a..3d139a17779 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AllTestsBranchCoverageDecoratorTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecoratorTest.java
@@ -35,8 +35,8 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class AllTestsBranchCoverageDecoratorTest {
-  private final AllTestsBranchCoverageDecorator decorator = new AllTestsBranchCoverageDecorator();
+public class OverallBranchCoverageDecoratorTest {
+  private final OverallBranchCoverageDecorator decorator = new OverallBranchCoverageDecorator();
   private final Project resource = mock(Project.class);
 
   @Before
@@ -51,7 +51,7 @@ public class AllTestsBranchCoverageDecoratorTest {
 
     decorator.decorate(resource, context);
 
-    verify(context).saveMeasure(CoreMetrics.MERGED_BRANCH_COVERAGE, 25.0);
+    verify(context).saveMeasure(CoreMetrics.OVERALL_BRANCH_COVERAGE, 25.0);
   }
 
   @Test
@@ -60,13 +60,13 @@ public class AllTestsBranchCoverageDecoratorTest {
 
     decorator.decorate(resource, context);
 
-    verify(context, never()).saveMeasure(eq(CoreMetrics.MERGED_BRANCH_COVERAGE), anyDouble());
+    verify(context, never()).saveMeasure(eq(CoreMetrics.OVERALL_BRANCH_COVERAGE), anyDouble());
   }
 
   private static DecoratorContext mockContext(int conditions, int uncoveredConditions) {
     DecoratorContext context = mock(DecoratorContext.class);
-    when(context.getMeasure(CoreMetrics.MERGED_CONDITIONS_TO_COVER)).thenReturn(new Measure(CoreMetrics.MERGED_CONDITIONS_TO_COVER, (double) conditions));
-    when(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_CONDITIONS)).thenReturn(new Measure(CoreMetrics.MERGED_UNCOVERED_CONDITIONS, (double) uncoveredConditions));
+    when(context.getMeasure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER)).thenReturn(new Measure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER, (double) conditions));
+    when(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS)).thenReturn(new Measure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS, (double) uncoveredConditions));
     return context;
   }
 }
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AllTestsCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java
index b5c4ef15c8a..7ec96574cee 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AllTestsCoverageDecoratorTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java
@@ -38,8 +38,8 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class AllTestsCoverageDecoratorTest {
-  private final AllTestsCoverageDecorator decorator = new AllTestsCoverageDecorator();
+public class OverallCoverageDecoratorTest {
+  private final OverallCoverageDecorator decorator = new OverallCoverageDecorator();
   private final Project project = mock(Project.class);
 
   @Before
@@ -51,9 +51,9 @@ public class AllTestsCoverageDecoratorTest {
   public void should_use_metrics() {
     Collection<Metric> metrics = decorator.usedMetrics();
 
-    assertThat(metrics).containsOnly(CoreMetrics.MERGED_LINES_TO_COVER, CoreMetrics.MERGED_UNCOVERED_LINES, CoreMetrics.NEW_MERGED_LINES_TO_COVER,
-        CoreMetrics.NEW_MERGED_UNCOVERED_LINES, CoreMetrics.MERGED_CONDITIONS_TO_COVER, CoreMetrics.MERGED_UNCOVERED_CONDITIONS,
-        CoreMetrics.NEW_MERGED_CONDITIONS_TO_COVER, CoreMetrics.NEW_MERGED_UNCOVERED_CONDITIONS);
+    assertThat(metrics).containsOnly(CoreMetrics.OVERALL_LINES_TO_COVER, CoreMetrics.OVERALL_UNCOVERED_LINES, CoreMetrics.NEW_OVERALL_LINES_TO_COVER,
+        CoreMetrics.NEW_OVERALL_UNCOVERED_LINES, CoreMetrics.OVERALL_CONDITIONS_TO_COVER, CoreMetrics.OVERALL_UNCOVERED_CONDITIONS,
+        CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER, CoreMetrics.NEW_OVERALL_UNCOVERED_CONDITIONS);
   }
 
   @Test
@@ -75,7 +75,7 @@ public class AllTestsCoverageDecoratorTest {
     decorator.decorate(project, context);
 
     // (50-40 covered lines + 10-8 covered conditions) / (50 lines + 10 conditions)
-    verify(context).saveMeasure(CoreMetrics.MERGED_COVERAGE, 20.0);
+    verify(context).saveMeasure(CoreMetrics.OVERALL_COVERAGE, 20.0);
   }
 
   @Test
@@ -84,7 +84,7 @@ public class AllTestsCoverageDecoratorTest {
 
     decorator.decorate(project, context);
 
-    verify(context).saveMeasure(CoreMetrics.MERGED_COVERAGE, 0.0);
+    verify(context).saveMeasure(CoreMetrics.OVERALL_COVERAGE, 0.0);
   }
 
   @Test
@@ -93,7 +93,7 @@ public class AllTestsCoverageDecoratorTest {
 
     decorator.decorate(project, context);
 
-    verify(context).saveMeasure(CoreMetrics.MERGED_COVERAGE, 100.0);
+    verify(context).saveMeasure(CoreMetrics.OVERALL_COVERAGE, 100.0);
   }
 
   @Test
@@ -102,15 +102,15 @@ public class AllTestsCoverageDecoratorTest {
 
     decorator.decorate(project, context);
 
-    verify(context, never()).saveMeasure(eq(CoreMetrics.MERGED_COVERAGE), anyDouble());
+    verify(context, never()).saveMeasure(eq(CoreMetrics.OVERALL_COVERAGE), anyDouble());
   }
 
   private static DecoratorContext mockContext(int lines, int uncoveredLines, int conditions, int uncoveredConditions) {
     DecoratorContext context = mock(DecoratorContext.class);
-    when(context.getMeasure(CoreMetrics.MERGED_LINES_TO_COVER)).thenReturn(new Measure(CoreMetrics.MERGED_LINES_TO_COVER, (double) lines));
-    when(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_LINES)).thenReturn(new Measure(CoreMetrics.MERGED_UNCOVERED_LINES, (double) uncoveredLines));
-    when(context.getMeasure(CoreMetrics.MERGED_CONDITIONS_TO_COVER)).thenReturn(new Measure(CoreMetrics.MERGED_CONDITIONS_TO_COVER, (double) conditions));
-    when(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_CONDITIONS)).thenReturn(new Measure(CoreMetrics.MERGED_UNCOVERED_CONDITIONS, (double) uncoveredConditions));
+    when(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER)).thenReturn(new Measure(CoreMetrics.OVERALL_LINES_TO_COVER, (double) lines));
+    when(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_LINES)).thenReturn(new Measure(CoreMetrics.OVERALL_UNCOVERED_LINES, (double) uncoveredLines));
+    when(context.getMeasure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER)).thenReturn(new Measure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER, (double) conditions));
+    when(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS)).thenReturn(new Measure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS, (double) uncoveredConditions));
     return context;
   }
 }
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AllTestsLineCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java
index d9eb3f67744..2fa58ac2e97 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AllTestsLineCoverageDecoratorTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java
@@ -38,8 +38,8 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class AllTestsLineCoverageDecoratorTest {
-  private final AllTestsLineCoverageDecorator decorator = new AllTestsLineCoverageDecorator();
+public class OverallLineCoverageDecoratorTest {
+  private final OverallLineCoverageDecorator decorator = new OverallLineCoverageDecorator();
   private final Project project = mock(Project.class);
 
   @Before
@@ -51,8 +51,8 @@ public class AllTestsLineCoverageDecoratorTest {
   public void should_depend_on_coverage_metrics() {
     List<Metric> metrics = decorator.dependsUponMetrics();
 
-    assertThat(metrics).containsOnly(CoreMetrics.MERGED_UNCOVERED_LINES, CoreMetrics.MERGED_LINES_TO_COVER, CoreMetrics.NEW_MERGED_UNCOVERED_LINES,
-        CoreMetrics.NEW_MERGED_LINES_TO_COVER);
+    assertThat(metrics).containsOnly(CoreMetrics.OVERALL_UNCOVERED_LINES, CoreMetrics.OVERALL_LINES_TO_COVER, CoreMetrics.NEW_OVERALL_UNCOVERED_LINES,
+        CoreMetrics.NEW_OVERALL_LINES_TO_COVER);
   }
 
   @Test
@@ -74,7 +74,7 @@ public class AllTestsLineCoverageDecoratorTest {
     decorator.decorate(project, context);
 
     // 50-10 covered lines / 50 lines
-    verify(context).saveMeasure(CoreMetrics.MERGED_LINE_COVERAGE, 80.0);
+    verify(context).saveMeasure(CoreMetrics.OVERALL_LINE_COVERAGE, 80.0);
   }
 
   @Test
@@ -83,7 +83,7 @@ public class AllTestsLineCoverageDecoratorTest {
 
     decorator.decorate(project, context);
 
-    verify(context).saveMeasure(CoreMetrics.MERGED_LINE_COVERAGE, 0.0);
+    verify(context).saveMeasure(CoreMetrics.OVERALL_LINE_COVERAGE, 0.0);
   }
 
   @Test
@@ -92,7 +92,7 @@ public class AllTestsLineCoverageDecoratorTest {
 
     decorator.decorate(project, context);
 
-    verify(context).saveMeasure(CoreMetrics.MERGED_LINE_COVERAGE, 100.0);
+    verify(context).saveMeasure(CoreMetrics.OVERALL_LINE_COVERAGE, 100.0);
   }
 
   @Test
@@ -101,13 +101,13 @@ public class AllTestsLineCoverageDecoratorTest {
 
     decorator.decorate(project, context);
 
-    verify(context, never()).saveMeasure(eq(CoreMetrics.MERGED_LINE_COVERAGE), anyDouble());
+    verify(context, never()).saveMeasure(eq(CoreMetrics.OVERALL_LINE_COVERAGE), anyDouble());
   }
 
   private static DecoratorContext mockContext(int lines, int uncoveredLines) {
     DecoratorContext context = mock(DecoratorContext.class);
-    when(context.getMeasure(CoreMetrics.MERGED_LINES_TO_COVER)).thenReturn(new Measure(CoreMetrics.MERGED_LINES_TO_COVER, (double) lines));
-    when(context.getMeasure(CoreMetrics.MERGED_UNCOVERED_LINES)).thenReturn(new Measure(CoreMetrics.MERGED_UNCOVERED_LINES, (double) uncoveredLines));
+    when(context.getMeasure(CoreMetrics.OVERALL_LINES_TO_COVER)).thenReturn(new Measure(CoreMetrics.OVERALL_LINES_TO_COVER, (double) lines));
+    when(context.getMeasure(CoreMetrics.OVERALL_UNCOVERED_LINES)).thenReturn(new Measure(CoreMetrics.OVERALL_UNCOVERED_LINES, (double) uncoveredLines));
     return context;
   }
 }
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/AllTestsCoverageWidgetTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/AllTestsCoverageWidgetTest.java
deleted file mode 100644
index fc472d38cc5..00000000000
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/widgets/AllTestsCoverageWidgetTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.core.widgets;
-
-import org.junit.Test;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-public class AllTestsCoverageWidgetTest {
-  @Test
-  public void should_define_widget() {
-    AllTestsCoverageWidget widget = new AllTestsCoverageWidget();
-
-    assertThat(widget.getId()).isEqualTo("merged-coverage");
-    assertThat(widget.getTitle()).isEqualTo("All Tests Coverage");
-  }
-
-  @Test
-  public void should_use_relative_path_for_template() {
-    AllTestsCoverageWidget widget = new AllTestsCoverageWidget();
-
-    assertThat(widget.getTemplatePath()).startsWith("/");
-  }
-}
diff --git a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoAllTestsSensor.java b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoOverallSensor.java
index 79a24239cb4..8ce1aa6e51e 100644
--- a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoAllTestsSensor.java
+++ b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoOverallSensor.java
@@ -42,12 +42,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 
-public class JaCoCoAllTestsSensor implements Sensor {
-  private static final String MERGED_EXEC = "target/sonar/merged.exec";
+public class JaCoCoOverallSensor implements Sensor {
+  private static final String JACOCO_OVERALL = "target/sonar/jacoco-overall.exec";
 
   private final JacocoConfiguration configuration;
 
-  public JaCoCoAllTestsSensor(JacocoConfiguration configuration) {
+  public JaCoCoOverallSensor(JacocoConfiguration configuration) {
     this.configuration = configuration;
   }
 
@@ -59,14 +59,14 @@ public class JaCoCoAllTestsSensor implements Sensor {
   public void analyse(Project project, SensorContext context) {
     mergeReports(project);
 
-    new AllTestsAnalyzer().analyse(project, context);
+    new OverallAnalyzer().analyse(project, context);
   }
 
   private void mergeReports(Project project) {
     File reportUTs = project.getFileSystem().resolvePath(configuration.getReportPath());
     File reportITs = project.getFileSystem().resolvePath(configuration.getItReportPath());
-    File reportAllTests = project.getFileSystem().resolvePath(MERGED_EXEC);
-    reportAllTests.getParentFile().mkdirs();
+    File reportOverall = project.getFileSystem().resolvePath(JACOCO_OVERALL);
+    reportOverall.getParentFile().mkdirs();
 
     SessionInfoStore infoStore = new SessionInfoStore();
     ExecutionDataStore dataStore = new ExecutionDataStore();
@@ -75,13 +75,13 @@ public class JaCoCoAllTestsSensor implements Sensor {
 
     BufferedOutputStream outputStream = null;
     try {
-      outputStream = new BufferedOutputStream(new FileOutputStream(reportAllTests));
+      outputStream = new BufferedOutputStream(new FileOutputStream(reportOverall));
       ExecutionDataWriter dataWriter = new ExecutionDataWriter(outputStream);
 
       infoStore.accept(dataWriter);
       dataStore.accept(dataWriter);
     } catch (IOException e) {
-      throw new SonarException(String.format("Unable to write merged file %s", reportAllTests.getAbsolutePath()), e);
+      throw new SonarException(String.format("Unable to write overall coverage report %s", reportOverall.getAbsolutePath()), e);
     } finally {
       Closeables.closeQuietly(outputStream);
     }
@@ -104,10 +104,10 @@ public class JaCoCoAllTestsSensor implements Sensor {
     }
   }
 
-  class AllTestsAnalyzer extends AbstractAnalyzer {
+  class OverallAnalyzer extends AbstractAnalyzer {
     @Override
     protected String getReportPath(Project project) {
-      return MERGED_EXEC;
+      return JACOCO_OVERALL;
     }
 
     @Override
@@ -127,19 +127,19 @@ public class JaCoCoAllTestsSensor implements Sensor {
 
     private Measure convertForAllTests(Measure measure) {
       if (CoreMetrics.LINES_TO_COVER.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.MERGED_LINES_TO_COVER, measure.getValue());
+        return new Measure(CoreMetrics.OVERALL_LINES_TO_COVER, measure.getValue());
       } else if (CoreMetrics.UNCOVERED_LINES.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.MERGED_UNCOVERED_LINES, measure.getValue());
+        return new Measure(CoreMetrics.OVERALL_UNCOVERED_LINES, measure.getValue());
       } else if (CoreMetrics.COVERAGE_LINE_HITS_DATA.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.MERGED_COVERAGE_LINE_HITS_DATA, measure.getData());
+        return new Measure(CoreMetrics.OVERALL_COVERAGE_LINE_HITS_DATA, measure.getData());
       } else if (CoreMetrics.CONDITIONS_TO_COVER.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.MERGED_CONDITIONS_TO_COVER, measure.getValue());
+        return new Measure(CoreMetrics.OVERALL_CONDITIONS_TO_COVER, measure.getValue());
       } else if (CoreMetrics.UNCOVERED_CONDITIONS.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.MERGED_UNCOVERED_CONDITIONS, measure.getValue());
+        return new Measure(CoreMetrics.OVERALL_UNCOVERED_CONDITIONS, measure.getValue());
       } else if (CoreMetrics.COVERED_CONDITIONS_BY_LINE.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.MERGED_COVERED_CONDITIONS_BY_LINE, measure.getData());
+        return new Measure(CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_LINE, measure.getData());
       } else if (CoreMetrics.CONDITIONS_BY_LINE.equals(measure.getMetric())) {
-        return new Measure(CoreMetrics.MERGED_CONDITIONS_BY_LINE, measure.getData());
+        return new Measure(CoreMetrics.OVERALL_CONDITIONS_BY_LINE, measure.getData());
       }
       return null;
     }
diff --git a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoPlugin.java b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoPlugin.java
index 9a6a2016982..d6150513661 100644
--- a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoPlugin.java
+++ b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JaCoCoPlugin.java
@@ -40,6 +40,6 @@ public class JaCoCoPlugin extends SonarPlugin {
         JaCoCoSensor.class,
         // Integration tests
         JaCoCoItSensor.class,
-        JaCoCoAllTestsSensor.class);
+        JaCoCoOverallSensor.class);
   }
 }
diff --git a/plugins/sonar-jacoco-plugin/src/test/java/org/sonar/plugins/jacoco/JaCoCoAllTestsSensorTest.java b/plugins/sonar-jacoco-plugin/src/test/java/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest.java
index bc318e66b6f..98d63538619 100644
--- a/plugins/sonar-jacoco-plugin/src/test/java/org/sonar/plugins/jacoco/JaCoCoAllTestsSensorTest.java
+++ b/plugins/sonar-jacoco-plugin/src/test/java/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest.java
@@ -40,12 +40,12 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-public class JaCoCoAllTestsSensorTest {
+public class JaCoCoOverallSensorTest {
   private final JacocoConfiguration configuration= mock(JacocoConfiguration.class);
   private final SensorContext context = mock(SensorContext.class);
   private final ProjectFileSystem pfs = mock(ProjectFileSystem.class);
   private final Project project = mock(Project.class);
-  private final JaCoCoAllTestsSensor sensor  = new JaCoCoAllTestsSensor(configuration);
+  private final JaCoCoOverallSensor sensor  = new JaCoCoOverallSensor(configuration);
 
   @Test
   public void should_execute_on_project() {
@@ -66,7 +66,7 @@ public class JaCoCoAllTestsSensorTest {
 
   @Test
   public void should_save_measures() throws IOException {
-    File outputDir = TestUtils.getResource(JaCoCoAllTestsSensorTest.class, ".");
+    File outputDir = TestUtils.getResource(JaCoCoOverallSensorTest.class, ".");
     Files.copy(TestUtils.getResource("HelloWorld.class.toCopy"), new File(outputDir, "HelloWorld.class"));
 
     JavaFile resource = new JavaFile("com.sonar.coverages.HelloWorld");
@@ -78,19 +78,19 @@ public class JaCoCoAllTestsSensorTest {
     when(pfs.getBuildOutputDir()).thenReturn(outputDir);
     when(pfs.resolvePath("ut.exec")).thenReturn(new File(outputDir, "ut.exec"));
     when(pfs.resolvePath("it.exec")).thenReturn(new File(outputDir, "it.exec"));
-    when(pfs.resolvePath("target/sonar/merged.exec")).thenReturn(new File("target/sonar/merged.exec"));
+    when(pfs.resolvePath("target/sonar/jacoco-overall.exec")).thenReturn(new File("target/sonar/jacoco-overall.exec"));
 
     sensor.analyse(project, context);
 
     verify(context).getResource(resource);
-    verify(context).saveMeasure(resource, new Measure(CoreMetrics.MERGED_LINES_TO_COVER, 5.0));
-    verify(context).saveMeasure(resource, new Measure(CoreMetrics.MERGED_UNCOVERED_LINES, 0.0));
-    verify(context).saveMeasure(resource, new Measure(CoreMetrics.MERGED_COVERAGE_LINE_HITS_DATA, "3=1;6=1;7=1;10=1;11=1"));
+    verify(context).saveMeasure(resource, new Measure(CoreMetrics.OVERALL_LINES_TO_COVER, 5.0));
+    verify(context).saveMeasure(resource, new Measure(CoreMetrics.OVERALL_UNCOVERED_LINES, 0.0));
+    verify(context).saveMeasure(resource, new Measure(CoreMetrics.OVERALL_COVERAGE_LINE_HITS_DATA, "3=1;6=1;7=1;10=1;11=1"));
     verifyNoMoreInteractions(context);
   }
 
   @Test
   public void testSensorDefinition() {
-    assertThat(sensor.toString()).isEqualTo("JaCoCoAllTestsSensor");
+    assertThat(sensor.toString()).isEqualTo("JaCoCoOverallSensor");
   }
 }
diff --git a/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoAllTestsSensorTest/it.exec b/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest/it.exec
index ce2421df376..ce2421df376 100644
--- a/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoAllTestsSensorTest/it.exec
+++ b/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest/it.exec
diff --git a/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoAllTestsSensorTest/ut.exec b/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest/ut.exec
index 09d84373641..09d84373641 100644
--- a/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoAllTestsSensorTest/ut.exec
+++ b/plugins/sonar-jacoco-plugin/src/test/resources/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest/ut.exec