From: Julien Lancelot Date: Fri, 26 Apr 2013 11:00:53 +0000 (+0200) Subject: SONAR-3900 dependsUponMetrics should also return fallbackMetric X-Git-Tag: 3.6~536 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d56bd3f6b8675e76b6de0a94d0f77729d3505a7e;p=sonarqube.git 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 59869be6eac..3e8ff97a3a6 100644 --- 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 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 8cabe3cf741..6ecc868d33e 100644 --- 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 childrenData = newArrayList();