Commit12a4cfe

committed

Merge branch '3.2'

* 3.2: Fix test skip tests with failure and error states too hide stack trace of expected deprecation failures

2 parentsf71c699 +b703f32 commit12a4cfeCopy full SHA for 12a4cfe

File tree

-2

lines changed

src/Symfony
- Bridge/PhpUnit
  - SymfonyTestsListener.php
- Component/VarDumper/Tests/Caster
  - ExceptionCasterTest.php

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener`
`34`	`34`	`*/`
`35`	`35`	`publicfunction__construct(array$mockedNamespaces =array())`
`36`	`36`	`{`
	`37`	`+ \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] =1;`
	`38`	`+`
`37`	`39`	`$warn =false;`
`38`	`40`	`foreach ($mockedNamespacesas$type =>$namespaces) {`
`39`	`41`	`if (!is_array($namespaces)) {`
`@@ -175,7 +177,7 @@ public function endTest(\PHPUnit_Framework_Test $test, $time)`
`175`	`177`	`if ($this->expectedDeprecations) {`
`176`	`178`	`restore_error_handler();`
`177`	`179`
`178`		`-if (!in_array($test->getStatus(),array(\PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE),true)) {`
	`180`	`+if (!in_array($test->getStatus(),array(\PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE, \PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE, \PHPUnit_Runner_BaseTestRunner::STATUS_ERROR),true)) {`
`179`	`181`	`try {`
`180`	`182`	`$prefix ="@expectedDeprecation:\n";`
`181`	`183`	`$test->assertStringMatchesFormat($prefix.implode("\n",$this->expectedDeprecations),$prefix.implode("\n",$this->gatheredDeprecations));`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function testHtmlDump()`
`160`	`160`	-<span class=sf-dump-private title="Private property defined in class: `Exception`">trace</span>: {<samp>
`161`	`161`	`<span class=sf-dump-meta title="%sExceptionCasterTest.php`
`162`	`162`	`Stack level %d."><span class=sf-dump-ellipsis>%sVarDumper%eTests</span>%eCaster%eExceptionCasterTest.php</span>: <span class=sf-dump-num>26</span>`
`163`		`- …12`
	`163`	`+ …%d`
`164`	`164`	`</samp>}`
`165`	`165`	`</samp>}`
`166`	`166`	`</bar>`

Comments

(0)