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

package/lib/xmlReader.js

@@ -20,7 +20,7 @@ const uploader_js_1 = require("./uploader.js");
 const debug = (0, debug_1.default)('@testomatio/reporter:xml');
 const ridRunId = (0, crypto_1.randomUUID)();
 const TESTOMATIO_URL = process.env.TESTOMATIO_URL || 'https://app.testomat.io';
-const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_SUITE, TESTOMATIO_MAX_STACK_TRACE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED, TESTOMATIO_DISABLE_SOURCE_CODE, } = process.env;
+const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_SUITE, TESTOMATIO_MAX_STACK_TRACE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED, } = process.env;
 const options = {
     ignoreDeclaration: true,
     ignoreAttributes: false,
@@ -47,10 +47,6 @@ class XmlReader {
         if (!this.adapter)
             throw new Error('XML adapter for this format not found');
         this.opts = opts || {};
-        // Check if source code fetching should be disabled
-        this.disableSourceCodeFetching = opts.disableSourceCodeFetching || TESTOMATIO_DISABLE_SOURCE_CODE;
-        // Control suite organization strategy: 'classname' (default) or 'fullpath'
-        this.suiteOrganization = opts.suiteOrganization || process.env.TESTOMATIO_SUITE_ORGANIZATION || 'classname';
         this.store = {};
         this.pipesPromise = (0, index_js_1.pipesFactory)(opts, this.store);
         this.parser = new fast_xml_parser_1.XMLParser(options);
@@ -62,15 +58,6 @@ class XmlReader {
         const packageJsonPath = path_1.default.resolve(__dirname, '..', 'package.json');
         this.version = JSON.parse(fs_1.default.readFileSync(packageJsonPath).toString()).version;
         console.log(constants_js_1.APP_PREFIX, `Testomatio Reporter v${this.version}`);
-        if (this.disableSourceCodeFetching) {
-            console.log(constants_js_1.APP_PREFIX, '🚫 Source code fetching is disabled');
-        }
-        if (this.suiteOrganization === 'fullpath') {
-            console.log(constants_js_1.APP_PREFIX, '📁 Using fullpath suite organization (may create nested structure)');
-        }
-        else {
-            console.log(constants_js_1.APP_PREFIX, '📋 Using classname suite organization (avoids duplicates)');
-        }
     }
     connectAdapter() {
         if (this.opts.javaTests) {
@@ -143,23 +130,8 @@ class XmlReader {
     processNUnit(jsonSuite) {
         const { result, total, passed, failed, inconclusive, skipped } = jsonSuite;
         reduceOptions.preferClassname = this.stats.language === 'python';
-        reduceOptions.suiteOrganization = this.suiteOrganization;
         const resultTests = processTestSuite(jsonSuite['test-suite']);
-        debug('Raw tests extracted from NUnit XML:', resultTests.length);
-        debug('Raw tests:', resultTests.map(t => ({ title: t.title, example: t.example, file: t.file })));
-        // Optional deduplication for complex NUnit scenarios - can be enabled via options
-        let finalTests = resultTests;
-        if (this.opts.enableNUnitDeduplication) {
-            finalTests = this.deduplicateTestsByFQN(resultTests);
-            debug('Tests after deduplication:', finalTests.length);
-            debug('Deduplicated tests:', finalTests.map(t => ({
-                title: t.title,
-                examples: t.examples,
-                example: t.example,
-                file: t.file,
-            })));
-        }
-        this.tests = this.tests.concat(finalTests);
+        this.tests = this.tests.concat(resultTests);
         return {
             status: result?.toLowerCase(),
             create_tests: true,
@@ -167,7 +139,7 @@ class XmlReader {
             passed_count: parseInt(passed, 10),
             failed_count: parseInt(failed, 10),
             skipped_count: parseInt(inconclusive + skipped, 10),
-            tests: finalTests,
+            tests: resultTests,
         };
     }
     processTRX(jsonSuite) {
@@ -303,171 +275,6 @@ class XmlReader {
             tests,
         };
     }
-    deduplicateTestsByFQN(tests) {
-        const fqnMap = new Map();
-        tests.forEach(test => {
-            const fqn = this.generateNormalizedFQN(test);
-            if (fqnMap.has(fqn)) {
-                const existingTest = fqnMap.get(fqn);
-                // For parameterized tests, merge as Examples
-                if (test.example && Array.isArray(test.example) && test.example.length > 0) {
-                    // Initialize examples array if it doesn't exist
-                    if (!existingTest.examples) {
-                        existingTest.examples = [];
-                        // Add the existing test's example as the first item if it has parameters
-                        if (existingTest.example && Array.isArray(existingTest.example) && existingTest.example.length > 0) {
-                            existingTest.examples.push({
-                                parameters: existingTest.example,
-                                status: existingTest.status,
-                                run_time: existingTest.run_time,
-                                message: existingTest.message,
-                                stack: existingTest.stack,
-                            });
-                            // Clear the main test's example since it's now in examples array
-                            delete existingTest.example;
-                        }
-                    }
-                    // Add this test's execution as an example
-                    existingTest.examples.push({
-                        parameters: test.example,
-                        status: test.status,
-                        run_time: test.run_time,
-                        message: test.message,
-                        stack: test.stack,
-                    });
-                    // Update the main test status to reflect the worst status
-                    if (test.status === 'failed' || existingTest.status === 'failed') {
-                        existingTest.status = 'failed';
-                    }
-                    else if (test.status === 'skipped' && existingTest.status !== 'failed') {
-                        existingTest.status = 'skipped';
-                    }
-                    // Update total run time
-                    existingTest.run_time = (existingTest.run_time || 0) + (test.run_time || 0);
-                }
-                else {
-                    // Merge test properties for non-parameterized tests, prioritizing Test Explorer structure
-                    if (test.test_id && !existingTest.test_id) {
-                        existingTest.test_id = test.test_id;
-                    }
-                    // Keep the most complete test data
-                    if (test.stack && !existingTest.stack) {
-                        existingTest.stack = test.stack;
-                    }
-                    if (test.message && !existingTest.message) {
-                        existingTest.message = test.message;
-                    }
-                }
-                // Prefer Test Explorer structure (longer, more complete suite_title)
-                if (test.suite_title && test.suite_title.length > existingTest.suite_title.length) {
-                    existingTest.suite_title = test.suite_title;
-                }
-                // Always use the source file path if available
-                if (test.file && test.file.endsWith('.cs')) {
-                    existingTest.file = test.file;
-                }
-                else if (!existingTest.file || !existingTest.file.endsWith('.cs')) {
-                    existingTest.file = this.extractCsFileFromPath(test);
-                }
-            }
-            else {
-                // Fix file path to use proper .cs file names from source paths
-                if (!test.file || !test.file.endsWith('.cs')) {
-                    test.file = this.extractCsFileFromPath(test);
-                }
-                fqnMap.set(fqn, test);
-            }
-        });
-        return Array.from(fqnMap.values());
-    }
-    generateFQN(test) {
-        // Generate Fully Qualified Name: Namespace + Class + Method (standard .NET FQN)
-        // Don't include assembly as it can vary between different test structures
-        const namespace = this.extractNamespace(test);
-        const className = this.extractClassName(test);
-        const methodName = test.title;
-        // Use the most complete namespace.class structure available
-        if (test.suite_title && test.suite_title.includes('.')) {
-            return `${test.suite_title}.${methodName}`;
-        }
-        return `${namespace}.${className}.${methodName}`;
-    }
-    generateNormalizedFQN(test) {
-        // Generate normalized FQN for deduplication by extracting the core namespace.class.method
-        // For parameterized tests, we want the SAME FQN so they merge into one test with multiple Examples
-        const fullClassName = test.suite_title || '';
-        const methodName = test.title;
-        // Extract the most specific namespace.class pattern
-        if (fullClassName.includes('.')) {
-            const parts = fullClassName.split('.');
-            if (parts.length >= 2) {
-                const className = parts[parts.length - 1];
-                // Look for common .NET namespace patterns and normalize them:
-                // TestProject.Tests.MyClass -> Tests.MyClass
-                // Tests.MyClass -> Tests.MyClass
-                // MyProject.SubNamespace.Tests.MyClass -> Tests.MyClass
-                let normalizedNamespace = '';
-                for (let i = parts.length - 2; i >= 0; i--) {
-                    const part = parts[i];
-                    // Build namespace from right to left, excluding project names
-                    if (part === 'Tests' || part.endsWith('Tests') || part.includes('Test')) {
-                        // Found a test namespace, use it as the normalized namespace
-                        normalizedNamespace = part;
-                        break;
-                    }
-                    else if (i === parts.length - 2) {
-                        // If no test namespace found, use the immediate parent as namespace
-                        normalizedNamespace = part;
-                    }
-                }
-                return `${normalizedNamespace}.${className}.${methodName}`;
-            }
-        }
-        // Fallback for simple class names
-        return `${fullClassName}.${methodName}`;
-    }
-    extractAssemblyName(test) {
-        // Extract assembly name from file path or use default
-        if (test.file) {
-            const parts = test.file.split(/[/\\]/);
-            return parts[0] || 'DefaultAssembly';
-        }
-        return 'DefaultAssembly';
-    }
-    extractNamespace(test) {
-        // Extract namespace from suite_title or classname
-        if (test.suite_title && test.suite_title.includes('.')) {
-            const parts = test.suite_title.split('.');
-            return parts.slice(0, -1).join('.');
-        }
-        return test.suite_title || 'DefaultNamespace';
-    }
-    extractClassName(test) {
-        // Extract class name from suite_title
-        if (test.suite_title && test.suite_title.includes('.')) {
-            const parts = test.suite_title.split('.');
-            return parts[parts.length - 1];
-        }
-        return test.suite_title || 'DefaultClass';
-    }
-    extractCsFileFromPath(test) {
-        // Extract .cs file name from source file path, not namespace
-        if (test.file) {
-            // Look for actual .cs file path patterns
-            const csFileMatch = test.file.match(/([^/\\]+\.cs)$/);
-            if (csFileMatch) {
-                return test.file;
-            }
-            // If no .cs extension, assume it's a namespace path and convert to likely file name
-            const className = this.extractClassName(test);
-            const pathParts = test.file.split(/[/\\]/);
-            pathParts[pathParts.length - 1] = `${className}.cs`;
-            return pathParts.join('/');
-        }
-        // Fallback to class name
-        const className = this.extractClassName(test);
-        return `${className}.cs`;
-    }
     calculateStats() {
         this.stats = {
             ...this.stats,
@@ -491,11 +298,6 @@ class XmlReader {
         return this.stats;
     }
     fetchSourceCode() {
-        // Skip source code fetching if disabled
-        if (this.disableSourceCodeFetching) {
-            debug('Source code fetching is disabled');
-            return;
-        }
         this.tests.forEach(t => {
             try {
                 const file = this.adapter.getFilePath(t);
@@ -522,9 +324,7 @@ class XmlReader {
                     return;
                 }
                 const contents = fs_1.default.readFileSync(file).toString();
-                // Try original test name first (for parameterized tests), fallback to regular title
-                const titleForLookup = t.originalTestName ? t.originalTestName.replace(/\(.*?\)/, '').trim() : t.title;
-                t.code = (0, utils_js_1.fetchSourceCode)(contents, { ...t, title: titleForLookup, lang: this.stats.language });
+                t.code = (0, utils_js_1.fetchSourceCode)(contents, { ...t, lang: this.stats.language });
                 if (t.code)
                     debug('Fetched code for test %s', t.title);
                 t.test_id = (0, utils_js_1.fetchIdFromCode)(t.code, { lang: this.stats.language });
@@ -630,12 +430,7 @@ function reduceTestCases(prev, item) {
     testCases
         .filter(t => !!t)
         .forEach(testCaseItem => {
-        // Simple file extraction (version 2.1.1 approach) with fallback to enhanced extraction
-        let file = testCaseItem.file || item.filepath || item.fullname || item.package || '';
-        // If no file found with simple approach and we have enhanced extraction enabled, use it
-        if (!file && item.filepath) {
-            file = extractSourceFilePath(testCaseItem, item);
-        }
+        const file = testCaseItem.file || item.filepath || item.fullname || item.package || '';
         let stack = '';
         let message = '';
         if (testCaseItem.error)
@@ -659,28 +454,13 @@ function reduceTestCases(prev, item) {
         // SpecFlow config
         let { title, tags, testId } = fetchProperties(isParametrized ? item : testCaseItem);
         let example = null;
-        // Smart suite title extraction to avoid duplicates
-        const suiteTitle = getSuiteTitle(testCaseItem, item, isParametrized, reduceOptions.suiteOrganization);
+        const suiteTitle = preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname;
         title ||= testCaseItem.name || testCaseItem.methodname || testCaseItem.classname;
         tags ||= [];
-        // Store original test name for enhanced parameter extraction
-        const originalTestName = testCaseItem.name || testCaseItem.methodname;
-        // Enhanced NUnit-style arguments from <arguments> element
-        if (testCaseItem.arguments && testCaseItem.arguments.arg) {
-            const args = Array.isArray(testCaseItem.arguments.arg)
-                ? testCaseItem.arguments.arg
-                : [testCaseItem.arguments.arg];
-            example = args; // Store as array instead of object
-            // Remove parameters from title for NUnit tests
-            title = (testCaseItem.methodname || title).replace(/\(.*?\)/, '').trim();
-        }
-        else {
-            // Simple parameter extraction (version 2.1.1 approach)
-            const exampleMatches = testCaseItem.name?.match(/\S\((.*?)\)/);
-            if (exampleMatches) {
-                example = { ...exampleMatches[1].split(',').map(v => v.trim().replace(/[^\w\s-]/g, '')) };
-                title = title.replace(/\(.*?\)/, '').trim();
-            }
+        const exampleMatches = testCaseItem.name?.match(/\S\((.*?)\)/);
+        if (exampleMatches) {
+            example = { ...exampleMatches[1].split(',').map(v => v.trim().replace(/[^\w\s-]/g, '')) };
+            title = title.replace(/\(.*?\)/, '').trim();
         }
         stack = `${testCaseItem['system-out'] || testCaseItem.output || testCaseItem.log || ''}\n\n${stack}\n\n${suiteOutput}\n\n${suiteErr}`.trim();
         if (!testId)
@@ -728,7 +508,6 @@ function reduceTestCases(prev, item) {
             run_time: parseFloat(testCaseItem.time || testCaseItem.duration) * 1000,
             status,
             title,
-            originalTestName, // Store original name for enhanced features
             root_suite_id: TESTOMATIO_SUITE,
             suite_title: suiteTitle,
             files,
@@ -737,102 +516,6 @@ function reduceTestCases(prev, item) {
     });
     return prev;
 }
-function extractSourceFilePath(testCaseItem, item) {
-    // Priority order for file path extraction to match Test Explorer structure:
-    // 1. filepath attribute (direct .cs file path from NUnit)
-    // 2. fullname (contains full project path)
-    // 3. file attribute from test case
-    // 4. package (fallback)
-    // NUnit provides filepath attribute with actual .cs file path - use this first
-    if (item.filepath) {
-        // Clean up Windows/Unix path separators and ensure proper format
-        let filePath = item.filepath.replace(/\\/g, '/');
-        // Make relative to current working directory if absolute
-        if (path_1.default.isAbsolute(item.filepath)) {
-            const cwd = process.cwd().replace(/\\/g, '/');
-            if (filePath.startsWith(cwd)) {
-                filePath = path_1.default.relative(cwd, item.filepath).replace(/\\/g, '/');
-            }
-            else {
-                // Try to extract relative path from common patterns
-                const commonPatterns = ['/Tests/', '/test/', '/src/', '/Test/'];
-                for (const pattern of commonPatterns) {
-                    const index = filePath.lastIndexOf(pattern);
-                    if (index !== -1) {
-                        filePath = filePath.substring(index + 1);
-                        break;
-                    }
-                }
-            }
-        }
-        return filePath;
-    }
-    if (testCaseItem.file) {
-        let filePath = testCaseItem.file.replace(/\\/g, '/');
-        // Make relative to current working directory if absolute
-        if (path_1.default.isAbsolute(testCaseItem.file)) {
-            const cwd = process.cwd().replace(/\\/g, '/');
-            if (filePath.startsWith(cwd)) {
-                filePath = path_1.default.relative(cwd, testCaseItem.file).replace(/\\/g, '/');
-            }
-            else {
-                // Try to extract relative path from common patterns
-                const commonPatterns = ['/Tests/', '/test/', '/src/', '/Test/'];
-                for (const pattern of commonPatterns) {
-                    const index = filePath.lastIndexOf(pattern);
-                    if (index !== -1) {
-                        filePath = filePath.substring(index + 1);
-                        break;
-                    }
-                }
-            }
-        }
-        return filePath;
-    }
-    if (item.fullname) {
-        // Extract actual file path from fullname if it contains path separators
-        const fullnameParts = item.fullname.split('.');
-        if (fullnameParts.length > 2) {
-            // For ParameterizedMethod, get the class name (not method name)
-            // Example: "NUnit_sample_test.Tests.SampleTests.TestBooleanValue" -> "Tests/SampleTests.cs"
-            let namespaceParts, className;
-            if (item.type === 'ParameterizedMethod') {
-                // For parameterized methods, the last part is the method name, second-to-last is class
-                namespaceParts = fullnameParts.slice(1, -2); // Skip project name and method name
-                className = fullnameParts[fullnameParts.length - 2]; // Get class name
-            }
-            else {
-                // For regular classes/fixtures
-                namespaceParts = fullnameParts.slice(1, -1); // Skip project name
-                className = fullnameParts[fullnameParts.length - 1];
-            }
-            return `${namespaceParts.join('/')}/${className}.cs`;
-        }
-    }
-    if (item.package)
-        return item.package.replace(/\\/g, '/');
-    // Fallback: construct from classname
-    if (testCaseItem.classname) {
-        const parts = testCaseItem.classname.split('.');
-        const className = parts[parts.length - 1];
-        const namespacePath = parts.slice(0, -1).join('/');
-        return `${namespacePath}/${className}.cs`;
-    }
-    return '';
-}
-function extractTestExplorerSuiteTitle(testCaseItem, item) {
-    // Extract suite title to match Test Explorer structure (Project/Namespace hierarchy)
-    // Priority: fullname > classname > name
-    if (item.fullname) {
-        // Use fullname to maintain Test Explorer structure
-        return item.fullname;
-    }
-    if (testCaseItem.classname) {
-        return testCaseItem.classname;
-    }
-    // Fallback to item name but prefer classname structure
-    return item.name || testCaseItem.classname || 'UnknownClass';
-}
 function processTestSuite(testsuite) {
     if (!testsuite)
         return [];
@@ -844,38 +527,9 @@ function processTestSuite(testsuite) {
     if (!Array.isArray(testsuite)) {
         suites = [testsuite];
     }
-    // Simple approach from version 2.1.1 with enhanced processing for complex scenarios
-    const subSuites = suites.filter(s => s['test-suite'] && !s['test-case']);
+    const subSuites = suites.filter(s => s['test-suite'] && !testsuite['test-case']);
     return [...subSuites.map(s => processTestSuite(s['test-suite'])), ...suites.reduce(reduceTestCases, [])].flat();
 }
-function getSuiteTitle(testCaseItem, item, isParametrized, suiteOrganization = 'classname') {
-    let suiteTitle;
-    if (suiteOrganization === 'fullpath') {
-        // Use full namespace path (old behavior that creates detailed structure)
-        if (item.fullname) {
-            return item.fullname;
-        }
-        suiteTitle = testCaseItem.classname || item.name;
-    }
-    else {
-        // Use classname approach (default - avoids duplicates)
-        if (isParametrized) {
-            // For parameterized tests, use the class name to group them
-            suiteTitle = item.name || testCaseItem.classname;
-        }
-        else {
-            // For regular tests, prefer classname over fullname to avoid long paths
-            suiteTitle = testCaseItem.classname || item.name;
-        }
-        // If still no suite title and we have fullname, extract just the class name
-        if (!suiteTitle && item.fullname) {
-            const fullnameParts = item.fullname.split('.');
-            suiteTitle = fullnameParts[fullnameParts.length - 1]; // Just the class name
-        }
-    }
-    // Fallback
-    return suiteTitle || 'UnknownClass';
-}
 function fetchProperties(item) {
     const tags = [];
     let title = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.3.5-beta-6-xml-import",
+  "version": "2.3.5",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"

package/src/junit-adapter/csharp.js

@@ -3,45 +3,18 @@ import Adapter from './adapter.js';
 
 class CSharpAdapter extends Adapter {
   formatTest(t) {
-    // 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 title = t.title.replace(/\(.*?\)/, '').trim();
+    const example = t.title.match(/\((.*?)\)/);
+    if (example) t.example = { ...example[1].split(',') };
     const suite = t.suite_title.split('.');
     t.suite_title = suite.pop();
     t.file = namespaceToFileName(t.file);
+    t.title = title.trim();
     return t;
   }
 
   getFilePath(t) {
-    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);
+    const fileName = namespaceToFileName(t.file);
     return fileName;
   }
 }
@@ -49,14 +22,7 @@ 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('/')}.cs`;
+  return `${fileParts.join(path.sep)}.cs`;
 }

package/src/pipe/debug.js

@@ -15,7 +15,7 @@ export 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 ? false : true),
+        isEnabled: this.params.isBatchEnabled ?? !process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ?? true,
         intervalFunction: null,
         intervalTime: 5000,
         tests: [],
@@ -93,7 +93,8 @@ export class DebugPipe {
       const logData = { action: 'addTest', testId: data };
       if (this.store.runId) logData.runId = this.store.runId;
       this.logToFile(logData);
-    } else this.batch.tests.push(data);
+    }
+    else this.batch.tests.push(data);
 
     if (!this.batch.intervalFunction) await this.batchUpload();
   }