[Bridge] Corrects bug in test listener trait

magikid · magikid · commit ebf388a0f443 · 2022-06-27T14:32:49.000-04:00
If you enable the `SymfonyTestsListenerTrait`, use the `ExpectDeprecationTrait`, and call `$this->expectNotToPerformAssertions()`, an error was returned in your test saying it was risky as it did not perform any assertions even though it was expected not to. This bug turned out to be caused by not checking if the `doesNotPerformAssertions` flag had been set. Issue: #41444
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -271,7 +271,7 @@ public function endTest($test, $time)
             $assertions = \count(self::$expectedDeprecations) + $test->getNumAssertions();
             if ($test->doesNotPerformAssertions() && $assertions > 0) {
                 $test->getTestResultObject()->addFailure($test, new RiskyTestError(sprintf('This test is annotated with "@doesNotPerformAssertions", but performed %s assertions', $assertions)), $time);
-            } elseif ($assertions === 0 && $test->getTestResultObject()->noneSkipped()) {
+            } elseif ($assertions === 0 && !$test->doesNotPerformAssertions() && $test->getTestResultObject()->noneSkipped()) {
                 $test->getTestResultObject()->addFailure($test, new RiskyTestError('This test did not perform any assertions'), $time);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ public function endTest($test, $time)`
`271`	`271`	`$assertions = \count(self::$expectedDeprecations) + $test->getNumAssertions();`
`272`	`272`	`if ($test->doesNotPerformAssertions() && $assertions > 0) {`
`273`	`273`	`$test->getTestResultObject()->addFailure($test, new RiskyTestError(sprintf('This test is annotated with "@doesNotPerformAssertions", but performed %s assertions', $assertions)), $time);`
`274`		`- } elseif ($assertions === 0 && $test->getTestResultObject()->noneSkipped()) {`
	`274`	`+ } elseif ($assertions === 0 && !$test->doesNotPerformAssertions() && $test->getTestResultObject()->noneSkipped()) {`
`275`	`275`	`$test->getTestResultObject()->addFailure($test, new RiskyTestError('This test did not perform any assertions'), $time);`
`276`	`276`	`}`
`277`	`277`