Fix Code Coverage on custom group with data provider (#785)

paratestphp · Aug 8, 2023 · 4d7ad5b · 4d7ad5b
1 parent a310a31
commit 4d7ad5b
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 3 deletions.
diff --git a/src/WrapperRunner/ApplicationForWrapperWorker.php b/src/WrapperRunner/ApplicationForWrapperWorker.php
@@ -84,14 +84,14 @@ public function runTest(string $testPath): int
             $testSuite     = TestSuite::fromClassReflector($testSuiteRefl);
         }
 
-        (new TestSuiteFilterProcessor())->process($this->configuration, $testSuite);
-
         if (CodeCoverage::instance()->isActive()) {
             CodeCoverage::instance()->ignoreLines(
                 (new CodeCoverageMetadataApi())->linesToBeIgnored($testSuite),
             );
         }
 
+        (new TestSuiteFilterProcessor())->process($this->configuration, $testSuite);
+
         if ($filter !== null) {
             $testSuite->injectFilter($filter);
 

diff --git a/test/Unit/WrapperRunner/WrapperRunnerTest.php b/test/Unit/WrapperRunner/WrapperRunnerTest.php
@@ -580,6 +580,17 @@ public function testHandleUnexpectedOutput(): void
         self::assertStringMatchesFormat($expectedOutput, $runnerResult->output);
     }
 
+    /** @group github */
+    #[CoversNothing]
+    public function testGroupOptionWithDataProviderAndCodeCoverageEnabled(): void
+    {
+        $this->bareOptions['--configuration'] = $this->fixture('github' . DIRECTORY_SEPARATOR . 'GH782' . DIRECTORY_SEPARATOR . 'phpunit.xml');
+        $this->bareOptions['--group']         = 'default';
+
+        $runnerResult = $this->runRunner();
+        self::assertSame(RunnerInterface::SUCCESS_EXIT, $runnerResult->exitCode);
+    }
+
     /**
      * \PHPUnit\Runner\Filter\NameFilterIterator uses `preg_match`, and in
      * \ParaTest\Tests\fixtures\function_parallelization_tests\FunctionalParallelizationTest::dataProvider2

diff --git a/test/fixtures/github/GH431/IssueTest.php b/test/fixtures/github/GH431/IssueTest.php
@@ -14,7 +14,7 @@ final class IssueTest extends TestCase
     public function testFillBuffers(): void
     {
         // the string is larger than the output buffer.
-        // if the parent process doesnt read the output buffer, this test will hang forever.
+        // if the parent process doesn't read the output buffer, this test will hang forever.
         echo str_repeat('a', 10000);
 
         $this->assertTrue(true);

diff --git a/test/fixtures/github/GH782/IssueTest.php b/test/fixtures/github/GH782/IssueTest.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ParaTest\Tests\fixtures\github\GH782;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+/** @internal */
+final class IssueTest extends TestCase
+{
+    #[DataProvider('provideThings')]
+    public function testProvider(bool $value): void
+    {
+        self::assertTrue((new Something($value))->value);
+    }
+
+    /** @return list<list<bool>> */
+    public static function provideThings(): array
+    {
+        return [
+            [true],
+        ];
+    }
+}
diff --git a/test/fixtures/github/GH782/Something.php b/test/fixtures/github/GH782/Something.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ParaTest\Tests\fixtures\github\GH782;
+
+/** @internal */
+final class Something
+{
+    public readonly bool $value;
+
+    public function __construct(bool $value)
+    {
+        $this->value = $value;
+    }
+}
diff --git a/test/fixtures/github/GH782/phpunit.xml b/test/fixtures/github/GH782/phpunit.xml
@@ -0,0 +1,17 @@
+<phpunit cacheDirectory="tmp">
+    <testsuites>
+        <testsuite name="Github issue">
+            <file>IssueTest.php</file>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <report>
+            <text outputFile="php://stdout"/>
+        </report>
+    </coverage>
+    <source>
+        <include>
+            <file>Something.php</file>
+        </include>
+    </source>
+</phpunit>
diff --git a/test/fixtures/github/GH782/tmp/.gitignore b/test/fixtures/github/GH782/tmp/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore