Add Calculations based on first level nodes.

We should assume that the calculation from PHPUnit is correct so we have to recalculate the base node only.

Add Subnodes of testcase node also beacuse it contains important error messages

Author: Forestsoft-de

src/PhpunitMerger/Command/LogCommand.php

@@ -22,6 +22,8 @@ class LogCommand extends Command
      */
     private $domElements = [];
 
+    private $keysToCalculate = ["assertions", "time", "tests", "errors", "failures", "skipped"];
+
     protected function configure()
     {
         $this->setName('log')
@@ -49,26 +51,29 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $root = $this->document->createElement('testsuites');
         $baseSuite = $this->document->createElement('testsuite');
-        $baseSuite->setAttribute('name', "");
+        $baseSuite->setAttribute('name', "All Suites");
         $baseSuite->setAttribute('tests', "0");
         $baseSuite->setAttribute('assertions', "0");
         $baseSuite->setAttribute('errors', "0");
         $baseSuite->setAttribute('failures', "0");
         $baseSuite->setAttribute('skipped', "0");
         $baseSuite->setAttribute('time', "0");
 
+        $this->domElements["All Suites"] = $baseSuite;
+
         $root->appendChild($baseSuite);
         $this->document->appendChild($root);
 
         foreach ($finder as $file) {
             try {
                 $xml = new \SimpleXMLElement(file_get_contents($file->getRealPath()));
+                $code = json_encode($xml);
                 $xmlArray = json_decode(json_encode($xml), true);
                 if (!empty($xmlArray)) {
                     $this->addTestSuites($baseSuite, $xmlArray);
                 }
             } catch (\Exception $exception) {
-                // Initial fallthrough
+                $output->writeln(sprintf("<error>Error in file %s: %s</error>", $file->getRealPath(), $exception->getMessage()));
             }
         }
 
@@ -77,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $domElement->removeAttribute('parent');
             }
         }
-
+        $this->calculateTopLevelStats();
         $file = $input->getArgument('file');
         if (!is_dir(dirname($file))) {
             @mkdir(dirname($file), 0777, true);
@@ -135,24 +140,31 @@ private function addTestCases(\DOMElement $parent, array $testCases)
             if (isset($this->domElements[$name])) {
                 continue;
             }
-
             $element = $this->document->createElement('testcase');
             foreach ($attributes as $key => $value) {
                 $element->setAttribute($key, (string)$value);
-                if (!is_numeric($value)) {
-                    continue;
-                }
-                $this->addAttributeValueToTestSuite($parent, $key, $value);
+            }
+            if (isset($testCase['failure']) || isset($testCase['warning']) || isset($testCase['error'])) {
+                $this->addChildElements($testCase, $element);
             }
             $parent->appendChild($element);
             $this->domElements[$name] = $element;
         }
     }
-
+    private function addChildElements(array $tree, \DOMElement $element)
+    {
+        foreach ($tree as $key => $value) {
+            if ($key == "@attributes") {
+                continue;
+            }
+            $child = $this->document->createElement($key);
+            $child->nodeValue = $value;
+            $element->appendChild($child);
+        }
+    }
     private function addAttributeValueToTestSuite(\DOMElement $element, $key, $value)
     {
-        $keysToCalculate = ["assertions", "time", "tests", "errors", "failures", "skipped"];
-        if (in_array($key, $keysToCalculate)) {
+        if (in_array($key, $this->keysToCalculate)) {
             $currentValue = $element->hasAttribute($key) ? $element->getAttribute($key) : 0;
             $element->setAttribute($key, (string)($currentValue + $value));
 
@@ -164,4 +176,26 @@ private function addAttributeValueToTestSuite(\DOMElement $element, $key, $value
             }
         }
     }
+
+    private function calculateTopLevelStats()
+    {
+        /** @var \DOMElement $topNode */
+        $suites = $this->document->getElementsByTagName("testsuites")->item(0);
+        $topNode = $suites->firstChild;
+        if ($topNode->hasChildNodes()) {
+            $stats = array_flip($this->keysToCalculate);
+            $stats = array_map(function ($_value) { return 0; }, $stats);
+            foreach($topNode->childNodes as $child) {
+                $attributes = $child->attributes;
+                foreach ($attributes as $key => $value) {
+                    if (in_array($key, $this->keysToCalculate)) {
+                        $stats[$key] += $value->nodeValue;
+                    }
+                }
+            }
+            foreach ($stats as $key => $value) {
+                $topNode->setAttribute($key, (string)$value);
+            }
+        }
+    }
 }