@testomatio/reporter 2.3.4 → 2.3.5-beta-6-xml-import

package/README.md

@@ -13,7 +13,7 @@ Testomat.io Reporter (this npm package) supports:
 - 🔎 [Stack traces](./docs/stacktrace.md) and error messages
 - 🐙 [GitHub](./docs/pipes/github.md), [GitLab](./docs/pipes/gitlab.md) & [Bitbucket](./docs/pipes/bitbucket.md) integration
 - 🚅 Realtime reports
-- 🗃️ Other test frameworks supported via [JUNit XML](./docs/junit.md)
+- 🗃️ Other test frameworks supported via [JUnit XML](./docs/junit.md) with [XML import configuration](./docs/xml-imports.md)
 - 🚶‍♀️ Steps _(work in progress)_
 - 📄 [Logger](./docs/logger.md) _(work in progress, supports Jest for now)_
 - ☁️ Custom properties and metadata _(work in progress)_

package/lib/junit-adapter/csharp.d.ts

@@ -1,5 +1,4 @@
 export default CSharpAdapter;
 declare class CSharpAdapter extends Adapter {
-    getFilePath(t: any): string;
 }
 import Adapter from './adapter.js';

package/lib/junit-adapter/csharp.js

@@ -7,24 +7,53 @@ const path_1 = __importDefault(require("path"));
 const adapter_js_1 = __importDefault(require("./adapter.js"));
 class CSharpAdapter extends adapter_js_1.default {
     formatTest(t) {
-        const title = t.title.replace(/\(.*?\)/, '').trim();
-        const example = t.title.match(/\((.*?)\)/);
-        if (example)
-            t.example = { ...example[1].split(',') };
+        // Don't override example if it already exists from NUnit XML processing
+        // The xmlReader.js already extracts parameters correctly from <arguments>
+        if (!t.example) {
+            const title = t.title.replace(/\(.*?\)/, '').trim();
+            const exampleMatch = t.title.match(/\((.*?)\)/);
+            if (exampleMatch) {
+                // Keep as array for consistency with NUnit XML processing
+                t.example = exampleMatch[1].split(',').map(param => param.trim());
+            }
+            t.title = title.trim();
+        }
         const suite = t.suite_title.split('.');
         t.suite_title = suite.pop();
         t.file = namespaceToFileName(t.file);
-        t.title = title.trim();
         return t;
     }
     getFilePath(t) {
-        const fileName = namespaceToFileName(t.file);
+        if (!t.file)
+            return null;
+        // Normalize path separators for cross-platform compatibility
+        let filePath = t.file.replace(/\\/g, '/');
+        // If file already has .cs extension, use it directly
+        if (filePath.endsWith('.cs')) {
+            // Make relative path if it's absolute
+            if (path_1.default.isAbsolute(filePath)) {
+                // Try to find project-relative path
+                const cwd = process.cwd().replace(/\\/g, '/');
+                if (filePath.startsWith(cwd)) {
+                    filePath = path_1.default.relative(cwd, filePath).replace(/\\/g, '/');
+                }
+            }
+            return filePath;
+        }
+        // Convert namespace path to file path
+        const fileName = namespaceToFileName(filePath);
         return fileName;
     }
 }
 module.exports = CSharpAdapter;
 function namespaceToFileName(fileName) {
+    if (!fileName)
+        return '';
+    // If already a .cs file path, clean it up
+    if (fileName.endsWith('.cs')) {
+        return fileName.replace(/\\/g, '/');
+    }
     const fileParts = fileName.split('.');
     fileParts[fileParts.length - 1] = fileParts[fileParts.length - 1]?.replace(/\$.*/, '');
-    return `${fileParts.join(path_1.default.sep)}.cs`;
+    return `${fileParts.join('/')}.cs`;
 }

package/lib/pipe/debug.js

@@ -18,7 +18,7 @@ class DebugPipe {
         this.isEnabled = !!process.env.TESTOMATIO_DEBUG || !!process.env.DEBUG;
         if (this.isEnabled) {
             this.batch = {
-                isEnabled: this.params.isBatchEnabled ?? !process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ?? true,
+                isEnabled: this.params.isBatchEnabled ?? (process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ? false : true),
                 intervalFunction: null,
                 intervalTime: 5000,
                 tests: [],

package/lib/pipe/testomatio.js

@@ -23,7 +23,7 @@ if (process.env.TESTOMATIO_RUN)
 class TestomatioPipe {
     constructor(params, store) {
         this.batch = {
-            isEnabled: params?.isBatchEnabled ?? !process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ?? true,
+            isEnabled: params?.isBatchEnabled ?? (process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ? false : true),
             intervalFunction: null, // will be created in createRun by setInterval function
             intervalTime: 5000, // how often tests are sent
             tests: [], // array of tests in batch
@@ -60,7 +60,7 @@ class TestomatioPipe {
                 retry: constants_js_1.REPORTER_REQUEST_RETRIES.retriesPerRequest,
                 retryDelay: constants_js_1.REPORTER_REQUEST_RETRIES.retryTimeout,
                 httpMethodsToRetry: ['GET', 'PUT', 'HEAD', 'OPTIONS', 'DELETE', 'POST'],
-                shouldRetry: (error) => {
+                shouldRetry: error => {
                     if (!error.response)
                         return false;
                     switch (error.response?.status) {
@@ -73,8 +73,8 @@ class TestomatioPipe {
                             break;
                     }
                     return error.response?.status >= 401; // Retry on 401+ and 5xx
-                }
-            }
+                },
+            },
         });
         this.isEnabled = true;
         // do not finish this run (for parallel testing)
@@ -89,6 +89,28 @@ class TestomatioPipe {
             console.error(constants_js_1.APP_PREFIX, picocolors_1.default.red(`Error creating report on Testomat.io, report url '${this.url}' is invalid`));
         }
     }
+    /**
+     * Prepares data for sending to Testomat.io.
+     * @param {*} data - The data to be formatted.
+     * @returns
+     */
+    #formatData(data) {
+        data.api_key = this.apiKey;
+        data.create = this.createNewTests;
+        // add test ID + run ID
+        if (data.rid)
+            data.rid = `${this.runId}-${data.rid}`;
+        if (!process.env.TESTOMATIO_STACK_PASSED && data.status === constants_js_1.STATUS.PASSED) {
+            data.stack = null;
+        }
+        if (!process.env.TESTOMATIO_STEPS_PASSED && data.status === constants_js_1.STATUS.PASSED) {
+            data.steps = null;
+        }
+        if (process.env.TESTOMATIO_NO_STEPS) {
+            data.steps = null;
+        }
+        return data;
+    }
     /**
      * Asynchronously prepares and retrieves the Testomat.io test grepList based on the provided options.
      * @param {Object} opts - The options for preparing the test grepList.
@@ -171,7 +193,7 @@ class TestomatioPipe {
                 method: 'PUT',
                 url: `/api/reporter/${this.runId}`,
                 data: runParams,
-                responseType: 'json'
+                responseType: 'json',
             });
             if (resp.data.artifacts)
                 (0, pipe_utils_js_1.setS3Credentials)(resp.data.artifacts);
@@ -184,7 +206,7 @@ class TestomatioPipe {
                 url: '/api/reporter',
                 data: runParams,
                 maxContentLength: Infinity,
-                responseType: 'json'
+                responseType: 'json',
             });
             this.runId = resp.data.uid;
             this.runUrl = `${this.url}/${resp.data.url.split('/').splice(3).join('/')}`;
@@ -234,28 +256,20 @@ class TestomatioPipe {
             return;
         if (this.#cancelTestReportingInCaseOfTooManyReqFailures())
             return;
-        data.api_key = this.apiKey;
-        data.create = this.createNewTests;
-        if (!process.env.TESTOMATIO_STACK_PASSED && data.status === constants_js_1.STATUS.PASSED) {
-            data.stack = null;
-        }
-        if (!process.env.TESTOMATIO_STEPS_PASSED && data.status === constants_js_1.STATUS.PASSED) {
-            data.steps = null;
-        }
-        if (process.env.TESTOMATIO_NO_STEPS) {
-            data.steps = null;
-        }
+        this.#formatData(data);
         const json = json_cycle_1.default.stringify(data);
         debug('Adding test', json);
-        return this.client.request({
+        return this.client
+            .request({
             method: 'POST',
             url: `/api/reporter/${this.runId}/testrun`,
             data: json,
             headers: {
                 'Content-Type': 'application/json',
             },
-            maxContentLength: Infinity
-        }).catch(err => {
+            maxContentLength: Infinity,
+        })
+            .catch(err => {
             this.requestFailures++;
             this.notReportedTestsCount++;
             if (err.response) {
@@ -300,19 +314,21 @@ class TestomatioPipe {
         // get tests from batch and clear batch
         const testsToSend = this.batch.tests.splice(0);
         debug('📨 Batch upload', testsToSend.length, 'tests');
-        return this.client.request({
+        return this.client
+            .request({
             method: 'POST',
             url: `/api/reporter/${this.runId}/testrun`,
             data: {
                 api_key: this.apiKey,
                 tests: testsToSend,
-                batch_index: this.batch.batchIndex
+                batch_index: this.batch.batchIndex,
             },
             headers: {
                 'Content-Type': 'application/json',
             },
-            maxContentLength: Infinity
-        }).catch(err => {
+            maxContentLength: Infinity,
+        })
+            .catch(err => {
             this.requestFailures++;
             this.notReportedTestsCount += testsToSend.length;
             if (err.response) {
@@ -344,11 +360,7 @@ class TestomatioPipe {
             console.warn(constants_js_1.APP_PREFIX, picocolors_1.default.red('Run ID is not set, skipping test reporting'));
             return;
         }
-        // add test ID + run ID
-        if (data.rid)
-            data.rid = `${this.runId}-${data.rid}`;
-        data.api_key = this.apiKey;
-        data.create = this.createNewTests;
+        this.#formatData(data);
         let uploading = null;
         if (!this.batch.isEnabled)
             uploading = this.#uploadSingleTest(data);
@@ -400,7 +412,7 @@ class TestomatioPipe {
                         status_event,
                         detach: params.detach,
                         tests: params.tests,
-                    }
+                    },
                 });
                 console.log(constants_js_1.APP_PREFIX, '✅ Testrun finished');
                 if (this.runUrl) {

package/lib/utils/utils.js

@@ -173,6 +173,8 @@ exports.fetchSourceCodeFromStackTrace = fetchSourceCodeFromStackTrace;
 exports.TEST_ID_REGEX = /@T([\w\d]{8})/;
 exports.SUITE_ID_REGEX = /@S([\w\d]{8})/;
 const fetchIdFromCode = (code, opts = {}) => {
+    if (!code)
+        return null;
     const comments = code
         .split('\n')
         .map(l => l.trim())
@@ -215,10 +217,29 @@ const fetchSourceCode = (contents, opts = {}) => {
                 lineIndex = lines.findIndex(l => l.includes(`${title}(`));
         }
         else if (opts.lang === 'csharp') {
-            if (lineIndex === -1)
-                lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
-            if (lineIndex === -1)
+            // Enhanced C# method detection for NUnit tests
+            lineIndex = lines.findIndex(l => l.includes(`public void ${title}(`));
+            if (lineIndex === -1) {
+                lineIndex = lines.findIndex(l => l.includes(`public async Task ${title}(`));
+            }
+            if (lineIndex === -1) {
                 lineIndex = lines.findIndex(l => l.includes(`${title}(`));
+            }
+            // Look for TestCase or Test attributes above the method
+            if (lineIndex === -1) {
+                const testAttributeIndex = lines.findIndex((l, index) => {
+                    if (l.includes('[TestCase') || l.includes('[Test')) {
+                        // Check next few lines for the method
+                        const nextLines = lines.slice(index, Math.min(lines.length, index + 5));
+                        const hasMethod = nextLines.some(nextLine => nextLine.includes(`${title}(`));
+                        return hasMethod;
+                    }
+                    return false;
+                });
+                if (testAttributeIndex !== -1) {
+                    lineIndex = testAttributeIndex;
+                }
+            }
         }
         else {
             lineIndex = lines.findIndex(l => l.includes(title));
@@ -227,7 +248,7 @@ const fetchSourceCode = (contents, opts = {}) => {
     if (opts.prepend) {
         lineIndex -= opts.prepend;
     }
-    if (lineIndex) {
+    if (lineIndex !== -1 && lineIndex !== undefined) {
         const result = [];
         for (let i = lineIndex; i < lineIndex + limit; i++) {
             if (lines[i] === undefined)
@@ -270,6 +291,14 @@ const fetchSourceCode = (contents, opts = {}) => {
                     break;
                 if (opts.lang === 'java' && lines[i].includes(' class '))
                     break;
+                if (opts.lang === 'csharp' && lines[i].trim().match(/^\[Test/))
+                    break;
+                if (opts.lang === 'csharp' && lines[i].includes(' public void '))
+                    break;
+                if (opts.lang === 'csharp' && lines[i].includes(' public async Task '))
+                    break;
+                if (opts.lang === 'csharp' && lines[i].includes(' class ') && lines[i].includes('public'))
+                    break;
             }
             result.push(lines[i]);
         }

package/lib/xmlReader.d.ts

@@ -13,6 +13,8 @@ declare class XmlReader {
     runId: any;
     adapter: import("./junit-adapter/adapter.js").default;
     opts: {};
+    disableSourceCodeFetching: any;
+    suiteOrganization: any;
     store: {};
     pipesPromise: Promise<any[]>;
     parser: XMLParser;
@@ -77,6 +79,13 @@ declare class XmlReader {
         skipped_count: number;
         tests: any[];
     };
+    deduplicateTestsByFQN(tests: any): any[];
+    generateFQN(test: any): string;
+    generateNormalizedFQN(test: any): string;
+    extractAssemblyName(test: any): any;
+    extractNamespace(test: any): any;
+    extractClassName(test: any): any;
+    extractCsFileFromPath(test: any): any;
     calculateStats(): {};
     fetchSourceCode(): void;
     formatTests(): void;