8000 Better FS structure & avoid to run fixture test in the main test suite · symfony/symfony@87aebab · GitHub
[go: up one dir, main page]
Skip to content

Commit 87aebab

Browse files
lyrixxlyrixx
committed
Better FS structure & avoid to run fixture test in the main test suite
1 parent b99c193 commit 87aebab

File tree

11 files changed

+8
-4
lines changed

11 files changed

+8
-4
lines changed

‎src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function test()
1212
$this->markTestSkipped('This test cannot be run on Windows.');
1313
}
1414

15-
$dir = __DIR__.'/../Tests-Fixtures/coverage';
15+
$dir = __DIR__.'/../Tests/Fixtures/coverage';
1616
$php = PHP_BINARY;
1717
$phpunit = $_SERVER['argv'][0];
1818

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/phpunit-with-listener.xml.dist renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-with-listener.xml.dist

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/phpunit-without-listener.xml.dist renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/phpunit-without-listener.xml.dist

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/src/Bar.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/src/Foo.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/tests/BarTest.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ class BarTest extends TestCase
1515
{
1616
public function testBar()
1717
{
18+
if (!class_exists('Foo')) {
19+
$this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');
20+
}
21+
1822
$foo = new Foo();
1923
$bar = new Bar($foo);
2024

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/tests/CoversDefaultClassTest.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversDefaultClassTest.php

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/tests/CoversNothingTest.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversNothingTest.php

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/tests/CoversTest.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/CoversTest.php

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/tests/SutNotFindTest.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php

File renamed without changes.

‎src/Symfony/Bridge/PhpUnit/Tests-Fixtures/coverage/tests/bootstrap.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
require __DIR__.'/../src/Bar.php';
1313
require __DIR__.'/../src/Foo.php';
1414

15-
require __DIR__.'/../../../Legacy/CoverageListenerTrait.php';
15+
require __DIR__.'/../../../../Legacy/CoverageListenerTrait.php';
1616
if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
17-
require __DIR__.'/../../../Legacy/CoverageListener.php';
17+
require __DIR__.'/../../../../Legacy/CoverageListener.php';
1818
}
19-
require __DIR__.'/../../../CoverageListener.php';
19+
require __DIR__.'/../../../../CoverageListener.php';

0 commit comments

Comments
 (0)
0