From c3955872dc7673cf6a55e7684972ba24df44a4b9 Mon Sep 17 00:00:00 2001
From: Ignacio Alveal <ialveal@buk.cl>
Date: Mon, 24 Nov 2025 16:24:21 -0300
Subject: [PATCH] feat: Correctly set suite attributes and prioritize
 successful tests when handling duplicates.

Ensure all non-name attributes (tests, errors, failures, etc.) are correctly set in test suites.

Mark test cases with proper status tags (error, failure, warning, skipped) when a test fails.

Refine duplicate test handling logic: skip duplicates only when the existing test has no failure, ensuring failed tests are replaced by successful ones.
---
 src/PhpunitMerger/Command/LogCommand.php | 53 +++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/PhpunitMerger/Command/LogCommand.php b/src/PhpunitMerger/Command/LogCommand.php
index 8f5b2ff..edc6ec6 100644
--- a/src/PhpunitMerger/Command/LogCommand.php
+++ b/src/PhpunitMerger/Command/LogCommand.php
@@ -82,7 +82,8 @@ private function addTestSuites(\DOMElement $parent, array $testSuites)
         foreach ($testSuites as $testSuite) {
             if (empty($testSuite['@attributes']['name'])) {
                 if (!empty($testSuite['testsuite'])) {
-                    $this->addTestSuites($parent, $testSuite['testsuite']);
+                    $children = isset($testSuite['testsuite']['@attributes']) ? [$testSuite['testsuite']] : $testSuite['testsuite'];
+                    $this->addTestSuites($parent, $children);
                 }
                 continue;
             }
@@ -95,7 +96,7 @@ private function addTestSuites(\DOMElement $parent, array $testSuites)
                 $element->setAttribute('parent', $parent->getAttribute('name'));
                 $attributes = $testSuite['@attributes'] ?? [];
                 foreach ($attributes as $key => $value) {
-                    $value = $key === 'name' ? $value : 0;
+                    $value = $key === 'name' || $key === 'file' ? $value : 0;
                     $element->setAttribute($key, (string)$value);
                 }
                 $parent->appendChild($element);
@@ -116,27 +117,67 @@ private function addTestSuites(\DOMElement $parent, array $testSuites)
 
     private function addTestCases(\DOMElement $parent, array $testCases)
     {
+        $statusTags = [
+            'error' => 'errors',
+            'failure' => 'failures',
+            'skipped' => 'skipped',
+            'warning' => 'warnings',
+        ];
+
         foreach ($testCases as $testCase) {
             $attributes = $testCase['@attributes'] ?? [];
             if (empty($testCase['@attributes']['name'])) {
                 continue;
             }
             $name = $testCase['@attributes']['name'];
+            $class = $testCase['@attributes']['class'];
+            if (isset($this->domElements[$class . '::' . $name])) {
+                $previusTestCase = $this->domElements[$class . '::' . $name];
+                $previousTime = (float) ($previusTestCase->getAttribute('time') ?? 0);
+                $newTime = (float) ($testCase['@attributes']['time'] ?? 0);
+                $hasActualTestCaseAStatusTag = !empty(array_intersect(array_keys($testCase), array_keys($statusTags)));
+                $hasPreviusTestCaseAStatusTag = $previusTestCase->childNodes->length > 0;
+
+                if ($hasActualTestCaseAStatusTag ||
+                    !$hasPreviusTestCaseAStatusTag &&
+                    $newTime < $previousTime) {
+                    continue;
+                }
 
-            if (isset($this->domElements[$name])) {
-                continue;
+                $this->addAttributeValueToTestSuite($parent, 'tests', -1);
+                foreach ($previusTestCase->childNodes as $child) {
+                    $this->addAttributeValueToTestSuite($parent, $statusTags[$child->nodeName], -1);
+                }
+                foreach ($previusTestCase->attributes as $attribute) {
+                    if (!is_numeric($attribute->nodeValue) || $attribute->nodeName === 'line') {
+                        continue;
+                    }
+                    $this->addAttributeValueToTestSuite($parent, $attribute->nodeName, -$attribute->nodeValue);
+                }
+
+                $parent->removeChild($previusTestCase);
+                unset($this->domElements[$class . '::' . $name]);
             }
 
             $element = $this->document->createElement('testcase');
             foreach ($attributes as $key => $value) {
                 $element->setAttribute($key, (string)$value);
-                if (!is_numeric($value)) {
+                if (!is_numeric($value) || $key === 'line') {
                     continue;
                 }
                 $this->addAttributeValueToTestSuite($parent, $key, $value);
             }
+
+            $this->addAttributeValueToTestSuite($parent, 'tests', 1);
+            foreach ($statusTags as $key => $value) {
+                if (isset($testCase[$key])) {
+                    $this->addAttributeValueToTestSuite($parent, $value, 1);
+                    $element->appendChild($this->document->createElement($key));
+                }
+            }
+
             $parent->appendChild($element);
-            $this->domElements[$name] = $element;
+            $this->domElements[$class . '::' . $name] = $element;
         }
     }