SONAR-3900 dependsUponMetrics should also return fallbackMetric

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
index 59869be6eac09dc5dc2368c39bc19bf830744648..3e8ff97a3a61abe19122b0a4d0b42307abb6576b 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
@@ -71,7 +71,7 @@ public class AverageFormula implements Formula {
    * {@inheritDoc}
    */
   public List<Metric> dependsUponMetrics() {
-    return Arrays.asList(mainMetric, byMetric);
+    return Arrays.asList(mainMetric, fallbackMetric, byMetric);
   }
 
   /**

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/measures/AverageFormulaTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/measures/AverageFormulaTest.java
index 8cabe3cf741cff29b1cd79aa7d9717073b774294..6ecc868d33e605cf68ef555432c4709752dac352 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/measures/AverageFormulaTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/measures/AverageFormulaTest.java
@@ -51,6 +51,12 @@ public class AverageFormulaTest {
     assertThat(formula.dependsUponMetrics(), hasItems(CoreMetrics.COMPLEXITY, CoreMetrics.FUNCTIONS));
   }
 
+  @Test
+  public void test_depends_upon_falback_metric() throws Exception {
+    AverageFormula formula = AverageFormula.create(CoreMetrics.COMPLEXITY_IN_FUNCTIONS, CoreMetrics.FUNCTIONS).setFallbackForMainMetric(CoreMetrics.COMPLEXITY);
+    assertThat(formula.dependsUponMetrics(), hasItems(CoreMetrics.COMPLEXITY_IN_FUNCTIONS, CoreMetrics.COMPLEXITY, CoreMetrics.FUNCTIONS));
+  }
+
   @Test
   public void test_average_calculation() {
     List<FormulaData> childrenData = newArrayList();