fix!: remove covered line adjustment in deploy coverage reports

README.md

@@ -53,8 +53,6 @@ sf apex get test --test-run-id <test run id> --code-coverage --result-format jso
 
 The code coverage JSONs created by the Salesforce CLI aren't accepted automatically for Salesforce DX repositories and needs to be converted using this plugin.
 
-**Disclaimer**: Due to existing bugs with how the Salesforce CLI reports covered lines during deployments (see [5511](https://github.com/forcedotcom/salesforcedx-vscode/issues/5511) and [1568](https://github.com/forcedotcom/cli/issues/1568)), to add support for covered lines in this plugin for deployment coverage files, I had to add a function to re-number out-of-range covered lines the CLI may report (ex: line 100 in a 98-line Apex Class is reported back as covered by the Salesforce CLI deploy command). Salesforce's coverage result may also include extra lines as covered (ex: 120 lines are included in the coverage report for a 100 line file), so the coverage percentage may vary based on how many lines the API returns in the coverage report. Once Salesforce fixes the API to correctly return covered lines in the deploy command, this function will be removed.
-
 ## Command
 
 The `apex-code-coverage-transformer` has 1 command:

src/helpers/transformDeployCoverageReport.ts

@@ -11,8 +11,6 @@ import {
 } from './types.js';
 import { getPackageDirectories } from './getPackageDirectories.js';
 import { findFilePath } from './findFilePath.js';
-import { setCoveredLinesSonar } from './setCoveredLinesSonar.js';
-import { setCoveredLinesCobertura } from './setCoveredLinesCobertura.js';
 import { normalizePathToUnix } from './normalizePathToUnix.js';
 import { generateXml } from './generateXml.js';
 
@@ -87,20 +85,13 @@ export async function transformDeployCoverageReport(
       .map(Number);
 
     if (format === 'sonar') {
-      await handleSonarFormat(
-        relativeFilePath,
-        uncoveredLines,
-        coveredLines,
-        repoRoot,
-        coverageObj as SonarCoverageObject
-      );
+      handleSonarFormat(relativeFilePath, fileInfo.s, coverageObj as SonarCoverageObject);
     } else {
-      await handleCoberturaFormat(
+      handleCoberturaFormat(
         relativeFilePath,
         formattedFileName,
         uncoveredLines,
         coveredLines,
-        repoRoot,
         coverageObj as CoberturaCoverageObject,
         packageObj!
       );
@@ -113,34 +104,32 @@ export async function transformDeployCoverageReport(
   return { xml, warnings, filesProcessed };
 }
 
-async function handleSonarFormat(
-  filePath: string,
-  uncoveredLines: number[],
-  coveredLines: number[],
-  repoRoot: string,
-  coverageObj: SonarCoverageObject
-): Promise<void> {
+function handleSonarFormat(filePath: string, lines: Record<string, number>, coverageObj: SonarCoverageObject): void {
   const fileObj: SonarClass = {
     '@path': normalizePathToUnix(filePath),
-    lineToCover: uncoveredLines.map((lineNumber) => ({
-      '@lineNumber': lineNumber,
-      '@covered': 'false',
-    })),
+    lineToCover: [],
   };
 
-  await setCoveredLinesSonar(coveredLines, uncoveredLines, repoRoot, filePath, fileObj);
+  for (const lineNumberString in lines) {
+    if (!Object.hasOwn(lines, lineNumberString)) continue;
+    const covered = lines[lineNumberString] === 1 ? 'true' : 'false';
+    fileObj.lineToCover.push({
+      '@lineNumber': Number(lineNumberString),
+      '@covered': covered,
+    });
+  }
+
   coverageObj.coverage.file.push(fileObj);
 }
 
-async function handleCoberturaFormat(
+function handleCoberturaFormat(
   filePath: string,
   fileName: string,
   uncoveredLines: number[],
   coveredLines: number[],
-  repoRoot: string,
   coverageObj: CoberturaCoverageObject,
   packageObj: CoberturaPackage
-): Promise<void> {
+): void {
   const classObj: CoberturaClass = {
     '@name': fileName,
     '@filename': normalizePathToUnix(filePath),
@@ -154,12 +143,15 @@ async function handleCoberturaFormat(
           '@hits': 0,
           '@branch': 'false',
         })),
+        ...coveredLines.map((lineNumber) => ({
+          '@number': lineNumber,
+          '@hits': 1,
+          '@branch': 'false',
+        })),
       ],
     },
   };
 
-  await setCoveredLinesCobertura(coveredLines, uncoveredLines, repoRoot, filePath, classObj);
-
   coverageObj.coverage['@lines-valid'] += uncoveredLines.length + coveredLines.length;
   coverageObj.coverage['@lines-covered'] += coveredLines.length;
   packageObj.classes.class.push(classObj);

test/commands/acc-transformer/transform.nut.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import { copyFile, writeFile, readFile, rm, mkdir } from 'node:fs/promises';
+import { writeFile, readFile, rm, mkdir } from 'node:fs/promises';
 import { strictEqual } from 'node:assert';
 import { resolve } from 'node:path';
 
@@ -9,8 +9,10 @@ import { expect } from 'chai';
 
 describe('acc-transformer transform NUTs', () => {
   let session: TestSession;
-  const baselineClassPath = resolve('test/baselines/classes/AccountProfile.cls');
-  const baselineTriggerPath = resolve('test/baselines/triggers/AccountTrigger.trigger');
+  const mockClassContent = '// Test Apex Class';
+  const mockTriggerContent = '// Test Apex Trigger';
+  const baselineClassPath = resolve('force-app/main/default/classes/AccountProfile.cls');
+  const baselineTriggerPath = resolve('packaged/triggers/AccountTrigger.trigger');
   const deployCoverageNoExts = resolve('test/deploy_coverage_no_file_exts.json');
   const deployCoverageWithExts = resolve('test/deploy_coverage_with_file_exts.json');
   const testCoverage = resolve('test/test_coverage.json');
@@ -29,7 +31,6 @@ describe('acc-transformer transform NUTs', () => {
     packageDirectories: [{ path: 'force-app', default: true }, { path: 'packaged' }],
     namespace: '',
     sfdcLoginUrl: 'https://login.salesforce.com',
-    sourceApiVersion: '58.0',
   };
   const configJsonString = JSON.stringify(configFile, null, 2);
 
@@ -38,15 +39,15 @@ describe('acc-transformer transform NUTs', () => {
     await writeFile(sfdxConfigFile, configJsonString);
     await mkdir('force-app/main/default/classes', { recursive: true });
     await mkdir('packaged/triggers', { recursive: true });
-    await copyFile(baselineClassPath, 'force-app/main/default/classes/AccountProfile.cls');
-    await copyFile(baselineTriggerPath, 'packaged/triggers/AccountTrigger.trigger');
+    await writeFile(baselineClassPath, mockClassContent);
+    await writeFile(baselineTriggerPath, mockTriggerContent);
   });
 
   after(async () => {
     await session?.clean();
     await rm(sfdxConfigFile);
-    await rm('force-app/main/default/classes/AccountProfile.cls');
-    await rm('packaged/triggers/AccountTrigger.trigger');
+    await rm(baselineClassPath);
+    await rm(baselineTriggerPath);
     await rm('force-app', { recursive: true });
     await rm('packaged', { recursive: true });
     await rm(sonarXmlPath1);