fix: remove covered line adjustment

mcarvin8 · Apr 18, 2024 · 8026f83 · 8026f83
1 parent 6b739c4
commit 8026f83
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 226 deletions.
diff --git a/src/commands/apex-code-coverage/transformer/transform.ts b/src/commands/apex-code-coverage/transformer/transform.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import { resolve } from 'node:path';
+import { resolve } from 'node:path/posix';
 import { writeFile, readFile } from 'node:fs/promises';
 
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
@@ -45,12 +45,9 @@ export default class TransformerTransform extends SfCommand<TransformerTransform
 
   public async run(): Promise<TransformerTransformResult> {
     const { flags } = await this.parse(TransformerTransform);
-    let jsonFilePath = flags['coverage-json'];
-    let xmlFilePath = flags['xml'];
-    let sfdxConfigFile = flags['sfdx-configuration'];
-    jsonFilePath = resolve(jsonFilePath);
-    xmlFilePath = resolve(xmlFilePath);
-    sfdxConfigFile = resolve(sfdxConfigFile);
+    const jsonFilePath = resolve(flags['coverage-json']);
+    const xmlFilePath = resolve(flags['xml']);
+    const sfdxConfigFile = resolve(flags['sfdx-configuration']);
 
     const jsonData = await readFile(jsonFilePath, 'utf-8');
     const coverageData = JSON.parse(jsonData) as CoverageData;

diff --git a/src/helpers/convertToGenericCoverageReport.ts b/src/helpers/convertToGenericCoverageReport.ts
@@ -5,7 +5,6 @@ import { create } from 'xmlbuilder2';
 
 import { CoverageData, CoverageObject, FileObject } from './types.js';
 import { findFilePath } from './findFilePath.js';
-import { setCoveredLines } from './setCoveredLines.js';
 
 export async function convertToGenericCoverageReport(
   data: CoverageData,
@@ -24,23 +23,21 @@ export async function convertToGenericCoverageReport(
       warnings.push(`The file name ${formattedFileName} was not found in any package directory.`);
       continue;
     }
-    const uncoveredLines = Object.keys(fileInfo.s)
-      .filter((lineNumber) => fileInfo.s[lineNumber] === 0)
-      .map(Number);
-    const coveredLines = Object.keys(fileInfo.s)
-      .filter((lineNumber) => fileInfo.s[lineNumber] === 1)
-      .map(Number);
-
     const fileObj: FileObject = {
       '@path': filePath,
-      lineToCover: uncoveredLines.map((lineNumber: number) => ({
-        '@lineNumber': lineNumber,
-        '@covered': 'false',
-      })),
+      lineToCover: [],
     };
 
-    // this function is only needed until Salesforce fixes the API to correctly return covered lines
-    await setCoveredLines(coveredLines, uncoveredLines, filePath, fileObj);
+    for (const lineNumberString in fileInfo.s) {
+      if (!Object.hasOwn(fileInfo.s, lineNumberString)) continue;
+
+      const covered = fileInfo.s[lineNumberString] === 1 ? 'true' : 'false';
+      fileObj.lineToCover.push({
+        '@lineNumber': lineNumberString,
+        '@covered': covered,
+      });
+    }
+
     filesProcessed++;
     coverageObj.coverage.file.push(fileObj);
   }

diff --git a/src/helpers/getTotalLines.ts b/src/helpers/getTotalLines.ts
diff --git a/src/helpers/setCoveredLines.ts b/src/helpers/setCoveredLines.ts
diff --git a/src/helpers/types.ts b/src/helpers/types.ts
@@ -23,7 +23,7 @@ export interface SfdxProject {
 }
 
 interface LineToCover {
-  '@lineNumber': number;
+  '@lineNumber': string;
   '@covered': string;
 }
 

diff --git a/test/baselines/classes/AccountProfile.cls b/test/baselines/classes/AccountProfile.cls
diff --git a/test/baselines/triggers/AccountTrigger.trigger b/test/baselines/triggers/AccountTrigger.trigger
diff --git a/test/commands/transformer/unit.test.ts b/test/commands/transformer/unit.test.ts
@@ -1,8 +1,8 @@
 'use strict';
 
-import { copyFile, readFile, writeFile, rm, mkdir } from 'node:fs/promises';
+import { readFile, writeFile, rm, mkdir } from 'node:fs/promises';
 import { strictEqual } from 'node:assert';
-import { resolve } from 'node:path';
+import { resolve } from 'node:path/posix';
 
 import { TestContext } from '@salesforce/core/lib/testSetup.js';
 import { expect } from 'chai';
@@ -12,8 +12,10 @@ import TransformerTransform from '../../../src/commands/apex-code-coverage/trans
 describe('main', () => {
   const $$ = new TestContext();
   let sfCommandStubs: ReturnType<typeof stubSfCommandUx>;
-  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 coverageJsonPathNoExts = resolve('test/coverage_no_file_exts.json');
   const coverageJsonPathWithExts = resolve('test/coverage_with_file_exts.json');
   const baselineXmlPath = resolve('test/coverage_baseline.xml');
@@ -32,8 +34,8 @@ describe('main', () => {
   before(async () => {
     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);
     await writeFile(sfdxConfigFile, configJsonString);
   });
 
@@ -46,8 +48,8 @@ describe('main', () => {
   });
 
   after(async () => {
-    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(testXmlPath1);

diff --git a/test/coverage_baseline.xml b/test/coverage_baseline.xml
@@ -3,46 +3,46 @@
   <file path="packaged/triggers/AccountTrigger.trigger">
     <lineToCover lineNumber="52" covered="false"/>
     <lineToCover lineNumber="53" covered="false"/>
+    <lineToCover lineNumber="54" covered="true"/>
+    <lineToCover lineNumber="55" covered="true"/>
+    <lineToCover lineNumber="56" covered="true"/>
+    <lineToCover lineNumber="57" covered="true"/>
+    <lineToCover lineNumber="58" covered="true"/>
     <lineToCover lineNumber="59" covered="false"/>
     <lineToCover lineNumber="60" covered="false"/>
-    <lineToCover lineNumber="1" covered="true"/>
-    <lineToCover lineNumber="2" covered="true"/>
-    <lineToCover lineNumber="3" covered="true"/>
-    <lineToCover lineNumber="4" covered="true"/>
-    <lineToCover lineNumber="5" covered="true"/>
-    <lineToCover lineNumber="6" covered="true"/>
-    <lineToCover lineNumber="7" covered="true"/>
-    <lineToCover lineNumber="8" covered="true"/>
-    <lineToCover lineNumber="9" covered="true"/>
-    <lineToCover lineNumber="10" covered="true"/>
-    <lineToCover lineNumber="11" covered="true"/>
-    <lineToCover lineNumber="12" covered="true"/>
-    <lineToCover lineNumber="13" covered="true"/>
-    <lineToCover lineNumber="14" covered="true"/>
-    <lineToCover lineNumber="15" covered="true"/>
-    <lineToCover lineNumber="16" covered="true"/>
-    <lineToCover lineNumber="17" covered="true"/>
-    <lineToCover lineNumber="18" covered="true"/>
-    <lineToCover lineNumber="19" covered="true"/>
-    <lineToCover lineNumber="20" covered="true"/>
-    <lineToCover lineNumber="21" covered="true"/>
-    <lineToCover lineNumber="22" covered="true"/>
-    <lineToCover lineNumber="23" covered="true"/>
-    <lineToCover lineNumber="24" covered="true"/>
-    <lineToCover lineNumber="25" covered="true"/>
-    <lineToCover lineNumber="26" covered="true"/>
-    <lineToCover lineNumber="27" covered="true"/>
+    <lineToCover lineNumber="61" covered="true"/>
+    <lineToCover lineNumber="62" covered="true"/>
+    <lineToCover lineNumber="63" covered="true"/>
+    <lineToCover lineNumber="64" covered="true"/>
+    <lineToCover lineNumber="65" covered="true"/>
+    <lineToCover lineNumber="66" covered="true"/>
+    <lineToCover lineNumber="67" covered="true"/>
+    <lineToCover lineNumber="68" covered="true"/>
+    <lineToCover lineNumber="69" covered="true"/>
+    <lineToCover lineNumber="70" covered="true"/>
+    <lineToCover lineNumber="71" covered="true"/>
+    <lineToCover lineNumber="72" covered="true"/>
+    <lineToCover lineNumber="73" covered="true"/>
+    <lineToCover lineNumber="74" covered="true"/>
+    <lineToCover lineNumber="75" covered="true"/>
+    <lineToCover lineNumber="76" covered="true"/>
+    <lineToCover lineNumber="77" covered="true"/>
+    <lineToCover lineNumber="78" covered="true"/>
+    <lineToCover lineNumber="79" covered="true"/>
+    <lineToCover lineNumber="80" covered="true"/>
+    <lineToCover lineNumber="81" covered="true"/>
+    <lineToCover lineNumber="82" covered="true"/>
   </file>
   <file path="force-app/main/default/classes/AccountProfile.cls">
     <lineToCover lineNumber="52" covered="false"/>
     <lineToCover lineNumber="53" covered="false"/>
-    <lineToCover lineNumber="59" covered="false"/>
-    <lineToCover lineNumber="60" covered="false"/>
     <lineToCover lineNumber="54" covered="true"/>
     <lineToCover lineNumber="55" covered="true"/>
     <lineToCover lineNumber="56" covered="true"/>
     <lineToCover lineNumber="57" covered="true"/>
     <lineToCover lineNumber="58" covered="true"/>
+    <lineToCover lineNumber="59" covered="false"/>
+    <lineToCover lineNumber="60" covered="false"/>
     <lineToCover lineNumber="61" covered="true"/>
     <lineToCover lineNumber="62" covered="true"/>
     <lineToCover lineNumber="63" covered="true"/>
@@ -55,15 +55,15 @@
     <lineToCover lineNumber="70" covered="true"/>
     <lineToCover lineNumber="71" covered="true"/>
     <lineToCover lineNumber="72" covered="true"/>
-    <lineToCover lineNumber="1" covered="true"/>
-    <lineToCover lineNumber="2" covered="true"/>
-    <lineToCover lineNumber="3" covered="true"/>
-    <lineToCover lineNumber="4" covered="true"/>
-    <lineToCover lineNumber="5" covered="true"/>
-    <lineToCover lineNumber="6" covered="true"/>
-    <lineToCover lineNumber="7" covered="true"/>
-    <lineToCover lineNumber="8" covered="true"/>
-    <lineToCover lineNumber="9" covered="true"/>
-    <lineToCover lineNumber="10" covered="true"/>
+    <lineToCover lineNumber="73" covered="true"/>
+    <lineToCover lineNumber="74" covered="true"/>
+    <lineToCover lineNumber="75" covered="true"/>
+    <lineToCover lineNumber="76" covered="true"/>
+    <lineToCover lineNumber="77" covered="true"/>
+    <lineToCover lineNumber="78" covered="true"/>
+    <lineToCover lineNumber="79" covered="true"/>
+    <lineToCover lineNumber="80" covered="true"/>
+    <lineToCover lineNumber="81" covered="true"/>
+    <lineToCover lineNumber="82" covered="true"/>
   </file>
 </coverage>