feature #21828 [PhpUnitBridge] include expected deprecations in assertion counter (xabbuh)

nicolas-grekas · nicolas-grekas · commit 18315b492272 · 2017-03-02T13:15:41.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [PhpUnitBridge] include expected deprecations in assertion counter | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21786 (comment) | License | MIT | Doc PR | We still need to include the changes from #21786 as we cannot increment the number of assertions in the `startTest()` method (the PHPUnit test runner resets the counter after the listeners have been executed). Commits ------- cdcd5ae include expected deprecations in assertion counter
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -246,6 +246,10 @@ public function endTest($test, $time)
         }
 
         if ($this->expectedDeprecations) {
+            if (!in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE), true)) {
+                $test->addToAssertionCount(count($this->expectedDeprecations));
+            }
+
             restore_error_handler();
 
             if (!in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE, $BaseTestRunner::STATUS_FAILURE, $BaseTestRunner::STATUS_ERROR), true)) {

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,10 @@ public function endTest($test, $time)`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`if ($this->expectedDeprecations) {`
	`249`	`+ if (!in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE), true)) {`
	`250`	`+ $test->addToAssertionCount(count($this->expectedDeprecations));`
	`251`	`+ }`
	`252`	`+`
`249`	`253`	`restore_error_handler();`
`250`	`254`
`251`	`255`	`if (!in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE, $BaseTestRunner::STATUS_FAILURE, $BaseTestRunner::STATUS_ERROR), true)) {`