Testdox: fix summary report previously not shown (#772)

paratestphp · Jun 22, 2023 · 14ab034 · 14ab034
1 parent 970d21c
commit 14ab034
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/src/WrapperRunner/ResultPrinter.php b/src/WrapperRunner/ResultPrinter.php
@@ -192,37 +192,33 @@ public function printResults(TestResult $testResult, array $teamcityFiles, array
             return;
         }
 
+        $this->printer->print(PHP_EOL . (new ResourceUsageFormatter())->resourceUsageSinceStartOfRequest() . PHP_EOL . PHP_EOL);
+
         if ($this->options->configuration->outputIsTestDox()) {
             $this->output->write($this->tailMultiple($testdoxFiles));
-
-            return;
+        } else {
+            (new DefaultResultPrinter(
+                $this->printer,
+                true,
+                true,
+                true,
+                true,
+                true,
+                true,
+                $this->options->configuration->displayDetailsOnIncompleteTests(),
+                $this->options->configuration->displayDetailsOnSkippedTests(),
+                $this->options->configuration->displayDetailsOnTestsThatTriggerDeprecations(),
+                $this->options->configuration->displayDetailsOnTestsThatTriggerErrors(),
+                $this->options->configuration->displayDetailsOnTestsThatTriggerNotices(),
+                $this->options->configuration->displayDetailsOnTestsThatTriggerWarnings(),
+                false,
+            ))->print($testResult);
         }
 
-        $resultPrinter  = new DefaultResultPrinter(
-            $this->printer,
-            true,
-            true,
-            true,
-            true,
-            true,
-            true,
-            $this->options->configuration->displayDetailsOnIncompleteTests(),
-            $this->options->configuration->displayDetailsOnSkippedTests(),
-            $this->options->configuration->displayDetailsOnTestsThatTriggerDeprecations(),
-            $this->options->configuration->displayDetailsOnTestsThatTriggerErrors(),
-            $this->options->configuration->displayDetailsOnTestsThatTriggerNotices(),
-            $this->options->configuration->displayDetailsOnTestsThatTriggerWarnings(),
-            false,
-        );
-        $summaryPrinter = new SummaryPrinter(
+        (new SummaryPrinter(
             $this->printer,
             $this->options->configuration->colors(),
-        );
-
-        $this->printer->print(PHP_EOL . (new ResourceUsageFormatter())->resourceUsageSinceStartOfRequest() . PHP_EOL . PHP_EOL);
-
-        $resultPrinter->print($testResult);
-        $summaryPrinter->print($testResult);
+        ))->print($testResult);
     }
 
     private function printFeedbackItem(string $item): void

diff --git a/test/Unit/WrapperRunner/ResultPrinterTest.php b/test/Unit/WrapperRunner/ResultPrinterTest.php
@@ -231,7 +231,10 @@ public function testTestdoxOutputWithProgress(): void
         $this->printer->printFeedback(new SplFileInfo($feedbackFile), new SplFileInfo($outputFile), []);
         $this->printer->printResults($this->getEmptyTestResult(), [], [new SplFileInfo($testdoxSource)]);
 
-        self::assertSame('EEE' . $testdoxSourceContent, $this->output->fetch());
+        self::assertStringMatchesFormat(
+            'EEE' . "\n" . 'Time: %a, Memory: %a' . "\n\n" . $testdoxSourceContent . 'No tests executed!',
+            $this->output->fetch(),
+        );
     }
 
     public function testTestdoxOutputWithoutProgress(): void
@@ -252,7 +255,10 @@ public function testTestdoxOutputWithoutProgress(): void
         $this->printer->printFeedback(new SplFileInfo($feedbackFile), new SplFileInfo($outputFile), []);
         $this->printer->printResults($this->getEmptyTestResult(), [], [new SplFileInfo($testdoxSource)]);
 
-        self::assertSame($testdoxSourceContent, $this->output->fetch());
+        self::assertStringMatchesFormat(
+            "\n" . 'Time: %a, Memory: %a' . "\n\n" . $testdoxSourceContent . 'No tests executed!',
+            $this->output->fetch(),
+        );
     }
 
     public function testPrintFeedbackFromMultilineSource(): void