@testomatio/reporter 2.2.1 → 2.3.0-beta.2-xml-import

package/lib/xmlReader.d.ts

@@ -77,6 +77,13 @@ declare class XmlReader {
         skipped_count: number;
         tests: any[];
     };
+    deduplicateTestsByFQN(tests: any): any[];
+    generateFQN(test: any): string;
+    generateNormalizedFQN(test: any): string;
+    extractAssemblyName(test: any): any;
+    extractNamespace(test: any): any;
+    extractClassName(test: any): any;
+    extractCsFileFromPath(test: any): any;
     calculateStats(): {};
     fetchSourceCode(): void;
     formatTests(): void;

package/lib/xmlReader.js

@@ -131,7 +131,9 @@ class XmlReader {
         const { result, total, passed, failed, inconclusive, skipped } = jsonSuite;
         reduceOptions.preferClassname = this.stats.language === 'python';
         const resultTests = processTestSuite(jsonSuite['test-suite']);
-        this.tests = this.tests.concat(resultTests);
+        // Deduplicate tests based on FQN (Assembly + Namespace + Class + Method)
+        const deduplicatedTests = this.deduplicateTestsByFQN(resultTests);
+        this.tests = this.tests.concat(deduplicatedTests);
         return {
             status: result?.toLowerCase(),
             create_tests: true,
@@ -139,7 +141,7 @@ class XmlReader {
             passed_count: parseInt(passed, 10),
             failed_count: parseInt(failed, 10),
             skipped_count: parseInt(inconclusive + skipped, 10),
-            tests: resultTests,
+            tests: deduplicatedTests,
         };
     }
     processTRX(jsonSuite) {
@@ -275,6 +277,171 @@ 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,
@@ -430,7 +597,8 @@ function reduceTestCases(prev, item) {
     testCases
         .filter(t => !!t)
         .forEach(testCaseItem => {
-        const file = testCaseItem.file || item.filepath || item.fullname || item.package || '';
+        // Use consistent Test Explorer structure: prioritize fullname for file path
+        const file = extractSourceFilePath(testCaseItem, item);
         let stack = '';
         let message = '';
         if (testCaseItem.error)
@@ -450,17 +618,33 @@ function reduceTestCases(prev, item) {
         if (!message)
             message = stack.trim().split('\n')[0];
         const isParametrized = item.type === 'ParameterizedMethod';
-        const preferClassname = reduceOptions.preferClassname || isParametrized;
         // SpecFlow config
         let { title, tags, testId } = fetchProperties(isParametrized ? item : testCaseItem);
         let example = null;
-        const suiteTitle = preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname;
+        // Use consistent Test Explorer structure for suite title
+        const suiteTitle = extractTestExplorerSuiteTitle(testCaseItem, item);
         title ||= testCaseItem.name || testCaseItem.methodname || testCaseItem.classname;
         tags ||= [];
-        const exampleMatches = testCaseItem.name?.match(/\S\((.*?)\)/);
-        if (exampleMatches) {
-            example = { ...exampleMatches[1].split(',').map(v => v.trim().replace(/[^\w\s-]/g, '')) };
-            title = title.replace(/\(.*?\)/, '').trim();
+        // Store original test name for parameter extraction
+        const originalTestName = testCaseItem.name || testCaseItem.methodname;
+        // Handle 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 {
+            // Fallback to parsing parameters from test name (SpecFlow, etc.)
+            const exampleMatches = originalTestName?.match(/\((.*?)\)$/);
+            if (exampleMatches) {
+                // Extract and store parameters as Examples
+                const parameterValues = exampleMatches[1].split(',').map(v => v.trim().replace(/['"]/g, ''));
+                example = parameterValues;
+                title = title.replace(/\(.*?\)/, '').trim();
+            }
         }
         stack = `${testCaseItem['system-out'] || testCaseItem.output || testCaseItem.log || ''}\n\n${stack}\n\n${suiteOutput}\n\n${suiteErr}`.trim();
         if (!testId)
@@ -508,6 +692,7 @@ function reduceTestCases(prev, item) {
             run_time: parseFloat(testCaseItem.time || testCaseItem.duration) * 1000,
             status,
             title,
+            originalTestName, // Store original name for parameter-aware FQN generation
             root_suite_id: TESTOMATIO_SUITE,
             suite_title: suiteTitle,
             files,
@@ -516,6 +701,54 @@ 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
+        return item.filepath.replace(/\\/g, '/');
+    }
+    if (testCaseItem.file)
+        return testCaseItem.file.replace(/\\/g, '/');
+    if (item.fullname) {
+        // Extract actual file path from fullname if it contains path separators
+        const fullnameParts = item.fullname.split('.');
+        if (fullnameParts.length > 2) {
+            // Reconstruct path from project.namespace.class structure
+            const projectName = fullnameParts[0];
+            const namespaceParts = fullnameParts.slice(1, -1);
+            const className = fullnameParts[fullnameParts.length - 1];
+            return `${projectName}/${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 [];
@@ -527,8 +760,14 @@ function processTestSuite(testsuite) {
     if (!Array.isArray(testsuite)) {
         suites = [testsuite];
     }
-    const subSuites = suites.filter(s => s['test-suite'] && !testsuite['test-case']);
-    return [...subSuites.map(s => processTestSuite(s['test-suite'])), ...suites.reduce(reduceTestCases, [])].flat();
+    // Only process suites that have test cases OR child suites, but avoid double processing
+    const subSuites = suites.filter(s => s['test-suite'] && !s['test-case']);
+    const leafSuites = suites.filter(s => s['test-case'] || s.testcase);
+    // Process child suites recursively
+    const childResults = subSuites.map(s => processTestSuite(s['test-suite'])).flat();
+    // Process leaf suites with actual test cases
+    const leafResults = leafSuites.reduce(reduceTestCases, []);
+    return [...childResults, ...leafResults];
 }
 function fetchProperties(item) {
     const tags = [];

package/package.json

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

package/src/xmlReader.js

@@ -161,8 +161,11 @@ class XmlReader {
 
     reduceOptions.preferClassname = this.stats.language === 'python';
     const resultTests = processTestSuite(jsonSuite['test-suite']);
+    
+    // Deduplicate tests based on FQN (Assembly + Namespace + Class + Method)
+    const deduplicatedTests = this.deduplicateTestsByFQN(resultTests);
 
-    this.tests = this.tests.concat(resultTests);
+    this.tests = this.tests.concat(deduplicatedTests);
 
     return {
       status: result?.toLowerCase(),
@@ -171,7 +174,7 @@ class XmlReader {
       passed_count: parseInt(passed, 10),
       failed_count: parseInt(failed, 10),
       skipped_count: parseInt(inconclusive + skipped, 10),
-      tests: resultTests,
+      tests: deduplicatedTests,
     };
   }
 
@@ -319,6 +322,195 @@ class XmlReader {
     };
   }
 
+  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,
@@ -485,7 +677,8 @@ function reduceTestCases(prev, item) {
   testCases
     .filter(t => !!t)
     .forEach(testCaseItem => {
-      const file = testCaseItem.file || item.filepath || item.fullname || item.package || '';
+      // Use consistent Test Explorer structure: prioritize fullname for file path
+      const file = extractSourceFilePath(testCaseItem, item);
 
       let stack = '';
       let message = '';
@@ -500,20 +693,37 @@ function reduceTestCases(prev, item) {
       if (!message) message = stack.trim().split('\n')[0];
 
       const isParametrized = item.type === 'ParameterizedMethod';
-      const preferClassname = reduceOptions.preferClassname || isParametrized;
 
       // SpecFlow config
       let { title, tags, testId } = fetchProperties(isParametrized ? item : testCaseItem);
       let example = null;
-      const suiteTitle = preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname;
+      
+      // Use consistent Test Explorer structure for suite title
+      const suiteTitle = extractTestExplorerSuiteTitle(testCaseItem, item);
 
       title ||= testCaseItem.name || testCaseItem.methodname || testCaseItem.classname;
       tags ||= [];
 
-      const exampleMatches = testCaseItem.name?.match(/\S\((.*?)\)/);
-      if (exampleMatches) {
-        example = { ...exampleMatches[1].split(',').map(v => v.trim().replace(/[^\w\s-]/g, '')) };
-        title = title.replace(/\(.*?\)/, '').trim();
+      // Store original test name for parameter extraction
+      const originalTestName = testCaseItem.name || testCaseItem.methodname;
+      
+      // Handle 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 {
+        // Fallback to parsing parameters from test name (SpecFlow, etc.)
+        const exampleMatches = originalTestName?.match(/\((.*?)\)$/);
+        if (exampleMatches) {
+          // Extract and store parameters as Examples
+          const parameterValues = exampleMatches[1].split(',').map(v => v.trim().replace(/['"]/g, ''));
+          example = parameterValues;
+          title = title.replace(/\(.*?\)/, '').trim();
+        }
       }
 
       stack = `${
@@ -568,6 +778,7 @@ function reduceTestCases(prev, item) {
         run_time: parseFloat(testCaseItem.time || testCaseItem.duration) * 1000,
         status,
         title,
+        originalTestName, // Store original name for parameter-aware FQN generation
         root_suite_id: TESTOMATIO_SUITE,
         suite_title: suiteTitle,
         files,
@@ -577,6 +788,63 @@ 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
+    return item.filepath.replace(/\\/g, '/');
+  }
+  
+  if (testCaseItem.file) return testCaseItem.file.replace(/\\/g, '/');
+  
+  if (item.fullname) {
+    // Extract actual file path from fullname if it contains path separators
+    const fullnameParts = item.fullname.split('.');
+    if (fullnameParts.length > 2) {
+      // Reconstruct path from project.namespace.class structure
+      const projectName = fullnameParts[0];
+      const namespaceParts = fullnameParts.slice(1, -1);
+      const className = fullnameParts[fullnameParts.length - 1];
+      return `${projectName}/${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 [];
   if (testsuite.testsuite) return processTestSuite(testsuite.testsuite);
@@ -587,9 +855,17 @@ function processTestSuite(testsuite) {
     suites = [testsuite];
   }
 
-  const subSuites = suites.filter(s => s['test-suite'] && !testsuite['test-case']);
+  // Only process suites that have test cases OR child suites, but avoid double processing
+  const subSuites = suites.filter(s => s['test-suite'] && !s['test-case']);
+  const leafSuites = suites.filter(s => s['test-case'] || s.testcase);
+
+  // Process child suites recursively
+  const childResults = subSuites.map(s => processTestSuite(s['test-suite'])).flat();
+  
+  // Process leaf suites with actual test cases
+  const leafResults = leafSuites.reduce(reduceTestCases, []);
 
-  return [...subSuites.map(s => processTestSuite(s['test-suite'])), ...suites.reduce(reduceTestCases, [])].flat();
+  return [...childResults, ...leafResults];
 }
 
 function fetchProperties(item) {