@sasjs/cli 3.2.0 → 3.3.0

package/build/commands/testing/internal/saveOutput.d.ts

@@ -6,3 +6,4 @@ export declare const saveResultCsv: (outDirectory: string, result: TestResults,
     csvPath: string;
 }>;
 export declare const saveResultXml: (outDirectory: string, result: TestResults) => Promise<string>;
+export declare const saveCoverageLcov: (outDirectory: string, tests: string[]) => Promise<string>;

package/build/commands/testing/internal/saveOutput.js

@@ -60,7 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveResultXml = exports.saveResultCsv = exports.saveResultJson = exports.saveLog = void 0;
+exports.saveCoverageLcov = exports.saveResultXml = exports.saveResultCsv = exports.saveResultJson = exports.saveLog = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var file_1 = require("../../../utils/file");
@@ -262,3 +262,43 @@ var saveResultXml = function (outDirectory, result) { return __awaiter(void 0, v
     });
 }); };
 exports.saveResultXml = saveResultXml;
+var saveCoverageLcov = function (outDirectory, tests) { return __awaiter(void 0, void 0, void 0, function () {
+    var testsPrefixRegExp, coverageReport, coveringFile, filePath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                testsPrefixRegExp = new RegExp("^tests/");
+                coverageReport = [];
+                coveringFile = function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, utils_1.fileExists(path_1.default.join(process.sasjsConstants.buildDestinationFolder, filePath))];
+                            case 1: return [2 /*return*/, (_a.sent())
+                                    ? filePath
+                                    : 'standalone'];
+                        }
+                    });
+                }); };
+                return [4 /*yield*/, utils_1.asyncForEach(tests, function (test) { return __awaiter(void 0, void 0, void 0, function () {
+                        var _a, _b, _c;
+                        return __generator(this, function (_d) {
+                            switch (_d.label) {
+                                case 0:
+                                    _b = (_a = coverageReport).push;
+                                    _c = "TN:" + test.split('/').pop() + "\nSF:";
+                                    return [4 /*yield*/, coveringFile(test.replace(testsPrefixRegExp, '').replace(utils_1.testFileRegExp, '.sas'))];
+                                case 1: return [2 /*return*/, _b.apply(_a, [_c + (_d.sent()) + "\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record"])];
+                            }
+                        });
+                    }); })];
+            case 1:
+                _a.sent();
+                filePath = path_1.default.join(outDirectory, 'coverage.lcov');
+                return [4 /*yield*/, utils_1.createFile(filePath, coverageReport.join('\n'))];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, filePath];
+        }
+    });
+}); };
+exports.saveCoverageLcov = saveCoverageLcov;

package/build/commands/testing/spec/testing.spec.server.js

@@ -99,7 +99,7 @@ describe('sasjs test', function () {
         });
     }); });
     it('should execute tests and create result CSV, XML and JSON files using default source and output locations', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var expectedResultsJson, expectedResultsCsv, resultsFolderPath, resultsJsonPath, resultsJson, resultsCsvPath, parsedResults, resultsCsv, resultsXmlPath, resultsXml, expectedResultsXml;
+        var expectedResultsJson, expectedResultsCsv, resultsFolderPath, resultsJsonPath, resultsJson, resultsCsvPath, parsedResults, resultsCsv, resultsXmlPath, resultsXml, expectedResultsXml, coverageLcovPath, expectedCoverageLcov, coverageLcov;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -232,6 +232,15 @@ describe('sasjs test', function () {
                     resultsXml = resultsXml.replace(/testsuites id="[^ ]*"/gm, "testsuites id=\"\"");
                     resultsXml = resultsXml.replace(/testcase id="[^ ]*"/gm, "testcase id=\"\"");
                     expect(resultsXml).toEqual(expectedResultsXml);
+                    coverageLcovPath = path_1.default.join(resultsFolderPath, 'coverage.lcov');
+                    return [4 /*yield*/, expect(utils_1.fileExists(coverageLcovPath)).resolves.toEqual(true)];
+                case 9:
+                    _a.sent();
+                    expectedCoverageLcov = "TN:testsetup.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:exampleprogram.test.sas\nSF:jobs/jobs/exampleprogram.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:standalone.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:examplemacro.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:shouldFail.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:dostuff.test.0.sas\nSF:services/admin/dostuff.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:dostuff.test.1.sas\nSF:services/admin/dostuff.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:testteardown.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record";
+                    return [4 /*yield*/, utils_1.readFile(coverageLcovPath)];
+                case 10:
+                    coverageLcov = _a.sent();
+                    expect(coverageLcov).toEqual(expectedCoverageLcov);
                     return [2 /*return*/];
             }
         });

package/build/commands/testing/test.js

@@ -86,7 +86,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
     var _a, _b;
     if (testRegExps === void 0) { testRegExps = []; }
     return __awaiter(this, void 0, void 0, function () {
-        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, sas9CredentialsError, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _c, csvData, csvPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
+        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, sas9CredentialsError, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _c, csvData, csvPath, coverageReportPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
         var _this = this;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -328,6 +328,9 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     return [4 /*yield*/, saveOutput_1.saveResultCsv(outDirectory, result)];
                 case 7:
                     _c = _d.sent(), csvData = _c.csvData, csvPath = _c.csvPath;
+                    return [4 /*yield*/, saveOutput_1.saveCoverageLcov(outDirectory, flow)];
+                case 8:
+                    coverageReportPath = _d.sent();
                     resultTable = {};
                     if (Array.isArray(csvData)) {
                         csvData.forEach(function (item) {
@@ -353,6 +356,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     testsWithResultsCount = Object.values(resultTable).filter(function (res) { return res.test_suite_result !== types_1.TestResultStatus.notProvided; }).length;
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Tests provided results: " + (testsWithResultsCount + '/' + testsCount) + " (" + chalk_1.default.greenBright(Math.round((testsWithResultsCount / testsCount) * 100 || 0) + '%') + ")\n  Tests that pass: " + (passedTestsCount + '/' + testsWithResultsCount) + " (" + chalk_1.default.greenBright(Math.round((passedTestsCount / testsWithResultsCount) * 100 || 0) + '%') + ")\n  ");
                     displayResult_1.displaySuccess("Tests execution finished. The results are stored at:\n  " + jsonPath + "\n  " + csvPath + "\n  " + xmlPath);
+                    displayResult_1.displaySuccess("Tests coverage report:\n  " + coverageReportPath);
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -97,5 +97,5 @@
     "typescript": "4.3.5",
     "util": "0.12.4"
   },
-  "version": "3.2.0"
+  "version": "3.3.0"
 }