Closes #4979

sebastianbergmann · Jan 10, 2023 · 5ff9aa4 · 5ff9aa4
1 parent 3b8daff
commit 5ff9aa4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 15 deletions.
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -35,6 +35,7 @@
 use PHPUnit\Metadata\Api\HookMethods;
 use PHPUnit\Metadata\Api\Requirements;
 use PHPUnit\Metadata\MetadataCollection;
+use PHPUnit\Runner\Exception as RunnerException;
 use PHPUnit\Runner\Filter\Factory;
 use PHPUnit\Runner\PhptTestCase;
 use PHPUnit\Runner\TestSuiteLoader;
@@ -236,20 +237,31 @@ public function addTestSuite(ReflectionClass $testClass): void
      * added, a <code>PHPUnit\Framework\WarningTestCase</code> will be created instead,
      * leaving the current test run untouched.
      *
-     * @throws \PHPUnit\Runner\Exception
      * @throws Exception
      */
     public function addTestFile(string $filename): void
     {
         if (is_file($filename) && str_ends_with($filename, '.phpt')) {
-            $this->addTest(new PhptTestCase($filename));
+            try {
+                $this->addTest(new PhptTestCase($filename));
+            } catch (RunnerException $e) {
+                Event\Facade::emitter()->testRunnerTriggeredWarning(
+                    $e->getMessage()
+                );
+            }
 
             return;
         }
 
-        $this->addTestSuite(
-            (new TestSuiteLoader)->load($filename)
-        );
+        try {
+            $this->addTestSuite(
+                (new TestSuiteLoader)->load($filename)
+            );
+        } catch (RunnerException $e) {
+            Event\Facade::emitter()->testRunnerTriggeredWarning(
+                $e->getMessage()
+            );
+        }
     }
 
     /**

diff --git a/...st-class/directory-with-concrete-test-class-and-abstract-test-class-with-test-suffix.phpt b/...st-class/directory-with-concrete-test-class-and-abstract-test-class-with-test-suffix.phpt
@@ -1,8 +1,5 @@
 --TEST--
 phpunit ../../../_files/abstract/with-test-suffix
---SKIPIF--
-<?php declare(strict_types=1);
-print 'skip: https://github.com/sebastianbergmann/phpunit/issues/4979';
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
@@ -12,3 +9,17 @@ $_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/with-test-suffix';
 require_once __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Application::main();
 --EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+There was 1 PHPUnit warning:
+
+1) Class PHPUnit\TestFixture\AbstractTest declared in %sAbstractTest.php is abstract
+
+WARNINGS!
+Tests: 1, Assertions: 1, Warnings: 1.
diff --git a/tests/end-to-end/generic/filename-matches-class-name.phpt b/tests/end-to-end/generic/filename-matches-class-name.phpt
@@ -8,11 +8,14 @@ $_SERVER['argv'][] = __DIR__ . '/../../_files/OneClassPerFile/wrongClassName/';
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-try {
-    PHPUnit\TextUI\Application::main();
-} catch (\Exception $e) {
-    echo $e->getMessage();
-}
-?>
+PHPUnit\TextUI\Application::main();
 --EXPECTF--
-Class WrongClassNameTest cannot be found in %sWrongClassNameTest.php
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+There was 1 PHPUnit warning:
+
+1) Class WrongClassNameTest cannot be found in %sWrongClassNameTest.php
+
+No tests executed!