Consistently handle test runner warnings and test suite warnings

sebastianbergmann · Jan 14, 2023 · 5c71771 · 5c71771
1 parent ee28807
commit 5c71771
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 19 deletions.
diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -571,7 +571,7 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
             $warnings[] = 'Directives printerClass and testdox are mutually exclusive';
         }
 
-        foreach ($warnings as $warning) {
+        foreach (array_merge($warnings, $suite->warnings()) as $warning) {
             $this->writeMessage('Warning', $warning);
         }
 
@@ -646,18 +646,6 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
             }
         }
 
-        $testSuiteWarningsPrinted = false;
-
-        foreach ($suite->warnings() as $warning) {
-            $this->writeMessage('Warning', $warning);
-
-            $testSuiteWarningsPrinted = true;
-        }
-
-        if ($testSuiteWarningsPrinted) {
-            $this->write(PHP_EOL);
-        }
-
         $suite->run($result);
 
         foreach ($this->extensions as $extension) {

diff --git a/tests/end-to-end/generic/dataprovider-issue-2922.phpt b/tests/end-to-end/generic/dataprovider-issue-2922.phpt
@@ -12,7 +12,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sSecondTest.php
                Class name was 'SecondHelloWorldTest', expected 'SecondTest'

diff --git a/tests/end-to-end/generic/filename-matches-class-name.phpt b/tests/end-to-end/generic/filename-matches-class-name.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sWrongClassNameTest.php
                Class name was 'WrongClassNameBar', expected 'WrongClassNameTest'

diff --git a/tests/end-to-end/generic/test-suffix-multiple.phpt b/tests/end-to-end/generic/test-suffix-multiple.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sBankAccountTest.test.php
                Class name was 'BankAccountWithCustomExtensionTest', expected 'BankAccountTest'

diff --git a/tests/end-to-end/generic/test-suffix-single.phpt b/tests/end-to-end/generic/test-suffix-single.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sBankAccountTest.test.php
                Class name was 'BankAccountWithCustomExtensionTest', expected 'BankAccountTest'

diff --git a/tests/end-to-end/generic/two-classes-per-file-invalid.phpt b/tests/end-to-end/generic/two-classes-per-file-invalid.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sTwoClassesInvalidTest.php
                Class name was 'TwoClassesInvalid', expected 'TwoClassesInvalidTest'

diff --git a/tests/end-to-end/regression/2972.phpt b/tests/end-to-end/regression/2972.phpt
@@ -11,7 +11,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sunconventiallyNamedIssue2972Test.php
                Class name was 'Issue2972Test', expected 'unconventiallyNamedIssue2972Test'