Tweak

sebastianbergmann · Jul 26, 2023 · 0c58250 · 0c58250
1 parent e9cf305
commit 0c58250
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 76 deletions.
diff --git a/src/TextUI/Output/Default/ResultPrinter.php b/src/TextUI/Output/Default/ResultPrinter.php
@@ -393,28 +393,24 @@ private function printIssueList(string $type, array $issues): void
                 $issue->line(),
             );
 
-            $body = trim($issue->description()) . PHP_EOL . PHP_EOL;
+            $body = trim($issue->description()) . PHP_EOL . PHP_EOL . 'Triggered by:';
 
             $triggeringTests = $issue->triggeringTests();
 
             ksort($triggeringTests);
 
             foreach ($triggeringTests as $triggeringTest) {
-                if ($triggeringTest['count'] !== 1) {
+                $body .= PHP_EOL . PHP_EOL . '* ' . $triggeringTest['test']->id();
+
+                if ($triggeringTest['count'] > 1) {
                     $body .= sprintf(
-                        'Triggered %d times by %s',
+                        ' (%d times)',
                         $triggeringTest['count'],
-                        $triggeringTest['test']->id(),
-                    );
-                } else {
-                    $body .= sprintf(
-                        'Triggered by %s',
-                        $triggeringTest['test']->id(),
                     );
                 }
 
                 if ($triggeringTest['test']->isTestMethod()) {
-                    $body .= PHP_EOL . $triggeringTest['test']->file() . ':' . $triggeringTest['test']->line();
+                    $body .= PHP_EOL . '  ' . $triggeringTest['test']->file() . ':' . $triggeringTest['test']->line();
                 }
             }
 

diff --git a/tests/end-to-end/cli/filter-error-handler/filter-for-error-handler-events-disabled.phpt b/tests/end-to-end/cli/filter-error-handler/filter-for-error-handler-events-disabled.phpt
@@ -27,14 +27,18 @@ Time: %s, Memory: %s
 1) %s/src/SourceClass.php:23
 warning
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 2) %s/vendor/VendorClass.php:10
 warning
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 --
 
@@ -43,14 +47,18 @@ Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomethi
 1) %s/src/SourceClass.php:22
 notice
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 2) %s/vendor/VendorClass.php:9
 notice
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 --
 
@@ -59,14 +67,18 @@ Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomethi
 1) %s/src/SourceClass.php:21
 deprecation
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 2) %s/vendor/VendorClass.php:8
 deprecation
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Warnings: 2, Deprecations: 2, Notices: 2.
diff --git a/tests/end-to-end/cli/filter-error-handler/filter-for-error-handler-events-enabled.phpt b/tests/end-to-end/cli/filter-error-handler/filter-for-error-handler-events-enabled.phpt
@@ -27,8 +27,10 @@ Time: %s, Memory: %s
 1) %s/src/SourceClass.php:23
 warning
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 --
 
@@ -37,8 +39,10 @@ Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomethi
 1) %s/src/SourceClass.php:22
 notice
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 --
 
@@ -47,8 +51,10 @@ Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomethi
 1) %s/src/SourceClass.php:21
 deprecation
 
-Triggered by PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
-%s/tests/SourceClassTest.php:16
+Triggered by:
+
+* PHPUnit\TestFixture\FilterErrorHandler\SourceClassTest::testSomething
+  %s/tests/SourceClassTest.php:16
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Warnings: 1, Deprecations: 1, Notices: 1.
diff --git a/tests/end-to-end/generic/outcome-and-issues.phpt b/tests/end-to-end/generic/outcome-and-issues.phpt
@@ -107,32 +107,42 @@ skipped message
 1) %sOutcomesAndIssuesTest.php:%d
 warning message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSuccessWithWarning
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testSuccessWithWarning
+  %sOutcomesAndIssuesTest.php:%d
 
 2) %sOutcomesAndIssuesTest.php:%d
 warning message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testFailWithWarning
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testFailWithWarning
+  %sOutcomesAndIssuesTest.php:%d
 
 3) %sOutcomesAndIssuesTest.php:%d
 warning message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testErrorWithWarning
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testErrorWithWarning
+  %sOutcomesAndIssuesTest.php:%d
 
 4) %sOutcomesAndIssuesTest.php:%d
 warning message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testIncompleteWithWarning
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testIncompleteWithWarning
+  %sOutcomesAndIssuesTest.php:%d
 
 5) %sOutcomesAndIssuesTest.php:%d
 warning message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithWarning
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithWarning
+  %sOutcomesAndIssuesTest.php:%d
 
 --
 
@@ -141,32 +151,42 @@ Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithWarning
 1) %sOutcomesAndIssuesTest.php:%d
 notice message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSuccessWithNotice
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testSuccessWithNotice
+  %sOutcomesAndIssuesTest.php:%d
 
 2) %sOutcomesAndIssuesTest.php:%d
 notice message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testFailWithNotice
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testFailWithNotice
+  %sOutcomesAndIssuesTest.php:%d
 
 3) %sOutcomesAndIssuesTest.php:%d
 notice message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testErrorWithNotice
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testErrorWithNotice
+  %sOutcomesAndIssuesTest.php:%d
 
 4) %sOutcomesAndIssuesTest.php:%d
 notice message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testIncompleteWithNotice
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testIncompleteWithNotice
+  %sOutcomesAndIssuesTest.php:%d
 
 5) %sOutcomesAndIssuesTest.php:%d
 notice message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithNotice
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithNotice
+  %sOutcomesAndIssuesTest.php:%d
 
 --
 
@@ -175,32 +195,42 @@ Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithNotice
 1) %sOutcomesAndIssuesTest.php:%d
 deprecation message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSuccessWithDeprecation
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testSuccessWithDeprecation
+  %sOutcomesAndIssuesTest.php:%d
 
 2) %sOutcomesAndIssuesTest.php:%d
 deprecation message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testFailWithDeprecation
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testFailWithDeprecation
+  %sOutcomesAndIssuesTest.php:%d
 
 3) %sOutcomesAndIssuesTest.php:%d
 deprecation message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testErrorWithDeprecation
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testErrorWithDeprecation
+  %sOutcomesAndIssuesTest.php:%d
 
 4) %sOutcomesAndIssuesTest.php:%d
 deprecation message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testIncompleteWithDeprecation
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testIncompleteWithDeprecation
+  %sOutcomesAndIssuesTest.php:%d
 
 5) %sOutcomesAndIssuesTest.php:%d
 deprecation message
 
-Triggered by PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithDeprecation
-%sOutcomesAndIssuesTest.php:%d
+Triggered by:
+
+* PHPUnit\TestFixture\OutcomesAndIssuesTest::testSkippedWithDeprecation
+  %sOutcomesAndIssuesTest.php:%d
 
 ERRORS!
 Tests: 17, Assertions: 7, Errors: 3, Failures: 3, Warnings: 5, Deprecations: 5, Notices: 5, Skipped: 3, Incomplete: 3, Risky: 1.
diff --git a/tests/unit/TextUI/Output/Default/expectations/successful_test_with_deprecation.txt b/tests/unit/TextUI/Output/Default/expectations/successful_test_with_deprecation.txt
@@ -3,8 +3,10 @@
 1) Foo.php:1
 message
 
-Triggered by FooTest::testBar
-FooTest.php:1
+Triggered by:
+
+* FooTest::testBar
+  FooTest.php:1
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Deprecations: 1.
diff --git a/tests/unit/TextUI/Output/Default/expectations/successful_test_with_error.txt b/tests/unit/TextUI/Output/Default/expectations/successful_test_with_error.txt
@@ -3,8 +3,10 @@
 1) Foo.php:1
 message
 
-Triggered by FooTest::testBar
-FooTest.php:1
+Triggered by:
+
+* FooTest::testBar
+  FooTest.php:1
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Errors: 1.
diff --git a/tests/unit/TextUI/Output/Default/expectations/successful_test_with_notice.txt b/tests/unit/TextUI/Output/Default/expectations/successful_test_with_notice.txt
@@ -3,8 +3,10 @@
 1) Foo.php:1
 message
 
-Triggered by FooTest::testBar
-FooTest.php:1
+Triggered by:
+
+* FooTest::testBar
+  FooTest.php:1
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Notices: 1.
diff --git a/tests/unit/TextUI/Output/Default/expectations/successful_test_with_php_deprecation.txt b/tests/unit/TextUI/Output/Default/expectations/successful_test_with_php_deprecation.txt
@@ -3,14 +3,18 @@
 1) Foo.php:1
 message
 
-Triggered by FooTest::testBar
-FooTest.php:1
+Triggered by:
+
+* FooTest::testBar
+  FooTest.php:1
 
 2) Foo.php:2
 another message
 
-Triggered by FooTest::testBar
-FooTest.php:1
+Triggered by:
+
+* FooTest::testBar
+  FooTest.php:1
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Deprecations: 2.
diff --git a/...unit/TextUI/Output/Default/expectations/successful_test_with_php_deprecation_multiple.txt b/...unit/TextUI/Output/Default/expectations/successful_test_with_php_deprecation_multiple.txt
@@ -3,8 +3,10 @@
 1) Foo.php:1
 message
 
-Triggered 2 times by FooTest::testBar
-FooTest.php:1
+Triggered by:
+
+* FooTest::testBar (2 times)
+  FooTest.php:1
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Deprecations: 1.
diff --git a/tests/unit/TextUI/Output/Default/expectations/successful_test_with_php_notice.txt b/tests/unit/TextUI/Output/Default/expectations/successful_test_with_php_notice.txt
@@ -3,8 +3,10 @@
 1) Foo.php:1
 message
 
-Triggered by FooTest::testBar
-FooTest.php:1
+Triggered by:
+
+* FooTest::testBar
+  FooTest.php:1
 
 OK, but there are issues!
 Tests: 1, Assertions: 1, Notices: 1.