Fix progress mangle (#725)

paratestphp · Feb 6, 2023 · 5346ac0 · 5346ac0
1 parent 87fc18b
commit 5346ac0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ all: csfix test
 
 vendor: composer.json
 	composer update
-	composer bump
+	#composer bump
 	touch vendor
 
 .PHONY: csfix

diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "phpunit/php-code-coverage": "^10.0",
         "phpunit/php-file-iterator": "^4.0",
         "phpunit/php-timer": "^6.0",
-        "phpunit/phpunit": "^10.0.3",
+        "phpunit/phpunit": "^10.0.4",
         "sebastian/environment": "^6.0",
         "symfony/console": "^6.2.5",
         "symfony/process": "^6.2.5"

diff --git a/src/WrapperRunner/ResultPrinter.php b/src/WrapperRunner/ResultPrinter.php
@@ -153,7 +153,11 @@ public function printFeedback(SplFileInfo $progressFile, array $teamcityFiles):
         }
 
         $feedbackItems = $this->tail($progressFile);
-        $feedbackItems = preg_replace('/ +\\d+ \\/ \\d+ \\(\\d+%\\)\\s*/', '', $feedbackItems);
+        if ($feedbackItems === '') {
+            return;
+        }
+
+        $feedbackItems = preg_replace('/ +\\d+ \\/ \\d+ \\( ?\\d+%\\)\\s*/', '', $feedbackItems);
 
         $actualTestCount = strlen($feedbackItems);
         for ($index = 0; $index < $actualTestCount; ++$index) {
@@ -230,14 +234,15 @@ private function printFeedbackItem(string $item): void
         }
 
         $this->output->write($this->getProgress() . "\n");
+        $this->column = 0;
     }
 
     private function printFeedbackItemColor(string $item): void
     {
         $buffer = match ($item) {
             'E' => $this->colorizeTextBox('fg-red, bold', $item),
             'F' => $this->colorizeTextBox('bg-red, fg-white', $item),
-            'W', 'I', 'R' => $this->colorizeTextBox('fg-yellow, bold', $item),
+            'I', 'N', 'D', 'R', 'W' => $this->colorizeTextBox('fg-yellow, bold', $item),
             'S' => $this->colorizeTextBox('fg-cyan, bold', $item),
             default => $item,
         };

diff --git a/test/Unit/WrapperRunner/ResultPrinterTest.php b/test/Unit/WrapperRunner/ResultPrinterTest.php
@@ -240,6 +240,27 @@ public function testTestdoxOutputWithoutProgress(): void
         static::assertSame($testdoxSourceContent, $this->output->fetch());
     }
 
+    public function testPrintFeedbackFromMultilineSource(): void
+    {
+        $source = <<<'EOF'
+        ...............................................................  63 / 300 ( 21%)
+        ............................................................... 126 / 300 ( 42%)
+        ............................................................... 189 / 300 ( 63%)
+        ............................................................... 252 / 300 ( 84%)
+        ................................................                300 / 300 (100%)
+
+        EOF;
+
+        $this->printer->setTestCount(300);
+        $this->printer->start();
+        $this->output->fetch();
+        $feedbackFile = $this->tmpDir . DS . 'feedback1';
+        file_put_contents($feedbackFile, $source);
+        $this->printer->printFeedback(new SplFileInfo($feedbackFile), []);
+        $contents = $this->output->fetch();
+        static::assertSame($source, $contents);
+    }
+
     private function getStartOutput(): string
     {
         $this->printer->start();

diff --git a/test/Unit/WrapperRunner/WrapperRunnerTest.php b/test/Unit/WrapperRunner/WrapperRunnerTest.php
@@ -265,11 +265,11 @@ public function testStopOnFailureEndsRunBeforeWholeTestSuite(): void
         $this->bareOptions['--processes'] = '1';
         $this->bareOptions['path']        = $this->fixture('common_results');
         $output                           = $this->runRunner()->output;
-        self::assertStringContainsString('Tests: 59, Assertions: 185,', $output);
+        self::assertStringContainsString('Tests: 60, Assertions: 187,', $output);
 
         $this->bareOptions['--stop-on-failure'] = true;
         $output                                 = $this->runRunner()->output;
-        self::assertStringContainsString('Tests: 53, Assertions: 182,', $output);
+        self::assertStringContainsString('Tests: 54, Assertions: 184,', $output);
     }
 
     public function testRaiseExceptionWhenATestCallsExitWithoutCoverageSingleProcess(): void