From ab2df01969a95f5b46407fcd6dcceccf86686efc Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 9 Nov 2015 14:04:49 +0100 Subject: [PATCH] SONAR-6991 remove duplicated_lines_density from metrics allowed in report --- .../ReportDuplicationMeasuresStepTest.java | 28 +++++++++---------- .../org/sonar/core/metric/BatchMetrics.java | 4 +-- .../sonar/core/metric/BatchMetricsTest.java | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportDuplicationMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportDuplicationMeasuresStepTest.java index 650255cea78..d54c75ed33e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportDuplicationMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportDuplicationMeasuresStepTest.java @@ -61,20 +61,20 @@ public class ReportDuplicationMeasuresStepTest { @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule() .setRoot( - builder(PROJECT, ROOT_REF) - .addChildren( - builder(MODULE, MODULE_REF) - .addChildren( - builder(MODULE, SUB_MODULE_REF) - .addChildren( - builder(DIRECTORY, DIRECTORY_REF) - .addChildren( - builder(FILE, FILE_1_REF).build(), - builder(FILE, FILE_2_REF).build()) - .build()) - .build()) - .build()) - .build()); + builder(PROJECT, ROOT_REF) + .addChildren( + builder(MODULE, MODULE_REF) + .addChildren( + builder(MODULE, SUB_MODULE_REF) + .addChildren( + builder(DIRECTORY, DIRECTORY_REF) + .addChildren( + builder(FILE, FILE_1_REF).build(), + builder(FILE, FILE_2_REF).build()) + .build()) + .build()) + .build()) + .build()); @Rule public MetricRepositoryRule metricRepository = new MetricRepositoryRule() .add(LINES) diff --git a/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java b/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java index faec6be9514..c32d18eef8a 100644 --- a/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java +++ b/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java @@ -49,7 +49,6 @@ import static org.sonar.api.measures.CoreMetrics.DIRECTORIES; import static org.sonar.api.measures.CoreMetrics.DUPLICATED_BLOCKS; import static org.sonar.api.measures.CoreMetrics.DUPLICATED_FILES; import static org.sonar.api.measures.CoreMetrics.DUPLICATED_LINES; -import static org.sonar.api.measures.CoreMetrics.DUPLICATED_LINES_DENSITY; import static org.sonar.api.measures.CoreMetrics.FILES; import static org.sonar.api.measures.CoreMetrics.FILE_COMPLEXITY_DISTRIBUTION; import static org.sonar.api.measures.CoreMetrics.FUNCTIONS; @@ -88,7 +87,7 @@ import static org.sonar.api.measures.CoreMetrics.UNCOVERED_CONDITIONS; import static org.sonar.api.measures.CoreMetrics.UNCOVERED_LINES; /** - * This class is used to know the list of metrics that can be send in the batch report. + * This class is used to know the list of metrics that can be sent in the batch report. *

* The batch should not send other metrics, and the Compute Engine should not allow other metrics. */ @@ -120,7 +119,6 @@ public class BatchMetrics { DUPLICATED_LINES, DUPLICATED_BLOCKS, DUPLICATED_FILES, - DUPLICATED_LINES_DENSITY, COMPLEXITY, COMPLEXITY_IN_CLASSES, diff --git a/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java b/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java index 810e0758916..665191a896a 100644 --- a/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java @@ -37,7 +37,7 @@ public class BatchMetricsTest { @Test public void check_number_of_allowed_core_metrics() throws Exception { - assertThat(SENSOR_METRICS_WITHOUT_METRIC_PLUGIN.getMetrics()).hasSize(53); + assertThat(SENSOR_METRICS_WITHOUT_METRIC_PLUGIN.getMetrics()).hasSize(52); } @Test -- 2.39.5