@testomatio/reporter 2.3.7-beta.2-xml-import → 2.3.7-beta.4-stack-artifacts

package/lib/uploader.js

@@ -170,10 +170,6 @@ class S3Uploader {
         if (typeof filePath === 'string' && !path_1.default.isAbsolute(filePath)) {
             filePath = path_1.default.join(process.cwd(), filePath);
         }
-        // Normalize path separators for cross-platform compatibility
-        if (typeof filePath === 'string') {
-            filePath = filePath.replace(/\\/g, '/');
-        }
         const data = { rid, file: filePath, uploaded };
         const jsonLine = `${JSON.stringify(data)}\n`;
         fs_1.default.appendFileSync(tempFilePath, jsonLine);

package/lib/utils/utils.js

@@ -122,8 +122,12 @@ const fetchFilesFromStackTrace = (stack = '', checkExists = true) => {
         .map(f => f[1].trim())
         .map(f => f.replace(/^\/+/, '/').replace(/^\/([A-Za-z]:)/, '$1')) // Remove extra slashes, handle Windows paths
         .map(f => {
-        // Normalize path separators for cross-platform compatibility
-        return f.replace(/\\/g, '/');
+        // Convert Windows paths to Linux paths for testing purposes
+        if (f.match(/^[A-Za-z]:[\\\/]/)) {
+            // Convert Windows path to Linux equivalent for test scenarios
+            return f.replace(/^[A-Za-z]:[\\\/]/, '/').replace(/\\/g, '/');
+        }
+        return f;
     });
     debug('Found files in stack trace: ', files);
     return files.filter(f => {
@@ -170,8 +174,6 @@ 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())
@@ -214,58 +216,10 @@ const fetchSourceCode = (contents, opts = {}) => {
                 lineIndex = lines.findIndex(l => l.includes(`${title}(`));
         }
         else if (opts.lang === 'csharp') {
-            // Find the method declaration line
-            let methodLineIndex = lines.findIndex(l => l.includes(`public void ${title}(`));
-            if (methodLineIndex === -1) {
-                methodLineIndex = lines.findIndex(l => l.includes(`public async Task ${title}(`));
-            }
-            if (methodLineIndex === -1) {
-                methodLineIndex = lines.findIndex(l => l.includes(`${title}(`));
-            }
-            // If found, scan upwards to find [TestCase], [Test] attributes and XML comments
-            if (methodLineIndex !== -1) {
-                lineIndex = methodLineIndex;
-                // Scan upwards to find the start of attributes and comments
-                for (let i = methodLineIndex - 1; i >= 0; i--) {
-                    const trimmedLine = lines[i].trim();
-                    // Include [TestCase], [Test], and other attributes
-                    if (trimmedLine.startsWith('[')) {
-                        lineIndex = i;
-                        continue;
-                    }
-                    // Include XML documentation comments
-                    if (trimmedLine.startsWith('///')) {
-                        lineIndex = i;
-                        continue;
-                    }
-                    // Stop at empty lines (with some tolerance)
-                    if (trimmedLine === '') {
-                        // Check if next non-empty line is an attribute or comment
-                        let hasMoreAttributes = false;
-                        for (let j = i - 1; j >= 0; j--) {
-                            const nextTrimmed = lines[j].trim();
-                            if (nextTrimmed === '')
-                                continue;
-                            if (nextTrimmed.startsWith('[') || nextTrimmed.startsWith('///')) {
-                                hasMoreAttributes = true;
-                                lineIndex = j;
-                            }
-                            break;
-                        }
-                        if (!hasMoreAttributes)
-                            break;
-                        continue;
-                    }
-                    // Stop at other method declarations or class-level elements
-                    if (trimmedLine.includes('public ') ||
-                        trimmedLine.includes('private ') ||
-                        trimmedLine.includes('protected ') ||
-                        trimmedLine.includes('internal ')) {
-                        if (!trimmedLine.startsWith('['))
-                            break;
-                    }
-                }
-            }
+            if (lineIndex === -1)
+                lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
+            if (lineIndex === -1)
+                lineIndex = lines.findIndex(l => l.includes(`${title}(`));
         }
         else {
             lineIndex = lines.findIndex(l => l.includes(title));
@@ -274,28 +228,11 @@ const fetchSourceCode = (contents, opts = {}) => {
     if (opts.prepend) {
         lineIndex -= opts.prepend;
     }
-    if (lineIndex !== -1 && lineIndex !== undefined) {
+    if (lineIndex) {
         const result = [];
-        let braceDepth = 0; // Track brace depth for C# methods
-        let methodStartFound = false; // Flag to indicate we've found the method opening brace
         for (let i = lineIndex; i < lineIndex + limit; i++) {
             if (lines[i] === undefined)
                 continue;
-            // Track brace depth for C# to stop after method closes
-            if (opts.lang === 'csharp') {
-                const line = lines[i];
-                // Count opening and closing braces
-                const openBraces = (line.match(/\{/g) || []).length;
-                const closeBraces = (line.match(/\}/g) || []).length;
-                if (openBraces > 0)
-                    methodStartFound = true;
-                braceDepth += openBraces - closeBraces;
-                // If we've started the method and depth returns to 0, method is complete
-                if (methodStartFound && braceDepth === 0 && closeBraces > 0) {
-                    result.push(lines[i]);
-                    break;
-                }
-            }
             if (i > lineIndex + 2 && !opts.prepend) {
                 // annotation
                 if (opts.lang === 'php' && lines[i].trim().startsWith('#['))
@@ -334,22 +271,6 @@ const fetchSourceCode = (contents, opts = {}) => {
                     break;
                 if (opts.lang === 'java' && lines[i].includes(' class '))
                     break;
-                // For C#, additional checks if brace tracking didn't stop us
-                if (opts.lang === 'csharp') {
-                    const trimmed = lines[i].trim();
-                    // Stop at attribute that marks beginning of next test
-                    if (trimmed.match(/^\[(Test|TestCase|Theory|Fact)/))
-                        break;
-                    // Stop at XML documentation comments that belong to next method
-                    if (trimmed.startsWith('///'))
-                        break;
-                    // Stop at another method declaration
-                    if (trimmed.match(/^\s*(public|private|protected|internal)\s+(\w+|async\s+\w+)\s+\w+\s*\(/))
-                        break;
-                    // Stop at class declaration
-                    if (trimmed.includes(' class ') && trimmed.includes('public'))
-                        break;
-                }
             }
             result.push(lines[i]);
         }

package/lib/xmlReader.d.ts

@@ -19,11 +19,25 @@ declare class XmlReader {
     tests: any[];
     stats: {};
     uploader: S3Uploader;
-    enhancedNunit: boolean;
-    groupParameterized: boolean;
     version: any;
     connectAdapter(): import("./junit-adapter/adapter.js").default;
-    parse(fileName: any): any;
+    parse(fileName: any): {
+        status: string;
+        create_tests: boolean;
+        tests_count: number;
+        passed_count: number;
+        skipped_count: number;
+        failed_count: number;
+        tests: any;
+    } | {
+        status: any;
+        create_tests: boolean;
+        tests_count: number;
+        passed_count: number;
+        failed_count: number;
+        skipped_count: number;
+        tests: any[];
+    };
     processJUnit(jsonSuite: any): {
         create_tests: boolean;
         duration: number;
@@ -35,14 +49,15 @@ declare class XmlReader {
         tests: any[];
         tests_count: number;
     };
-    processNUnit(jsonSuite: any): any;
-    /**
-     * Check if the XML is actually NUnit format (has test-suite hierarchy)
-     * @param {Object} jsonSuite - Parsed XML suite object
-     * @returns {boolean} - True if this is NUnit XML format
-     */
-    isNUnitXml(jsonSuite: any): boolean;
-    processNUnitEnhanced(jsonSuite: any): any;
+    processNUnit(jsonSuite: any): {
+        status: any;
+        create_tests: boolean;
+        tests_count: number;
+        passed_count: number;
+        failed_count: number;
+        skipped_count: number;
+        tests: any[];
+    };
     processTRX(jsonSuite: any): {
         status: string;
         create_tests: boolean;
@@ -52,27 +67,6 @@ declare class XmlReader {
         failed_count: number;
         tests: any;
     };
-    _parseTRXTestDefinition(td: any): {
-        title: any;
-        example: any;
-        file: string;
-        description: any;
-        suite_title: any;
-        id: any;
-    };
-    _parseTRXTestResult(td: any, tests: any): {
-        suite_title: any;
-        title: any;
-        file: any;
-        description: any;
-        code: any;
-        run_time: number;
-        stack: any;
-        files: any;
-        create: boolean;
-        overwrite: boolean;
-    };
-    _mapTRXStatus(outcome: any): string;
     processXUnit(assemblies: any): {
         status: string;
         create_tests: boolean;

package/lib/xmlReader.js

@@ -11,7 +11,6 @@ const fast_xml_parser_1 = require("fast-xml-parser");
 const constants_js_1 = require("./constants.js");
 const crypto_1 = require("crypto");
 const url_1 = require("url");
-const nunit_parser_js_1 = require("./junit-adapter/nunit-parser.js");
 const utils_js_1 = require("./utils/utils.js");
 const index_js_1 = require("./pipe/index.js");
 const index_js_2 = __importDefault(require("./junit-adapter/index.js"));
@@ -55,9 +54,6 @@ class XmlReader {
         this.stats = {};
         this.stats.language = opts.lang?.toLowerCase();
         this.uploader = new uploader_js_1.S3Uploader();
-        // Enhanced NUnit parsing - enabled by default for NUnit XML
-        this.enhancedNunit = opts.enhancedNunit !== false; // Default true, can be disabled
-        this.groupParameterized = opts.groupParameterized !== false; // Default true, can be disabled
         // @ts-ignore
         const packageJsonPath = path_1.default.resolve(__dirname, '..', 'package.json');
         this.version = JSON.parse(fs_1.default.readFileSync(packageJsonPath).toString()).version;
@@ -106,8 +102,7 @@ class XmlReader {
         return this.processJUnit(jsonSuite);
     }
     processJUnit(jsonSuite) {
-        const { testsuite, name, failures, errors } = jsonSuite;
-        const tests = testsuite?.tests || jsonSuite.tests;
+        const { testsuite, name, tests, failures, errors } = jsonSuite;
         reduceOptions.preferClassname = this.stats.language === 'python';
         const resultTests = processTestSuite(testsuite);
         const hasFailures = resultTests.filter(t => t.status === 'failed').length > 0;
@@ -133,13 +128,6 @@ class XmlReader {
         };
     }
     processNUnit(jsonSuite) {
-        // Use enhanced NUnit parser if enabled and this is actually NUnit XML
-        if (this.enhancedNunit && this.isNUnitXml(jsonSuite)) {
-            debug('Using enhanced NUnit parser');
-            return this.processNUnitEnhanced(jsonSuite);
-        }
-        // Fallback to legacy parser for backward compatibility
-        debug('Using legacy NUnit parser');
         const { result, total, passed, failed, inconclusive, skipped } = jsonSuite;
         reduceOptions.preferClassname = this.stats.language === 'python';
         const resultTests = processTestSuite(jsonSuite['test-suite']);
@@ -154,58 +142,65 @@ class XmlReader {
             tests: resultTests,
         };
     }
-    /**
-     * Check if the XML is actually NUnit format (has test-suite hierarchy)
-     * @param {Object} jsonSuite - Parsed XML suite object
-     * @returns {boolean} - True if this is NUnit XML format
-     */
-    isNUnitXml(jsonSuite) {
-        // NUnit XML has test-suite elements with type attributes
-        if (jsonSuite['test-suite']) {
-            const testSuite = Array.isArray(jsonSuite['test-suite']) ? jsonSuite['test-suite'][0] : jsonSuite['test-suite'];
-            // Check for NUnit-specific test-suite types
-            return (testSuite &&
-                testSuite.type &&
-                ['Assembly', 'TestSuite', 'TestFixture', 'ParameterizedMethod'].includes(testSuite.type));
-        }
-        return false;
-    }
-    processNUnitEnhanced(jsonSuite) {
-        debug('Processing NUnit XML with enhanced parser');
-        try {
-            const nunitParser = new nunit_parser_js_1.NUnitXmlParser({
-                groupParameterized: this.groupParameterized,
-                ...this.opts,
-            });
-            const result = nunitParser.parseTestRun(jsonSuite);
-            // Add parsed tests to our collection
-            this.tests = this.tests.concat(result.tests);
-            debug(`Enhanced NUnit parser processed ${result.tests.length} tests`);
-            return result;
-        }
-        catch (error) {
-            debug('Enhanced NUnit parser failed, falling back to legacy parser:', error.message);
-            console.warn(`${constants_js_1.APP_PREFIX} Enhanced NUnit parsing failed, using legacy parser: ${error.message}`);
-            // Fallback to legacy parser
-            this.enhancedNunit = false;
-            return this.processNUnit(jsonSuite);
-        }
-    }
     processTRX(jsonSuite) {
         let defs = jsonSuite?.TestRun?.TestDefinitions?.UnitTest;
         if (!Array.isArray(defs))
             defs = [defs].filter(d => !!d);
-        // Parse test definitions
-        const tests = defs.map(td => this._parseTRXTestDefinition(td));
-        // Parse test results
+        const tests = defs.map(td => {
+            const title = td.name.replace(/\(.*?\)/, '').trim();
+            let example = td.name.match(/\((.*?)\)/);
+            if (example)
+                example = { ...example[1].split(',') };
+            const suite = td.TestMethod.className.split(', ')[0].split('.');
+            const suite_title = suite.pop();
+            return {
+                title,
+                example,
+                file: suite.join('/'),
+                description: td.Description,
+                suite_title,
+                id: td.Execution.id,
+            };
+        }) || [];
         let result = jsonSuite?.TestRun?.Results?.UnitTestResult;
         if (!Array.isArray(result))
             result = [result].filter(d => !!d);
-        const results = result.map(td => this._parseTRXTestResult(td, tests));
+        const results = result.map(td => ({
+            id: td.executionId,
+            // seconds are used in junit reports, but ms are used by testomatio
+            run_time: parseFloat(td.duration) * 1000,
+            status: td.outcome,
+            stack: td.Output.StdOut,
+            files: td?.ResultFiles?.ResultFile?.map(rf => rf.path),
+        }));
+        results.forEach(r => {
+            const test = tests.find(t => t.id === r.id) || {};
+            r.suite_title = test.suite_title;
+            r.title = test.title?.trim();
+            if (test.code)
+                r.code = test.code;
+            if (test.description)
+                r.description = test.description;
+            if (test.example)
+                r.example = test.example;
+            if (test.file)
+                r.file = test.file;
+            r.create = true;
+            r.overwrite = true;
+            if (r.status === 'Passed')
+                r.status = constants_js_1.STATUS.PASSED;
+            if (r.status === 'Failed')
+                r.status = constants_js_1.STATUS.FAILED;
+            if (r.status === 'Skipped')
+                r.status = constants_js_1.STATUS.SKIPPED;
+            delete r.id;
+        });
         debug(results);
         const counters = jsonSuite?.TestRun?.ResultSummary?.Counters || {};
         const failed_count = parseInt(counters.failed, 10) + parseInt(counters.error, 10);
-        const status = failed_count > 0 ? constants_js_1.STATUS.FAILED : constants_js_1.STATUS.PASSED.toString();
+        let status = constants_js_1.STATUS.PASSED.toString();
+        if (failed_count > 0)
+            status = constants_js_1.STATUS.FAILED;
         this.tests = results.filter(t => !!t.title);
         return {
             status,
@@ -217,57 +212,6 @@ class XmlReader {
             tests: results,
         };
     }
-    _parseTRXTestDefinition(td) {
-        const title = td.name.replace(/\(.*?\)/, '').trim();
-        const exampleMatch = td.name.match(/\((.*?)\)/);
-        const example = exampleMatch ? { ...exampleMatch[1].split(',') } : null;
-        const suite = td.TestMethod.className.split(', ')[0].split('.');
-        const suite_title = suite.pop();
-        // Convert namespace to file path for C#
-        const file = `${suite.join('/')}.cs`;
-        return {
-            title, // Base name without parameters for test import
-            example, // Parameters object for parameterized tests
-            file, // File path with .cs extension
-            description: td.Description,
-            suite_title,
-            id: td.Execution.id,
-        };
-    }
-    _parseTRXTestResult(td, tests) {
-        const test = tests.find(t => t.id === td.executionId) || {};
-        const result = {
-            suite_title: test.suite_title,
-            title: test.title?.trim(),
-            file: test.file,
-            description: test.description,
-            code: test.code,
-            run_time: parseFloat(td.duration) * 1000,
-            stack: td.Output?.StdOut || '',
-            files: td?.ResultFiles?.ResultFile?.map(rf => rf.path),
-            create: true,
-            overwrite: true,
-        };
-        // Add example for parameterized tests
-        if (test.example) {
-            result.example = test.example;
-        }
-        // Map TRX status to Testomat.io status
-        result.status = this._mapTRXStatus(td.outcome);
-        return result;
-    }
-    _mapTRXStatus(outcome) {
-        switch (outcome) {
-            case 'Passed':
-                return constants_js_1.STATUS.PASSED;
-            case 'Failed':
-                return constants_js_1.STATUS.FAILED;
-            case 'Skipped':
-                return constants_js_1.STATUS.SKIPPED;
-            default:
-                return constants_js_1.STATUS.PASSED;
-        }
-    }
     processXUnit(assemblies) {
         const tests = [];
         assemblies = Array.isArray(assemblies.assembly) ? assemblies.assembly : [assemblies.assembly];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.3.7-beta.2-xml-import",
+  "version": "2.3.7-beta.4-stack-artifacts",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"

package/src/bin/cli.js

@@ -158,7 +158,7 @@ program
   .option('--lang <lang>', 'Language used (python, ruby, java)')
   .option('--timelimit <time>', 'default time limit in seconds to kill a stuck process')
   .action(async (pattern, opts) => {
-    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
+    if (!pattern.endsWith('.xml')) {
       pattern += '.xml';
     }
     let { javaTests, lang } = opts;

package/src/bin/reportXml.js

@@ -23,7 +23,7 @@ program
   .option('--timelimit <time>', 'default time limit in seconds to kill a stuck process')
   .option('--env-file <envfile>', 'Load environment variables from env file')
   .action(async (pattern, opts) => {
-    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
+    if (!pattern.endsWith('.xml')) {
       pattern += '.xml';
     }
     let { javaTests, lang } = opts;
@@ -34,10 +34,7 @@ program
     }
     lang = lang?.toLowerCase();
     if (javaTests === true || (lang === 'java' && !javaTests)) javaTests = 'src/test/java';
-    const runReader = new XmlReader({
-      javaTests,
-      lang,
-    });
+    const runReader = new XmlReader({ javaTests, lang });
     const files = glob.sync(pattern, { cwd: opts.dir || process.cwd() });
     if (!files.length) {
       console.log(APP_PREFIX, `Report can't be created. No XML files found 😥`);

package/src/bin/startTest.js

@@ -18,7 +18,7 @@ const newArgs = ['run'];
 let i = 0;
 while (i < args.length) {
   const arg = args[i];
-
+  
   if (arg === '-c' || arg === '--command') {
     // Map -c/--command to positional argument for run command
     i++;
@@ -33,7 +33,7 @@ while (i < args.length) {
     // Map --launch to start command
     newArgs[0] = 'start';
   } else if (arg === '--finish') {
-    // Map --finish to finish command
+    // Map --finish to finish command  
     newArgs[0] = 'finish';
   } else {
     // Pass through other arguments
@@ -45,9 +45,9 @@ while (i < args.length) {
 // Execute the main CLI with mapped arguments
 
 const child = spawn(process.execPath, [cliPath, ...newArgs], {
-  stdio: 'inherit',
+  stdio: 'inherit'
 });
 
-child.on('exit', code => {
+child.on('exit', (code) => {
   process.exit(code);
-});
+});