handle when no cli arguments

Author: nikophil

composer.lock

@@ -10,6 +10,7 @@
 namespace PHPUnit\Framework;
 
 use function count;
+use LogicException;
 use PHPUnit\Event;
 use PHPUnit\Event\Facade as EventFacade;
 use PHPUnit\Runner\Phpt\TestCase as PhptTestCase;
@@ -70,16 +71,28 @@ public function requires(): array
         return $this->tests[0]->requires();
     }
 
-    public function nameWithDataSet(): string
+    public function name(): string
     {
-        return $this->tests[0]->nameWithDataSet();
+        if ($this->isPhptTestCase()) {
+            throw new LogicException('Cannot call RepeatTestSuite::nameWithDataSet() on a PhptTestCase.');
+        }
+
+        return $this->tests[0]::class . '::' . $this->tests[0]->nameWithDataSet();
     }
 
     public function valueObjectForEvents(): Event\Code\Phpt|Event\Code\TestMethod
     {
         return $this->tests[0]->valueObjectForEvents();
     }
 
+    /**
+     * @phpstan-assert-if-true non-empty-list<PhptTestCase> $this->tests
+     */
+    public function isPhptTestCase(): bool
+    {
+        return $this->tests[0] instanceof PhptTestCase;
+    }
+
     private function runTestCase(): void
     {
         $defectOccurred = false;
@@ -122,12 +135,4 @@ private function runPhptTestCase(): void
             }
         }
     }
-
-    /**
-     * @phpstan-assert-if-true non-empty-list<PhptTestCase> $this->tests
-     */
-    private function isPhptTestCase(): bool
-    {
-        return $this->tests[0] instanceof PhptTestCase;
-    }
 }

src/Framework/RepeatTestSuite.php

@@ -13,6 +13,7 @@
 use function preg_match;
 use function sprintf;
 use function substr;
+use PHPUnit\Framework\RepeatTestSuite;
 use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestSuite;
 use PHPUnit\Runner\Phpt\TestCase as PhptTestCase;
@@ -56,11 +57,15 @@ public function accept(): bool
             return true;
         }
 
-        if ($test instanceof PhptTestCase) {
+        if ($test instanceof PhptTestCase || ($test instanceof RepeatTestSuite && $test->isPhptTestCase())) {
             return false;
         }
 
-        $name = $test::class . '::' . $test->nameWithDataSet();
+        if ($test instanceof RepeatTestSuite) {
+            $name = $test->name();
+        } else {
+            $name = $test::class . '::' . $test->nameWithDataSet();
+        }
 
         $accepted = @preg_match($this->regularExpression, $name, $matches) === 1;
 

src/Runner/Filter/NameFilterIterator.php

@@ -79,6 +79,7 @@ public function build(Configuration $configuration): TestSuite
                 $configuration->testSuite(),
                 $configuration->ignoreTestSelectionInXmlConfiguration() ? [] : $configuration->includeTestSuites(),
                 $configuration->ignoreTestSelectionInXmlConfiguration() ? [] : $configuration->excludeTestSuites(),
+                $configuration->repeatTimes(),
             );
         }
 

src/TextUI/Configuration/TestSuiteBuilder.php

@@ -36,12 +36,13 @@
      * @param non-empty-string       $xmlConfigurationFile
      * @param list<non-empty-string> $includeTestSuites
      * @param list<non-empty-string> $excludeTestSuites
+     * @param positive-int           $repeatTimes
      *
      * @throws RuntimeException
      * @throws TestDirectoryNotFoundException
      * @throws TestFileNotFoundException
      */
-    public function map(string $xmlConfigurationFile, TestSuiteCollection $configuredTestSuites, array $includeTestSuites, array $excludeTestSuites): TestSuiteObject
+    public function map(string $xmlConfigurationFile, TestSuiteCollection $configuredTestSuites, array $includeTestSuites, array $excludeTestSuites, int $repeatTimes = 1): TestSuiteObject
     {
         try {
             $result    = TestSuiteObject::empty($xmlConfigurationFile);
@@ -101,7 +102,7 @@ public function map(string $xmlConfigurationFile, TestSuiteCollection $configure
                         $processed[$file] = $testSuiteName;
                         $empty            = false;
 
-                        $testSuite->addTestFile($file, $groups);
+                        $testSuite->addTestFile($file, $groups, $repeatTimes);
                     }
                 }
 
@@ -130,11 +131,11 @@ public function map(string $xmlConfigurationFile, TestSuiteCollection $configure
                     $processed[$file->path()] = $testSuiteName;
                     $empty                    = false;
 
-                    $testSuite->addTestFile($file->path(), $file->groups());
+                    $testSuite->addTestFile($file->path(), $file->groups(), $repeatTimes);
                 }
 
                 if (!$empty) {
-                    $result->addTest($testSuite);
+                    $result->addTest($testSuite, [], $repeatTimes);
                 }
             }
 

src/TextUI/Configuration/Xml/TestSuiteMapper.php

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../../../phpunit.xsd"
+         cacheResult="false"
+>
+    <testsuites>
+        <testsuite name="default">
+            <file>RepeatTest.php</file>
+        </testsuite>
+    </testsuites>
+</phpunit>

tests/end-to-end/repeat/_files/phpunit.xml

@@ -0,0 +1,26 @@
+--TEST--
+Repeat option
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/_files/phpunit.xml';
+$_SERVER['argv'][] = '--repeat';
+$_SERVER['argv'][] = '2';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'test1';
+
+require __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime:       %s
+Configuration: %s/tests/end-to-end/repeat/_files/phpunit.xml
+
+..                                                                  2 / 2 (100%)
+
+Time: %s, Memory: %s MB
+
+OK (2 tests, 2 assertions)

tests/end-to-end/repeat/no-cli-argument-filtered.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Repeat option
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/_files/phpunit.xml';
+$_SERVER['argv'][] = '--repeat';
+$_SERVER['argv'][] = '2';
+
+require __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime:       %s
+Configuration: %s/tests/end-to-end/repeat/_files/phpunit.xml
+
+....                                                                4 / 4 (100%)
+
+Time: %s, Memory: %s MB
+
+OK (4 tests, 4 assertions)