test coverage report in CI

department-of-veterans-affairs · Jan 17, 2025 · 3dad6a9 · 3dad6a9
1 parent 5ae3b9e
commit 3dad6a9
Show file tree

Hide file tree

Showing 14 changed files with 161,768 additions and 76 deletions.
diff --git a/coverage-report.json b/coverage-report.json
diff --git a/merged-coverage-report.json b/merged-coverage-report.json
diff --git a/results/coverage-summary-0.json b/results/coverage-summary-0.json
diff --git a/results/coverage-summary-1.json b/results/coverage-summary-1.json
diff --git a/results/coverage-summary-2.json b/results/coverage-summary-2.json
diff --git a/results/coverage-summary-3.json b/results/coverage-summary-3.json
diff --git a/results/coverage-summary-4.json b/results/coverage-summary-4.json
diff --git a/results/coverage-summary-5.json b/results/coverage-summary-5.json
diff --git a/results/coverage-summary-6.json b/results/coverage-summary-6.json
diff --git a/results/coverage-summary-7.json b/results/coverage-summary-7.json
diff --git a/results/coverage-summary-8.json b/results/coverage-summary-8.json
diff --git a/results/coverage-summary-9.json b/results/coverage-summary-9.json
diff --git a/script/app-coverage-report.js b/script/app-coverage-report.js
@@ -18,18 +18,19 @@ const printCoverage = coverageResults => {
   });
 
   // Add each app coverage result to the table
-  Object.values(coverageResults).forEach(cov => {
-    const appLocation =
-      cov.path.substr(0, cov.path.lastIndexOf('/')) || 'All Files';
-    coverageTable.push({
-      [appLocation]: [
-        `${cov.lines.pct}%`,
-        `${cov.functions.pct}%`,
-        `${cov.statements.pct}%`,
-        `${cov.branches.pct}%`,
-      ],
-    });
-  });
+  console.log(Object.values(coverageResults));
+  // Object.values(coverageResults).forEach(cov => {
+  //   const appLocation =
+  //     cov.path.substr(0, cov.path.lastIndexOf('/')) || 'All Files';
+  //   coverageTable.push({
+  //     [appLocation]: [
+  //       `${cov.lines.pct}%`,
+  //       `${cov.functions.pct}%`,
+  //       `${cov.statements.pct}%`,
+  //       `${cov.branches.pct}%`,
+  //     ],
+  //   });
+  // });
 
   console.log(coverageTable.toString());
 };
@@ -97,10 +98,11 @@ const logCoverage = coverageResults => {
   const data = JSON.stringify(coverageResults, null, 4);
   console.log(data);
   // write coverageResults string to file
-  const outputFile = path.join(
-    __dirname,
-    '../qa-standards-dashboard-data/coverage/test-coverage-report.json',
-  );
+  // const outputFile = path.join(
+  //   __dirname,
+  //   '../qa-standards-dashboard-data/coverage/test-coverage-report.json',
+  // );
+  const outputFile = 'coverage-report.json';
   fs.writeFile(outputFile, data, err => {
     if (err) {
       throw err;

diff --git a/script/github-actions/merge-unit-test-coverage.js b/script/github-actions/merge-unit-test-coverage.js
@@ -3,69 +3,31 @@
 
 const fs = require('fs');
 
-const coverageResultsFiles = process.argv.slice(2);
-
-const mergeResults = files => {
-  const mergedResults = {
-    total: {
-      lines: { total: 0, covered: 0, skipped: 0 },
-      statements: { total: 0, covered: 0, skipped: 0 },
-      functions: { total: 0, covered: 0, skipped: 0 },
-      branches: { total: 0, covered: 0, skipped: 0 },
-    },
-  };
-
-  files.forEach(file => {
-    const data = JSON.parse(fs.readFileSync(file, 'utf8'));
-
-    Object.entries(data).forEach(([filePath, coverageData]) => {
-      const match = filePath.match(/applications\/(?:[^/]+\/[^/]+|[^/]+)\//);
-
-      if (!match) {
-        return;
-      }
-
-      const directoryKey = match[0];
-
-      if (!mergedResults[directoryKey]) {
-        mergedResults[directoryKey] = {
-          lines: { total: 0, covered: 0, skipped: 0 },
-          statements: { total: 0, covered: 0, skipped: 0 },
-          functions: { total: 0, covered: 0, skipped: 0 },
-          branches: { total: 0, covered: 0, skipped: 0 },
-        };
-      }
-
-      const directoryCoverage = mergedResults[directoryKey];
-      ['lines', 'statements', 'functions', 'branches'].forEach(key => {
-        directoryCoverage[key].total += coverageData[key].total;
-        directoryCoverage[key].covered += coverageData[key].covered;
-        directoryCoverage[key].skipped += coverageData[key].skipped;
-
-        mergedResults.total[key].total += coverageData[key].total;
-        mergedResults.total[key].covered += coverageData[key].covered;
-        mergedResults.total[key].skipped += coverageData[key].skipped;
+function mergeJsonFiles(fileNames, outputFile) {
+  const mergedData = {};
+
+  fileNames.forEach(file => {
+    try {
+      const fileData = fs.readFileSync(file, 'utf8');
+      const parsedData = JSON.parse(fileData);
+
+      Object.entries(parsedData).forEach(([key, value]) => {
+        if (mergedData[key]) {
+          console.warn(`Duplicate key detected: "${key}". Overwriting data.`);
+        }
+        mergedData[key] = value;
       });
-    });
+    } catch (err) {
+      console.error(`Error processing file: ${file} - ${err.message}`);
+    }
   });
 
-  Object.values(mergedResults).forEach(coverageData => {
-    ['lines', 'statements', 'functions', 'branches'].forEach(key => {
-      coverageData[key].pct = (
-        (coverageData[key].covered / coverageData[key].total) *
-        100
-      ).toFixed(2);
-    });
-  });
+  fs.writeFileSync(outputFile, JSON.stringify(mergedData, null, 2));
+  console.log(`Merged JSON written to: ${outputFile}`);
+}
 
-  return mergedResults;
-};
+const coverageResultsFiles = process.argv.slice(2);
 
-const results = mergeResults(coverageResultsFiles);
-fs.writeFileSync(
-  'merged-coverage-report.json',
-  JSON.stringify(results, null, 2),
-  'utf8',
-);
+const outputFileName = 'merged-coverage-report.json';
 
-console.log('Merged results saved to mergedResults.json');
+mergeJsonFiles(coverageResultsFiles, outputFileName);