[PhpUnitBridge] Fix tests with @doesNotPerformAssertions annotations

alexpott · nicolas-grekas · commit 4ad12320cdb8 · 2021-05-07T14:56:09.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -239,7 +239,7 @@ public function startTest($test)
                 }
 
                 if ($this->checkNumAssertions) {
-                    $this->checkNumAssertions = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything() && !$test->doesNotPerformAssertions();
+                    $this->checkNumAssertions = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything();
                 }
 
                 $test->getTestResultObject()->beStrictAboutTestsThatDoNotTestAnything(false);
@@ -268,7 +268,10 @@ public function endTest($test, $time)
         $groups = Test::getGroups($className, $test->getName(false));
 
         if ($this->checkNumAssertions) {
-            if (!self::$expectedDeprecations && !$test->getNumAssertions() && $test->getTestResultObject()->noneSkipped()) {
+            $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()) {
                 $test->getTestResultObject()->addFailure($test, new RiskyTestError('This test did not perform any assertions'), $time);
             }
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/FailTests/NoAssertionsTestRisky.php b/src/Symfony/Bridge/PhpUnit/Tests/FailTests/NoAssertionsTestRisky.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Tests\FailTests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+
+/**
+ * This class is deliberately suffixed with *TestRisky.php so that it is ignored
+ * by PHPUnit. This test is designed to fail. See ../expectrisky.phpt.
+ */
+final class NoAssertionsTestRisky extends TestCase
+{
+    use ExpectDeprecationTrait;
+
+    /**
+     * Do not remove this test in the next major version.
+     *
+     * @group legacy
+     */
+    public function testOne()
+    {
+        $this->expectNotToPerformAssertions();
+        $this->expectDeprecation('foo');
+        @trigger_error('foo', \E_USER_DEPRECATED);
+    }
+
+    /**
+     * Do not remove this test in the next major version.
+     */
+    public function testTwo()
+    {
+        $this->expectNotToPerformAssertions();
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt b/src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Test NoAssertionsTestRisky risky test
+--FILE--
+<?php
+$test =  realpath(__DIR__.'/FailTests/NoAssertionsTestRisky.php');
+passthru('php '.getenv('SYMFONY_SIMPLE_PHPUNIT_BIN_DIR').'/simple-phpunit.php --fail-on-risky --colors=never '.$test);
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+%ATesting Symfony\Bridge\PhpUnit\Tests\FailTests\NoAssertionsTestRisky
+R.                                                                  2 / 2 (100%)
+
+Time: %s, Memory: %s
+
+There was 1 risky test:
+
+1) Symfony\Bridge\PhpUnit\Tests\FailTests\NoAssertionsTestRisky::testOne
+This test is annotated with "@doesNotPerformAssertions", but performed 1 assertions
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 2, Assertions: 1, Risky: 1.

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public function startTest($test)`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`if ($this->checkNumAssertions) {`
`242`		`- $this->checkNumAssertions = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything() && !$test->doesNotPerformAssertions();`
	`242`	`+ $this->checkNumAssertions = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything();`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`$test->getTestResultObject()->beStrictAboutTestsThatDoNotTestAnything(false);`
`@@ -268,7 +268,10 @@ public function endTest($test, $time)`
`268`	`268`	`$groups = Test::getGroups($className, $test->getName(false));`
`269`	`269`
`270`	`270`	`if ($this->checkNumAssertions) {`
`271`		`- if (!self::$expectedDeprecations && !$test->getNumAssertions() && $test->getTestResultObject()->noneSkipped()) {`
	`271`	`+ $assertions = \count(self::$expectedDeprecations) + $test->getNumAssertions();`
	`272`	`+ if ($test->doesNotPerformAssertions() && $assertions > 0) {`
	`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()) {`
`272`	`275`	`$test->getTestResultObject()->addFailure($test, new RiskyTestError('This test did not perform any assertions'), $time);`
`273`	`276`	`}`
`274`	`277`