@testomatio/reporter 2.3.6-beta.1-truncate-steps → 2.3.7-beta.1-xml-import

package/src/utils/utils.js

@@ -83,12 +83,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);
@@ -139,6 +135,8 @@ 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())
@@ -180,8 +178,32 @@ 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') {
-      if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
-      if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`${title}(`));
+      // 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));
     }
@@ -191,7 +213,7 @@ const fetchSourceCode = (contents, opts = {}) => {
     lineIndex -= opts.prepend;
   }
 
-  if (lineIndex) {
+  if (lineIndex !== -1 && lineIndex !== undefined) {
     const result = [];
     for (let i = lineIndex; i < lineIndex + limit; i++) {
       if (lines[i] === undefined) continue;
@@ -216,6 +238,10 @@ 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;
+        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]);
     }
@@ -428,16 +454,8 @@ function transformEnvVarToBoolean(value) {
   return Boolean(value);
 }
 
-function truncate(s, size = 255) {
-  if (s.toString().trim().length < size) {
-    return s.toString();
-  }
-  return `${s.toString().substring(0, size)}...`;
-}
-
 export {
   ansiRegExp,
-  truncate,
   cleanLatestRunId,
   isSameTest,
   fetchSourceCode,

package/src/xmlReader.js

@@ -6,6 +6,7 @@ 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,
@@ -75,6 +76,10 @@ 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;
@@ -126,7 +131,8 @@ class XmlReader {
   }
 
   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);
@@ -157,6 +163,14 @@ 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';
@@ -175,6 +189,53 @@ 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);