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

package/src/uploader.js

@@ -194,11 +194,6 @@ export class S3Uploader {
       filePath = path.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.appendFileSync(tempFilePath, jsonLine);

package/src/utils/utils.js

@@ -83,8 +83,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);
@@ -135,8 +139,6 @@ export const TEST_ID_REGEX = /@T([\w\d]{8})/;
 export const SUITE_ID_REGEX = /@S([\w\d]{8})/;
 
 const fetchIdFromCode = (code, opts = {}) => {
-  if (!code) return null;
-
   const comments = code
     .split('\n')
     .map(l => l.trim())
@@ -178,65 +180,8 @@ const fetchSourceCode = (contents, opts = {}) => {
       if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
       if (lineIndex === -1) 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));
     }
@@ -246,31 +191,11 @@ const fetchSourceCode = (contents, opts = {}) => {
     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('#[')) break;
@@ -291,18 +216,6 @@ const fetchSourceCode = (contents, opts = {}) => {
         if (opts.lang === 'java' && lines[i].trim().match(/^@\w+/)) break;
         if (opts.lang === 'java' && lines[i].includes(' public void ')) 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/src/xmlReader.js

@@ -6,7 +6,6 @@ import { XMLParser } from 'fast-xml-parser';
 import { APP_PREFIX, STATUS } from './constants.js';
 import { randomUUID } from 'crypto';
 import { fileURLToPath } from 'url';
-import { NUnitXmlParser } from './junit-adapter/nunit-parser.js';
 import {
   fetchFilesFromStackTrace,
   fetchIdFromOutput,
@@ -76,10 +75,6 @@ class XmlReader {
     this.stats.language = opts.lang?.toLowerCase();
     this.uploader = new 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.resolve(__dirname, '..', 'package.json');
     this.version = JSON.parse(fs.readFileSync(packageJsonPath).toString()).version;
@@ -131,8 +126,7 @@ class XmlReader {
   }
 
   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);
@@ -163,14 +157,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';
@@ -189,71 +175,63 @@ class XmlReader {
     };
   }
 
-  /**
-   * 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 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(`${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));
+    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 results
     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 = STATUS.PASSED;
+      if (r.status === 'Failed') r.status = STATUS.FAILED;
+      if (r.status === 'Skipped') r.status = 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 ? STATUS.FAILED : STATUS.PASSED.toString();
+
+    let status = STATUS.PASSED.toString();
+    if (failed_count > 0) status = STATUS.FAILED;
 
     this.tests = results.filter(t => !!t.title);
 
@@ -268,67 +246,6 @@ class XmlReader {
     };
   }
 
-  _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 STATUS.PASSED;
-      case 'Failed':
-        return STATUS.FAILED;
-      case 'Skipped':
-        return STATUS.SKIPPED;
-      default:
-        return STATUS.PASSED;
-    }
-  }
-
   processXUnit(assemblies) {
     const tests = [];
 

package/lib/junit-adapter/nunit-parser.d.ts

@@ -1,82 +0,0 @@
-/**
- * Enhanced NUnit XML Parser that properly handles test-suite hierarchy
- * and parameterized tests
- */
-export class NUnitXmlParser {
-    constructor(options?: {});
-    options: {};
-    tests: any[];
-    stats: {
-        total: number;
-        passed: number;
-        failed: number;
-        skipped: number;
-        inconclusive: number;
-    };
-    /**
-     * Parse NUnit XML test-run structure
-     * @param {Object} testRun - Parsed XML test-run object
-     * @returns {Object} - Parsed test results
-     */
-    parseTestRun(testRun: any): any;
-    /**
-     * Recursively parse test-suite elements based on their type
-     * @param {Object|Array} testSuite - Test suite object or array
-     * @param {Array} parentPath - Current path in the hierarchy
-     */
-    parseTestSuite(testSuite: any | any[], parentPath?: any[]): void;
-    /**
-     * Process child elements of a test suite
-     * @param {Object} testSuite - Test suite object
-     * @param {Array} currentPath - Current path in hierarchy
-     */
-    processChildren(testSuite: any, currentPath: any[]): void;
-    /**
-     * Parse test-case elements (actual tests)
-     * @param {Object|Array} testCases - Test case object or array
-     * @param {Array} suitePath - Path to the test suite
-     * @param {Object} parentSuite - Parent test suite for context
-     */
-    parseTestCases(testCases: any | any[], suitePath: any[], parentSuite: any): void;
-    /**
-     * Parse individual test case
-     * @param {Object} testCase - Test case object
-     * @param {Array} suitePath - Path to the test suite
-     * @param {Object} parentSuite - Parent test suite for context
-     * @returns {Object|null} - Parsed test object
-     */
-    parseTestCase(testCase: any, suitePath: any[], parentSuite: any): any | null;
-    /**
-     * Extract method name and parameters from test name
-     * @param {string} testName - Full test name
-     * @returns {Object} - Extracted information
-     */
-    extractParameters(testName: string): any;
-    /**
-     * Parse parameter string into array of parameters
-     * @param {string} paramString - Parameter string
-     * @returns {Array} - Array of parameters
-     */
-    parseParameterString(paramString: string): any[];
-    /**
-     * Extract method name from test name (fallback)
-     * @param {string} testName - Test name
-     * @returns {string} - Method name
-     */
-    extractMethodName(testName: string): string;
-    /**
-     * Build file path from suite path and class name
-     * @param {Array} suitePath - Suite path array
-     * @param {string} className - Class name
-     * @param {Object} parentSuite - Parent suite for context
-     * @returns {string} - File path
-     */
-    buildFilePath(suitePath: any[], className: string, parentSuite: any): string;
-    /**
-     * Group parameterized tests by base method name
-     * @param {Array} tests - Array of parsed tests
-     * @returns {Object} - Grouped tests
-     */
-    groupParameterizedTests(tests: any[]): any;
-}
-export default NUnitXmlParser;