diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflicts between Bridge/PhpUnit and Debug fixtures

Browse Source
This commit is contained in:
Nicolas Grekas 2017-09-29 12:59:58 +02:00
parent ace6464d5c
commit 3392f9f32d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
View File

@ -27,11 +27,11 @@ class CoverageListenerTest extends TestCase
exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text", $output);
$output = implode("\n", $output);
$this->assertContains('Foo', $output);
$this->assertContains('FooCov', $output);
exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text", $output);
$output = implode("\n", $output);
$this->assertNotContains('Foo', $output);
$this->assertNotContains('FooCov', $output);
$this->assertContains("SutNotFoundTest::test\nCould not find the tested class.", $output);
$this->assertNotContains("CoversTest::test\nCould not find the tested class.", $output);
$this->assertNotContains("CoversDefaultClassTest::test\nCould not find the tested class.", $output);

4
src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php → src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/BarCov.php
View File

@ -11,11 +11,11 @@
namespace PhpUnitCoverageTest;
class Bar
class BarCov
{
private $foo;
public function __construct(Foo $foo)
public function __construct(FooCov $foo)
{
$this->foo = $foo;
}

2
src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php → src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/FooCov.php
View File

@ -11,7 +11,7 @@
namespace PhpUnitCoverageTest;
class Foo
class FooCov
{
public function fooZ()
{

6
src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
View File

@ -17,12 +17,12 @@ class BarTest extends TestCase
{
public function testBar()
{
if (!class_exists('PhpUnitCoverageTest\Foo')) {
if (!class_exists('PhpUnitCoverageTest\FooCov')) {
$this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');
}
$foo = new \PhpUnitCoverageTest\Foo();
$bar = new \PhpUnitCoverageTest\Bar($foo);
$foo = new \PhpUnitCoverageTest\FooCov();
$bar = new \PhpUnitCoverageTest\BarCov($foo);
$this->assertSame('bar', $bar->barZ());
}

4
src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
View File

@ -9,8 +9,8 @@
* file that was distributed with this source code.
*/
require __DIR__.'/../src/Bar.php';
require __DIR__.'/../src/Foo.php';
require __DIR__.'/../src/BarCov.php';
require __DIR__.'/../src/FooCov.php';
require __DIR__.'/../../../../Legacy/CoverageListenerTrait.php';
if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {