@testomatio/reporter 2.3.6 → 2.3.7-beta.2-xml-import

package/lib/uploader.js

@@ -170,6 +170,10 @@ 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,12 +122,8 @@ 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 => {
-        // 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;
+        // Normalize path separators for cross-platform compatibility
+        return f.replace(/\\/g, '/');
     });
     debug('Found files in stack trace: ', files);
     return files.filter(f => {
@@ -174,6 +170,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())
@@ -216,10 +214,58 @@ 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)
-                lineIndex = lines.findIndex(l => l.includes(`${title}(`));
+            // 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;
+                    }
+                }
+            }
         }
         else {
             lineIndex = lines.findIndex(l => l.includes(title));
@@ -228,11 +274,28 @@ const fetchSourceCode = (contents, opts = {}) => {
     if (opts.prepend) {
         lineIndex -= opts.prepend;
     }
-    if (lineIndex) {
+    if (lineIndex !== -1 && lineIndex !== undefined) {
         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('#['))
@@ -271,6 +334,22 @@ 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,25 +19,11 @@ declare class XmlReader {
     tests: any[];
     stats: {};
     uploader: S3Uploader;
+    enhancedNunit: boolean;
+    groupParameterized: boolean;
     version: any;
     connectAdapter(): import("./junit-adapter/adapter.js").default;
-    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[];
-    };
+    parse(fileName: any): any;
     processJUnit(jsonSuite: any): {
         create_tests: boolean;
         duration: number;
@@ -49,15 +35,14 @@ declare class XmlReader {
         tests: any[];
         tests_count: number;
     };
-    processNUnit(jsonSuite: any): {
-        status: any;
-        create_tests: boolean;
-        tests_count: number;
-        passed_count: number;
-        failed_count: number;
-        skipped_count: number;
-        tests: any[];
-    };
+    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;
     processTRX(jsonSuite: any): {
         status: string;
         create_tests: boolean;
@@ -67,6 +52,27 @@ 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,6 +11,7 @@ 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"));
@@ -54,6 +55,9 @@ 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;
@@ -102,7 +106,8 @@ class XmlReader {
         return this.processJUnit(jsonSuite);
     }
     processJUnit(jsonSuite) {
-        const { testsuite, name, tests, failures, errors } = jsonSuite;
+        const { testsuite, name, failures, errors } = jsonSuite;
+        const tests = testsuite?.tests || jsonSuite.tests;
         reduceOptions.preferClassname = this.stats.language === 'python';
         const resultTests = processTestSuite(testsuite);
         const hasFailures = resultTests.filter(t => t.status === 'failed').length > 0;
@@ -128,6 +133,13 @@ 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']);
@@ -142,65 +154,58 @@ 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);
-        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,
-            };
-        }) || [];
+        // Parse test definitions
+        const tests = defs.map(td => this._parseTRXTestDefinition(td));
+        // Parse test results
         let result = jsonSuite?.TestRun?.Results?.UnitTestResult;
         if (!Array.isArray(result))
             result = [result].filter(d => !!d);
-        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;
-        });
+        const results = result.map(td => this._parseTRXTestResult(td, tests));
         debug(results);
         const counters = jsonSuite?.TestRun?.ResultSummary?.Counters || {};
         const failed_count = parseInt(counters.failed, 10) + parseInt(counters.error, 10);
-        let status = constants_js_1.STATUS.PASSED.toString();
-        if (failed_count > 0)
-            status = constants_js_1.STATUS.FAILED;
+        const status = failed_count > 0 ? constants_js_1.STATUS.FAILED : constants_js_1.STATUS.PASSED.toString();
         this.tests = results.filter(t => !!t.title);
         return {
             status,
@@ -212,6 +217,57 @@ 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.6",
+  "version": "2.3.7-beta.2-xml-import",
   "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')) {
+    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
       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')) {
+    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
       pattern += '.xml';
     }
     let { javaTests, lang } = opts;
@@ -34,7 +34,10 @@ 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);
-});
+});

package/src/client.js

@@ -37,9 +37,8 @@ class Client {
     this.runId = '';
     this.queue = Promise.resolve();
 
-    // @ts-ignore this line will be removed in compiled code, because __dirname is defined in commonjs
-    const __dirname = path.dirname(fileURLToPath(import.meta.url));
-    const pathToPackageJSON = path.join(__dirname, '../package.json');
+    // Get package.json path - use a simple approach that works in both environments
+    const pathToPackageJSON = path.join(process.cwd(), 'package.json');
     try {
       this.version = JSON.parse(fs.readFileSync(pathToPackageJSON).toString()).version;
       console.log(APP_PREFIX, `Testomatio Reporter v${this.version}`);
@@ -387,7 +386,11 @@ class Client {
    */
   formatLogs({ error, steps, logs }) {
     error = error?.trim();
-    logs = logs?.trim().split('\n').map(l => truncate(l)).join('\n');
+    logs = logs
+      ?.trim()
+      .split('\n')
+      .map(l => truncate(l))
+      .join('\n');
 
     if (Array.isArray(steps)) {
       steps = steps

package/src/junit-adapter/csharp.js

@@ -3,18 +3,50 @@ import Adapter from './adapter.js';
 
 class CSharpAdapter extends Adapter {
   formatTest(t) {
-    const title = t.title.replace(/\(.*?\)/, '').trim();
-    const example = t.title.match(/\((.*?)\)/);
-    if (example) t.example = { ...example[1].split(',') };
+    // Extract example from title if not already present
+    if (!t.example) {
+      const exampleMatch = t.title.match(/\((.*?)\)/);
+      if (exampleMatch) {
+        // Extract parameters as object with numeric keys for API
+        const params = exampleMatch[1].split(',').map(param => param.trim());
+        t.example = {};
+        params.forEach((param, index) => {
+          t.example[index] = param;
+        });
+      }
+    }
+
+    // For runs: keep full title with parameters for display
+    // The example field will be used for grouping on import
+    // Do NOT remove parameters from title
+
     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.isAbsolute(filePath)) {
+        // Try to find project-relative path
+        const cwd = process.cwd().replace(/\\/g, '/');
+        if (filePath.startsWith(cwd)) {
+          filePath = path.relative(cwd, filePath).replace(/\\/g, '/');
+        }
+      }
+      return filePath;
+    }
+
+    // Convert namespace path to file path
+    const fileName = namespaceToFileName(filePath);
     return fileName;
   }
 }
@@ -22,7 +54,14 @@ class CSharpAdapter extends Adapter {
 export default 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.sep)}.cs`;
+  return `${fileParts.join('/')}.cs`;
 }