fix: remove covered line adjustment

mcarvin8 · Oct 21, 2024 · 14a6c54 · 14a6c54
1 parent 3d2f426
commit 14a6c54
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 228 deletions.
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/transformDeployCoverageReport.ts b/src/helpers/transformDeployCoverageReport.ts
@@ -6,7 +6,6 @@ import { create } from 'xmlbuilder2';
 import { DeployCoverageData, CoverageObject, FileObject } from './types.js';
 import { getPackageDirectories } from './getPackageDirectories.js';
 import { findFilePath } from './findFilePath.js';
-import { setCoveredLines } from './setCoveredLines.js';
 import { normalizePathToUnix } from './normalizePathToUnix.js';
 
 export async function transformDeployCoverageReport(
@@ -26,23 +25,21 @@ export async function transformDeployCoverageReport(
       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': normalizePathToUnix(relativeFilePath),
-      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, repoRoot, relativeFilePath, 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': Number(lineNumberString),
+        '@covered': covered,
+      });
+    }
+
     filesProcessed++;
     coverageObj.coverage.file.push(fileObj);
   }

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/acc-transformer/transform.nut.ts b/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,15 +9,18 @@ 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');
   const baselineXmlPath = resolve('test/coverage_baseline.xml');
   const testXmlPath1 = resolve('coverage1.xml');
   const testXmlPath2 = resolve('coverage2.xml');
   const testXmlPath3 = resolve('coverage3.xml');
+  const sfdxConfigFile = resolve('sfdx-project.json');
 
   const configFile = {
     packageDirectories: [{ path: 'force-app', default: true }, { path: 'packaged' }],
@@ -29,18 +32,18 @@ describe('acc-transformer transform NUTs', () => {
 
   before(async () => {
     session = await TestSession.create({ devhubAuthStrategy: 'NONE' });
-    await writeFile('sfdx-project.json', configJsonString);
+    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('sfdx-project.json');
-    await rm('force-app/main/default/classes/AccountProfile.cls');
-    await rm('packaged/triggers/AccountTrigger.trigger');
+    await rm(sfdxConfigFile);
+    await rm(baselineClassPath);
+    await rm(baselineTriggerPath);
     await rm('force-app', { recursive: true });
     await rm('packaged', { recursive: true });
     await rm(testXmlPath1);

diff --git a/test/commands/acc-transformer/transform.test.ts b/test/commands/acc-transformer/transform.test.ts
@@ -1,6 +1,6 @@
 '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';
 
@@ -12,8 +12,10 @@ import TransformerTransform from '../../../src/commands/acc-transformer/transfor
 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 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');
@@ -34,8 +36,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);
   });
 
@@ -48,8 +50,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);