Revert "SONAR-6646 no_value measure can not be a best value optimized measure"

This reverts commit 0199d646efb6260d2aa6fc8705d940a3ef89285c because no_value measures _can_ and must be considered as best value optimized if other criterias are met

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BestValueOptimization.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BestValueOptimization.java
index d28a516cfa2b4abcb52b7b6d9d7a62178619ff7a..c9786bbef99e5a32a564c9b91e26f3e45a5c6019 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BestValueOptimization.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BestValueOptimization.java
@@ -61,8 +61,7 @@ public class BestValueOptimization implements Predicate<Measure> {
       && measure.getData() == null
       && !measure.hasQualityGateStatus()
       && hasNoVariation(measure)
-      && measure.getValueType() != NO_VALUE
-      && isBestValue(measure, metric.getBestValue());
+      && (measure.getValueType() == NO_VALUE || isBestValue(measure, metric.getBestValue()));
   }
 
   private static boolean hasNoVariation(Measure measure) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BestValueOptimizationTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BestValueOptimizationTest.java
index e3fda46f280cd873181ecbcbf4e2bc709bed8d25..c2d02d91d03f7a1d4282e9f57bda84cc45426bde 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BestValueOptimizationTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BestValueOptimizationTest.java
@@ -164,13 +164,6 @@ public class BestValueOptimizationTest {
     assertThat(underTest.apply(newMeasureBuilder().create(Measure.Level.OK))).isFalse();
   }
 
-  @Test
-  public void apply_returns_false_when_type_is_NO_VALUE() {
-    Predicate<Measure> underTest = BestValueOptimization.from(createMetric(Metric.MetricType.STRING, 36.5d), FILE_COMPONENT);
-
-    assertThat(underTest.apply(newMeasureBuilder().createNoValue())).isFalse();
-  }
-
   private static MetricImpl createMetric(Metric.MetricType metricType, double bestValue) {
     return new MetricImpl(metricType.hashCode() + (int) bestValue, "key" + metricType + bestValue, "name" + metricType + bestValue, metricType, bestValue, true);
   }