Fix coverage report for cics repo

Signed-off-by: Timothy Johnson <[email protected]>
zowe · Apr 4, 2024 · 7bd36a7 · 7bd36a7
1 parent a2f0971
commit 7bd36a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/coverage-config.yaml b/coverage-config.yaml
@@ -17,7 +17,7 @@ projects:
     unit-vsce:
       junit-artifact: main.yml/ubuntu-latest-20.x-results/vsce/__tests__/__results__/unit
     system:
-      test-count: npm-jest
+      test-count: npm-jest:packages/cli:packages/sdk
   "zowe/zowe-cli-db2-plugin":
     unit:
       junit-artifact: zowe-cli-plugin.yml/ubuntu-latest-20.x-results/unit

diff --git a/scripts/coverage-report.js b/scripts/coverage-report.js
@@ -103,14 +103,17 @@ async function checkLcovArtifact(repo, type, workflow, artifact, dirname) {
     return { lineCoverage, hitLines, foundLines, branchCoverage, hitBranches, foundBranches };
 };
 
-async function checkTestCount(repo, type, tools) {
+async function checkTestCount(repo, type, tools, ...subDirs) {
     const tempDir = await gitCloneDir(repo);
     await exec.exec("npm", ["install", "--ignore-scripts", "--silent"], { cwd: tempDir });
-    const output = await exec.getExecOutput("npm", ["run", `test:${type}`, "--", "--listTests"], { cwd: tempDir });
     let numTests = 0;
-    for (const testFile of output.stdout.trim().split("\n").filter(line => line.includes(tempDir))) {
-        const testContents = stripComments(fs.readFileSync(testFile, "utf-8"));
-        numTests += (testContents.match(/\bit\(/g) || []).length;
+    for (const subDir of (subDirs.length ? subDirs : [""])) {
+        const output = await exec.getExecOutput("npm", ["run", `test:${type}`, "--", "--listTests"],
+            { cwd: path.join(tempDir, subDir) });
+        for (const testFile of output.stdout.trim().split("\n").filter(line => line.includes(tempDir))) {
+            const testContents = stripComments(fs.readFileSync(testFile, "utf-8"));
+            numTests += (testContents.match(/\bit\(/g) || []).length;
+        }
     }
     return { numTests };
 };
@@ -132,7 +135,7 @@ async function checkTestCount(repo, type, tools) {
                         covData = { ...covData, ...await checkLcovArtifact(repoName, testType, ...splitAndAppend(covConfig, "/", 3)) };
                         break;
                     case "test-count":
-                        covData = { ...covData, ...await checkTestCount(repoName, testType, covConfig) };
+                        covData = { ...covData, ...await checkTestCount(repoName, testType, ...covConfig.split(":")) };
                         break;
                     default:
                         throw new Error("Unsupported coverage type " + covType);