@iamsergio/qttest-utils 0.4.6 → 0.4.7

package/out/example.js

@@ -30,6 +30,9 @@ function example() {
             process.exit(1);
         }
         let qt = new qttest_1.QtTests();
+        qt.setLogFunction((message) => {
+            console.log(message);
+        });
         // Gather all tests that would be executed by CTest:
         yield qt.discoverViaCMake(buildDirPath);
         // Filter-out the ones that don't link to QtTest (doctests and such)

package/out/qttest.d.ts

@@ -1,3 +1,4 @@
+type LoggerFunction = (arg: string) => void;
 /**
  * Represents a single QtTest executable.
  * Supports listing the individual test slots
@@ -61,6 +62,7 @@ export declare class QtTests {
     qtTestExecutables: QtTest[];
     discoverViaCMake(buildDirPath: string): Promise<void>;
     removeNonLinking(): Promise<void>;
+    setLogFunction(func: LoggerFunction): void;
     removeByRunningHelp(): Promise<void>;
     removeMatching(regex: RegExp): void;
     maintainMatching(regex: RegExp): void;
@@ -72,3 +74,4 @@ export interface TestFailure {
     filePath: string;
     lineNumber: number;
 }
+export {};

package/out/qttest.js

@@ -43,6 +43,12 @@ const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
 const cmake_1 = require("./cmake");
+var gLogFunction;
+function logMessage(message) {
+    if (gLogFunction) {
+        gLogFunction(message);
+    }
+}
 /**
  * Represents a single QtTest executable.
  * Supports listing the individual test slots
@@ -187,6 +193,7 @@ class QtTest {
             args = args.concat("-o").concat(this.txtOutputFileName(slot) + ",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 });
                 child.on("exit", (code) => __awaiter(this, void 0, void 0, function* () {
                     /// We can code even be null ?
@@ -234,7 +241,7 @@ class QtTest {
             var failures = yield new Promise((resolve, reject) => {
                 fs.readFile(tapFileName, "utf8", (error, data) => {
                     if (error) {
-                        console.log("Failed to read log file");
+                        logMessage("ERROR: Failed to read log file");
                         reject(error);
                     }
                     else {
@@ -261,7 +268,7 @@ class QtTest {
                     failedSlot.lastTestFailure = failure;
                 }
                 else {
-                    console.log("Failed to find slot with name " + failure.name);
+                    logMessage("ERROR: Failed to find slot with name " + failure.name);
                 }
             }
         });
@@ -310,7 +317,7 @@ class QtTests {
                 }
             }
             else {
-                console.error("Failed to retrieve ctests!");
+                logMessage("ERROR: Failed to retrieve ctests!");
             }
         });
     }
@@ -334,6 +341,9 @@ class QtTests {
             }
         });
     }
+    setLogFunction(func) {
+        gLogFunction = func;
+    }
     removeByRunningHelp() {
         return __awaiter(this, void 0, void 0, function* () {
             this.qtTestExecutables = this.qtTestExecutables.filter((ex) => __awaiter(this, void 0, void 0, function* () { return yield ex.isQtTestViaHelp(); }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamsergio/qttest-utils",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "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",

package/src/example.ts

@@ -23,6 +23,10 @@ async function example() {
 
     let qt = new QtTests();
 
+    qt.setLogFunction((message: string) => {
+        console.log(message);
+    });
+
     // Gather all tests that would be executed by CTest:
     await qt.discoverViaCMake(buildDirPath);
 

package/src/qttest.ts

@@ -7,6 +7,16 @@ import path from "path";
 import * as fs from 'fs';
 import { CMakeTests } from "./cmake";
 
+
+type LoggerFunction = (arg: string) => void;
+var gLogFunction: LoggerFunction | undefined;
+
+function logMessage(message: string) {
+    if (gLogFunction) {
+        gLogFunction(message);
+    }
+}
+
 /**
  * Represents a single QtTest executable.
  * Supports listing the individual test slots
@@ -170,6 +180,7 @@ export class QtTest {
 
         return await new Promise((resolve, reject) => {
             let cwdDir = cwd.length > 0 ? cwd : this.buildDirPath;
+            logMessage("Running " + this.filename + " " + args.join(" ") + " with cwd=" + cwdDir);
             const child = spawn(this.filename, args, { cwd: cwdDir });
 
             child.on("exit", async (code) => {
@@ -226,7 +237,7 @@ export class QtTest {
         var failures = await new Promise<TestFailure[]>((resolve, reject) => {
             fs.readFile(tapFileName, "utf8", (error, data) => {
                 if (error) {
-                    console.log("Failed to read log file");
+                    logMessage("ERROR: Failed to read log file");
                     reject(error);
                 } else {
                     // A fail line is something like:
@@ -255,7 +266,7 @@ export class QtTest {
             if (failedSlot) {
                 failedSlot.lastTestFailure = failure;
             } else {
-                console.log("Failed to find slot with name " + failure.name);
+                logMessage("ERROR: Failed to find slot with name " + failure.name);
             }
         }
     }
@@ -313,7 +324,7 @@ export class QtTests {
                 this.qtTestExecutables.push(qtest);
             }
         } else {
-            console.error("Failed to retrieve ctests!");
+            logMessage("ERROR: Failed to retrieve ctests!");
         }
     }
 
@@ -335,6 +346,10 @@ export class QtTests {
         }
     }
 
+    public setLogFunction(func: LoggerFunction) {
+        gLogFunction = func;
+    }
+
     public async removeByRunningHelp() {
         this.qtTestExecutables = this.qtTestExecutables.filter(async (ex) => await ex.isQtTestViaHelp());
     }