SONARPY-3821 Save ncloc metric on test files

henryju · claude · sonartech · commit 465bbeedc9f8 · 2026-02-26T08:32:30.000Z
Enable saving the NCLOC metric for test files in MeasuresRepository,
skipped in SonarLint context, consistent with main file behavior.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
GitOrigin-RevId: 844dc0115370b295c77bba31b24aabc835a3e378
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MetricsTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MetricsTest.java
@@ -75,15 +75,23 @@ static void startServer() {
   @Test
   void project_level() {
     // Size
-    assertThat(getProjectMeasureAsInt(NCLOC)).isEqualTo(6);
+    assertThat(getProjectMeasureAsInt(NCLOC)).satisfiesAnyOf(
+      nclocValue -> assertThat(nclocValue).isEqualTo(6),
+      // FIXME SONAR-27110 Can be removed when ITs will be run with SQS 2026.2+
+      nclocValue -> assertThat(nclocValue).isEqualTo(20)
+    );
     assertThat(getProjectMeasureAsInt(LINES)).isEqualTo(13);
     assertThat(getProjectMeasureAsInt(FILES)).isEqualTo(2);
     assertThat(getProjectMeasureAsInt(STATEMENTS)).isEqualTo(6);
     assertThat(getProjectMeasureAsInt(FUNCTIONS)).isOne();
     assertThat(getProjectMeasureAsInt(CLASSES)).isZero();
     // Documentation
     assertThat(getProjectMeasureAsInt(COMMENT_LINES)).isOne();
-    assertThat(getProjectMeasureAsDouble(COMMENT_LINES_DENSITY)).isEqualTo(14.3, OFFSET);
+    assertThat(getProjectMeasureAsDouble(COMMENT_LINES_DENSITY))
+      .satisfiesAnyOf( 
+        density -> assertThat(density).isEqualTo(14.3, OFFSET),
+        // FIXME SONAR-27110 Can be removed when ITs will be run with SQS 2026.2+
+        density -> assertThat(density).isEqualTo(4.8, OFFSET));
     // Complexity
     assertThat(getProjectMeasureAsDouble(COMPLEXITY)).isEqualTo(3.0, OFFSET);
     assertThat(getProjectMeasureAsDouble(COGNITIVE_COMPLEXITY)).isEqualTo(3.0, OFFSET);
diff --git a/python-commons/src/main/java/org/sonar/plugins/python/MeasuresRepository.java b/python-commons/src/main/java/org/sonar/plugins/python/MeasuresRepository.java
@@ -61,6 +61,14 @@ public void save(PythonInputFile inputFile, PythonVisitorContext visitorContext)
     }
   }
 
+  public void saveNclocForTestFile(PythonInputFile inputFile, PythonVisitorContext visitorContext) {
+    if (!isInSonarLint) {
+      FileMetrics fileMetrics = new FileMetrics(visitorContext, isNotebook(inputFile));
+      int linesOfCode = fileMetrics.fileLinesVisitor().getLinesOfCode().size();
+      saveMetricOnFile(inputFile, CoreMetrics.NCLOC, linesOfCode);
+    }
+  }
+
   private void saveInternal(PythonInputFile inputFile, PythonVisitorContext visitorContext) {
     FileMetrics fileMetrics = new FileMetrics(visitorContext, isNotebook(inputFile));
     FileLinesVisitor fileLinesVisitor = fileMetrics.fileLinesVisitor();
diff --git a/python-commons/src/main/java/org/sonar/plugins/python/PythonScanner.java b/python-commons/src/main/java/org/sonar/plugins/python/PythonScanner.java
@@ -135,9 +135,13 @@ protected void scanFile(PythonInputFile inputFile) throws IOException {
 
     noSonarLineInfoCollector.collect(pythonFile.key(), visitorContext.rootTree());
 
-    if (fileType == InputFile.Type.MAIN && visitorContext.rootTree() != null) {
-      pushTokens(inputFile, visitorContext);
-      measuresRepository.save(inputFile, visitorContext);
+    if (visitorContext.rootTree() != null) {
+      if (fileType == InputFile.Type.MAIN) {
+        pushTokens(inputFile, visitorContext);
+        measuresRepository.save(inputFile, visitorContext);
+      } else if (fileType == InputFile.Type.TEST) {
+        measuresRepository.saveNclocForTestFile(inputFile, visitorContext);
+      }
     }
 
     var issues = visitorContext.getIssues();
diff --git a/python-commons/src/test/java/org/sonar/plugins/python/PythonSensorTest.java b/python-commons/src/test/java/org/sonar/plugins/python/PythonSensorTest.java
@@ -610,6 +610,25 @@ void test_issues_on_test_files() {
     assertThat(issue.ruleKey().rule()).isEqualTo("S5905");
   }
 
+  @Test
+  void test_ncloc_metric_on_test_file() {
+    activeRules = new ActiveRulesBuilder().build();
+    PythonInputFile inputFile = inputFile(FILE_TEST_FILE, Type.TEST);
+    sensor().execute(context);
+
+    assertThat(context.measure(inputFile.wrappedFile().key(), CoreMetrics.NCLOC).value()).isEqualTo(3);
+  }
+
+  @Test
+  void test_ncloc_metric_not_saved_on_test_file_in_sonarlint() {
+    context.setRuntime(SONARLINT_RUNTIME);
+    activeRules = new ActiveRulesBuilder().build();
+    PythonInputFile inputFile = inputFile(FILE_TEST_FILE, Type.TEST);
+    sensor().execute(context);
+
+    assertThat(context.measure(inputFile.wrappedFile().key(), CoreMetrics.NCLOC)).isNull();
+  }
+
   @Test
   void test_failFast_triggered_on_main_files() {
     activeRules = new ActiveRulesBuilder()

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,14 @@ public void save(PythonInputFile inputFile, PythonVisitorContext visitorContext)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ public void saveNclocForTestFile(PythonInputFile inputFile, PythonVisitorContext visitorContext) {`
	`65`	`+ if (!isInSonarLint) {`
	`66`	`+ FileMetrics fileMetrics = new FileMetrics(visitorContext, isNotebook(inputFile));`
	`67`	`+ int linesOfCode = fileMetrics.fileLinesVisitor().getLinesOfCode().size();`
	`68`	`+ saveMetricOnFile(inputFile, CoreMetrics.NCLOC, linesOfCode);`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+`
`64`	`72`	`private void saveInternal(PythonInputFile inputFile, PythonVisitorContext visitorContext) {`
`65`	`73`	`FileMetrics fileMetrics = new FileMetrics(visitorContext, isNotebook(inputFile));`
`66`	`74`	`FileLinesVisitor fileLinesVisitor = fileMetrics.fileLinesVisitor();`