Repeat phpt tests

Author: nikophil

src/Framework/RepeatTestSuite.php

@@ -9,6 +9,8 @@
  */
 namespace PHPUnit\Framework;
 
+use PHPUnit\Event\Facade as EventFacade;
+use PHPUnit\Runner\Phpt\TestCase as PhptTestCase;
 use PHPUnit\TestRunner\TestResult\PassedTests;
 use PHPUnit\Event;
 
@@ -20,14 +22,14 @@
 final class RepeatTestSuite implements Test, Reorderable
 {
     /**
-     * @var non-empty-list<TestCase>
+     * @var non-empty-list<TestCase>|non-empty-list<PhptTestCase>
      */
     private array $tests;
 
     /**
      * @param positive-int $times
      */
-    public function __construct(TestCase $test, int $times)
+    public function __construct(TestCase|PhptTestCase $test, int $times)
     {
         $tests = [];
         for ($i = 0; $i < $times; $i++) {
@@ -43,6 +45,40 @@ public function count(): int
     }
 
     public function run(): void
+    {
+        if ($this->isPhptTestCase()) {
+            $this->runPhptTestCase();
+        } else {
+            $this->runTestCase();
+        }
+    }
+
+    public function sortId(): string
+    {
+        return $this->tests[0]->sortId();
+    }
+
+    public function provides(): array
+    {
+        return $this->tests[0]->provides();
+    }
+
+    public function requires(): array
+    {
+        return $this->tests[0]->requires();
+    }
+
+    public function nameWithDataSet(): string
+    {
+        return $this->tests[0]->nameWithDataSet();
+    }
+
+    public function valueObjectForEvents(): Event\Code\TestMethod|Event\Code\Phpt
+    {
+        return $this->tests[0]->valueObjectForEvents();
+    }
+
+    private function runTestCase(): void
     {
         $defectOccurred = false;
 
@@ -63,28 +99,33 @@ public function run(): void
         }
     }
 
-    public function sortId(): string
+    private function runPhptTestCase(): void
     {
-        return $this->tests[0]->sortId();
-    }
+        $defectOccurred = false;
 
-    public function provides(): array
-    {
-        return $this->tests[0]->provides();
-    }
+        foreach ($this->tests as $test) {
+            if ($defectOccurred) {
+                EventFacade::emitter()->testSkipped(
+                    $this->valueObjectForEvents(),
+                    'Test repetition failure',
+                );
 
-    public function requires(): array
-    {
-        return $this->tests[0]->requires();
-    }
+                continue;
+            }
 
-    public function nameWithDataSet(): string
-    {
-        return $this->tests[0]->nameWithDataSet();
+            $test->run();
+
+            if (!$test->passed()) {
+                $defectOccurred = true;
+            }
+        }
     }
 
-    public function valueObjectForEvents(): Event\Code\TestMethod
+    /**
+     * @phpstan-assert-if-true non-empty-list<PhptTestCase> $this->tests
+     */
+    private function isPhptTestCase(): bool
     {
-        return $this->tests[0]->valueObjectForEvents();
+        return $this->tests[0] instanceof PhptTestCase;
     }
 }

src/Framework/TestSuite.php

@@ -158,7 +158,7 @@ public function addTest(Test $test, array $groups = [], int $repeat = 1): void
 
         assert($test instanceof TestCase || $test instanceof PhptTestCase);
 
-        if ($test instanceof PhptTestCase || $repeat === 1) {
+        if ($repeat === 1) {
             $this->tests[] = $test;
         } else {
             $this->tests[] = new RepeatTestSuite($test, $repeat);
@@ -231,11 +231,11 @@ public function addTestSuite(ReflectionClass $testClass, array $groups = [], int
      *
      * @throws Exception
      */
-    public function addTestFile(string $filename, array $groups = []): void
+    public function addTestFile(string $filename, array $groups = [], int $repeat = 1): void
     {
         try {
             if (str_ends_with($filename, '.phpt') && is_file($filename)) {
-                $this->addTest(new PhptTestCase($filename));
+                $this->addTest(new PhptTestCase($filename), [], $repeat);
             } else {
                 $this->addTestSuite(
                     (new TestSuiteLoader)->load($filename),

src/Runner/Phpt/TestCase.php

@@ -70,12 +70,14 @@
  *
  * @see https://qa.php.net/phpt_details.php
  */
-final readonly class TestCase implements Reorderable, SelfDescribing, Test
+final class TestCase implements Reorderable, SelfDescribing, Test
 {
     /**
      * @var non-empty-string
      */
-    private string $filename;
+    private readonly string $filename;
+
+    private bool $passed = false;
 
     /**
      * @param non-empty-string $filename
@@ -242,6 +244,8 @@ public function run(): void
             $emitter->testPassed($this->valueObjectForEvents());
         }
 
+        $this->passed = $passed;
+
         $this->runClean($sections, CodeCoverage::instance()->isActive());
 
         $emitter->testFinished($this->valueObjectForEvents(), 1);
@@ -255,6 +259,11 @@ public function getName(): string
         return $this->toString();
     }
 
+    public function passed(): bool
+    {
+        return $this->passed;
+    }
+
     /**
      * Returns a string representation of the test case.
      */

src/TextUI/Configuration/TestSuiteBuilder.php

@@ -100,7 +100,7 @@ private function testSuiteFromPath(string $path, array $suffixes, int $repeat, ?
                 $suite = TestSuite::empty($path);
             }
 
-            $suite->addTestFile($path);
+            $suite->addTestFile($path, [], $repeat);
 
             return $suite;
         }

tests/end-to-end/repeat/_files/phpt/failure.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Repeat option
+--FILE--
+<?php
+
+echo 'ok';
+--EXPECTF--
+ko

tests/end-to-end/repeat/_files/phpt/success.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Repeat option
+--FILE--
+<?php
+
+echo 'ok';
+--EXPECTF--
+ok