Make a helper method for calculation of change line total and covered

bibipkins · Feb 23, 2025 · 19e81e1 · 19e81e1
1 parent 868805a
commit 19e81e1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/parsers/cobertura.ts b/src/parsers/cobertura.ts
@@ -1,5 +1,5 @@
 import { CoverageParser, ICoverageData, ICoverageFile, ICoverageModule, ChangedFileWithLineNumbers } from '../data';
-import { calculateCoverage, createCoverageModule, parseCoverage } from './common';
+import { calculateCoverage, calculateChangedLineTotals, calculateChangedLinesCovered, createCoverageModule, parseCoverage } from './common';
 
 const parseCobertura: CoverageParser = async (filePath: string, threshold: number, changedFilesAndLineNumbers: ChangedFileWithLineNumbers[]) =>
   parseCoverage(filePath, threshold, changedFilesAndLineNumbers, parseSummary, parseModules);
@@ -11,8 +11,8 @@ const parseSummary = (file: any, modules: ICoverageModule[]): ICoverageData => {
     Number(summary['lines-valid']) + Number(summary['branches-valid'])
   );
 
-  const changedLinesTotal = Number(modules.reduce((summ, m) => summ + Number(m.files.reduce((summ2, f) => summ2 + Number(f.changedLinesTotal), 0)), 0))
-  const changedLinesCovered = Number(modules.reduce((summ, m) => summ + Number(m.files.reduce((summ2, f) => summ2 + Number(f.changedLinesCovered), 0)), 0))
+  const changedLinesTotal = calculateChangedLineTotals(modules);
+  const changedLinesCovered = calculateChangedLinesCovered(modules);
 
   return {
     totalCoverage,

diff --git a/src/parsers/common.ts b/src/parsers/common.ts
@@ -5,6 +5,13 @@ export const calculateCoverage = (covered: number, total: number): number => {
   return total ? Math.round((covered / total) * 10000) / 100 : 100;
 };
 
+export const  calculateChangedLineTotals = (modules: ICoverageModule[]): number => {
+  return Number(modules.reduce((summ, m) => summ + Number(m.files.reduce((summ2, f) => summ2 + Number(f.changedLinesTotal), 0)), 0))
+}
+export const  calculateChangedLinesCovered = (modules: ICoverageModule[]): number => {
+  return Number(modules.reduce((summ, m) => summ + Number(m.files.reduce((summ2, f) => summ2 + Number(f.changedLinesCovered), 0)), 0))
+}
+
 export const createCoverageModule = (
   name: string,
   threshold: number,

diff --git a/src/parsers/opencover.ts b/src/parsers/opencover.ts
@@ -1,5 +1,5 @@
 import { CoverageParser, ICoverageData, ICoverageFile, ICoverageModule, ChangedFileWithLineNumbers } from '../data';
-import { calculateCoverage, createCoverageModule, parseCoverage } from './common';
+import { calculateCoverage, calculateChangedLineTotals, calculateChangedLinesCovered, createCoverageModule, parseCoverage } from './common';
 
 const parseOpencover: CoverageParser = async (filePath: string, threshold: number, changedFilesAndLineNumbers: ChangedFileWithLineNumbers[]) =>
   parseCoverage(filePath, threshold, changedFilesAndLineNumbers, parseSummary, parseModules);
@@ -10,8 +10,8 @@ const parseSummary = (file: any, modules: ICoverageModule[]): ICoverageData => {
     Number(summary.visitedSequencePoints) + Number(summary.visitedBranchPoints),
     Number(summary.numSequencePoints) + Number(summary.numBranchPoints)
   );
-  const changedLinesTotal = Number(modules.reduce((summ, m) => summ + Number(m.files.reduce((summ2, f) => summ2 + Number(f.changedLinesTotal), 0)), 0))
-  const changedLinesCovered = Number(modules.reduce((summ, m) => summ + Number(m.files.reduce((summ2, f) => summ2 + Number(f.changedLinesCovered), 0)), 0))
+  const changedLinesTotal = calculateChangedLineTotals(modules);
+  const changedLinesCovered = calculateChangedLinesCovered(modules);
 
   return {
     totalCoverage,