@iamsergio/qttest-utils 1.2.0 → 1.4.0

package/CONTRIBUTING.md

@@ -27,7 +27,7 @@ cargo install git-cliff
 
 (Replace 1.0.0 with actual version used)
 
-export NEW_VERSION=v1.2.0
+export NEW_VERSION=v1.0.0
 - Make sure Github Actions CI is green
 - Optional: To get a version compatible with semver, run `git cliff --bump`
 - Increase version in package.json and package-lock.json.

package/Changelog

@@ -2,6 +2,34 @@
 
 
 
+## [1.4.0] - 2024-04-24
+
+### 🚀 Features
+
+- Allow the caller to pass a output callback
+
+### 🐛 Bug Fixes
+
+- When running a qttest, output to stdout
+
+## [1.3.0] - 2024-04-23
+
+### 🚀 Features
+
+- Add cppFilesForExecutable(executable, codemodel)
+
+### 🧪 Testing
+
+- Add an example cmake code model
+- Normalize paths
+- Simplify some code
+- Fix replacing slashes
+
+### ⚙️ Miscellaneous Tasks
+
+- Add more logging
+- Bump version
+
 ## [1.2.0] - 2024-04-22
 
 ### 🚀 Features
@@ -13,6 +41,14 @@
 - Minor CONTRIBUTIND.md improvement
 - Minor CONTRIBUTIND.md improvement
 
+### 🧪 Testing
+
+- Fix test on windows
+
+### ⚙️ Miscellaneous Tasks
+
+- Bump version
+
 ## [1.1.2] - 2024-04-07
 
 ### ⚙️ Miscellaneous Tasks

package/out/cmake.d.ts

@@ -13,6 +13,7 @@ export declare class CMakeTests {
      */
     tests(): Promise<CMakeTest[] | undefined>;
     private ctestJsonToList;
+    cppFilesForExecutable(executable: string, codemodel: any): string[];
 }
 export declare class CMakeTest {
     command: string[];

package/out/cmake.js

@@ -72,6 +72,60 @@ class CMakeTests {
         });
         return tests;
     }
+    // Returns the list of .cpp files for the specified executable
+    // codemodel is the CMake codemodel JSON object
+    cppFilesForExecutable(executable, codemodel) {
+        // simplify:
+        if (executable.endsWith(".exe")) {
+            executable = executable.substring(0, executable.length - 4);
+        }
+        let projects = codemodel["projects"];
+        if (!projects) {
+            return [];
+        }
+        for (let project of projects) {
+            let targets = project["targets"];
+            if (!targets) {
+                continue;
+            }
+            for (let target of targets) {
+                let sourceDir = target["sourceDirectory"];
+                let artifacts = target["artifacts"];
+                if (!artifacts || !sourceDir) {
+                    continue;
+                }
+                for (let artifact of artifacts) {
+                    if (artifact.endsWith(".exe")) {
+                        artifact = artifact.substring(0, artifact.length - 4);
+                    }
+                    if (artifact == executable) {
+                        let fileGroups = target["fileGroups"];
+                        if (!fileGroups) {
+                            continue;
+                        }
+                        for (let fileGroup of fileGroups) {
+                            if (fileGroup["language"] != "CXX" || fileGroup["isGenerated"]) {
+                                continue;
+                            }
+                            let sources = fileGroup["sources"];
+                            if (!sources) {
+                                continue;
+                            }
+                            let cppFiles = [];
+                            for (let source of sources) {
+                                if (!source.endsWith("mocs_compilation.cpp")) {
+                                    cppFiles.push(path_1.default.join(sourceDir, source));
+                                }
+                            }
+                            return cppFiles;
+                        }
+                    }
+                }
+            }
+        }
+        (0, qttest_1.logMessage)("cppFilesForExecutable: Could not find cpp files for executable " + executable);
+        return [];
+    }
 }
 exports.CMakeTests = CMakeTests;
 /// Represents an inividual CTest test

package/out/qttest.d.ts

@@ -30,7 +30,7 @@ export declare class QtTest {
     linksToQtTestLib(): Promise<boolean> | undefined;
     isQtTestViaHelp(): Promise<boolean | undefined>;
     slotByName(name: string): QtTestSlot | undefined;
-    runTest(slot?: QtTestSlot, cwd?: string): Promise<boolean>;
+    runTest(slot?: QtTestSlot, cwd?: string, outputFunc?: LoggerFunction | undefined): Promise<boolean>;
     tapOutputFileName(slot?: QtTestSlot): string;
     txtOutputFileName(slot?: QtTestSlot): string;
     command(): {

package/out/qttest.js

@@ -201,7 +201,7 @@ class QtTest {
         return undefined;
     }
     /// Runs this test
-    runTest(slot, cwd = "") {
+    runTest(slot, cwd = "", outputFunc = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
             let args = [];
             if (slot) {
@@ -211,15 +211,25 @@ class QtTest {
             else {
                 this.clearSubTestStates();
             }
-            // log to file
+            // log to file and to stdout
             args = args.concat("-o").concat(this.tapOutputFileName(slot) + ",tap");
             args = args.concat("-o").concat(this.txtOutputFileName(slot) + ",txt");
+            args = args.concat("-o").concat("-,txt");
             return yield new Promise((resolve, reject) => {
                 let cwdDir = cwd.length > 0 ? cwd : this.buildDirPath;
                 logMessage("Running " + this.filename + " " + args.join(" ") + " with cwd=" + cwdDir);
                 const child = (0, child_process_1.spawn)(this.filename, args, { cwd: cwdDir });
+                if (outputFunc) {
+                    // Callers wants the process output:
+                    child.stdout.on("data", (chunk) => {
+                        outputFunc(chunk.toString());
+                    });
+                    child.stderr.on("data", (chunk) => {
+                        outputFunc(chunk.toString());
+                    });
+                }
                 child.on("exit", (code) => __awaiter(this, void 0, void 0, function* () {
-                    /// We can code even be null ?
+                    /// Can code even be null ?
                     if (code == undefined)
                         code = -1;
                     if (!slot) {

package/out/test.js

@@ -12,6 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cmake_1 = require("./cmake");
 const qttest_1 = require("./qttest");
 // Be sure to build the Qt tests with CMake first
 // See .github/workflows/ci.yml
@@ -109,4 +110,24 @@ function runTests(buildDirPath) {
         }
     });
 }
+function runCodeModelTests(codeModelFile) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const fs = require('fs');
+        let codemodelStr = fs.readFileSync(codeModelFile, 'utf8');
+        let codemodelJson = JSON.parse(codemodelStr);
+        let cmake = new cmake_1.CMakeTests("random");
+        let files = cmake.cppFilesForExecutable("/vscode-qttest/test/qt_test/build-dev/test1", codemodelJson);
+        if (files.length != 1) {
+            console.error("Expected 1 file, got " + files.length);
+            process.exit(1);
+        }
+        let expected = "/vscode-qttest/test/qt_test/test1.cpp";
+        let got = files[0].replace(/\\/g, "/");
+        if (got != expected) {
+            console.error("Expected " + expected + ", got " + got);
+            process.exit(1);
+        }
+    });
+}
 runTests("test/qt_test/build-dev/");
+runCodeModelTests("test/test_cmake_codemodel.json");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamsergio/qttest-utils",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "API for listing QtTest executables from a build directory and which individual test slots each executable contains. Useful for a Text Explorer VSCode extension.",
   "repository": {
     "type": "git",