SONAR-16472 Set 'security_hotspots_reviewed_status' and 'security_hot…

…spots_to_review_status' to all components
SonarSource · Jun 10, 2022 · 668ac59 · 668ac59
1 parent 144b731
commit 668ac59
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/...in/java/org/sonar/ce/task/projectanalysis/qualitymodel/SecurityReviewMeasuresVisitor.java b/...in/java/org/sonar/ce/task/projectanalysis/qualitymodel/SecurityReviewMeasuresVisitor.java
@@ -62,9 +62,6 @@ public SecurityReviewMeasuresVisitor(ComponentIssuesRepository componentIssuesRe
   @Override
   public void visitProject(Component project, Path<SecurityReviewCounter> path) {
     computeMeasure(project, path);
-    // The following measures are only computed on projects level as they are required to compute the others measures on applications
-    measureRepository.add(project, securityHotspotsReviewedStatusMetric, newMeasureBuilder().create(path.current().getHotspotsReviewed()));
-    measureRepository.add(project, securityHotspotsToReviewStatusMetric, newMeasureBuilder().create(path.current().getHotspotsToReview()));
   }
 
   @Override
@@ -83,6 +80,8 @@ private void computeMeasure(Component component, PathAwareVisitor.Path<SecurityR
       .filter(issue -> issue.type().equals(SECURITY_HOTSPOT))
       .forEach(issue -> path.current().processHotspot(issue));
 
+    measureRepository.add(component, securityHotspotsReviewedStatusMetric, newMeasureBuilder().create(path.current().getHotspotsReviewed()));
+    measureRepository.add(component, securityHotspotsToReviewStatusMetric, newMeasureBuilder().create(path.current().getHotspotsToReview()));
     Optional<Double> percent = computePercent(path.current().getHotspotsToReview(), path.current().getHotspotsReviewed());
     measureRepository.add(component, securityReviewRatingMetric, RatingMeasures.get(computeRating(percent.orElse(null))));
     percent.ifPresent(p -> measureRepository.add(component, securityHotspotsReviewedMetric, newMeasureBuilder().create(p, securityHotspotsReviewedMetric.getDecimalScale())));

diff --git a/...ava/org/sonar/ce/task/projectanalysis/qualitymodel/SecurityReviewMeasuresVisitorTest.java b/...ava/org/sonar/ce/task/projectanalysis/qualitymodel/SecurityReviewMeasuresVisitorTest.java
@@ -273,10 +273,10 @@ public void compute_status_related_measures() {
 
     underTest.visit(ROOT_PROJECT);
 
-    verifyHotspotStatusMeasures(FILE_1_REF, null, null);
-    verifyHotspotStatusMeasures(FILE_2_REF, null, null);
-    verifyHotspotStatusMeasures(DIRECTORY_REF, null, null);
-    verifyHotspotStatusMeasures(ROOT_DIR_REF, null, null);
+    verifyHotspotStatusMeasures(FILE_1_REF, 1, 1);
+    verifyHotspotStatusMeasures(FILE_2_REF, 3, 2);
+    verifyHotspotStatusMeasures(DIRECTORY_REF, 4, 3);
+    verifyHotspotStatusMeasures(ROOT_DIR_REF, 4, 3);
     verifyHotspotStatusMeasures(PROJECT_REF, 4, 3);
   }