Better FS structure & avoid to run fixture test in the main test suite

symfony · lyrixx · Jun 12, 2017 · Sep 21, 2017 · Sep 22, 2017 · Sep 22, 2017
commit 87aebab3c902683dfff12c6ddc8f9c13d3b99265
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
@@ -12,7 +12,7 @@ public function test()
            $this->markTestSkipped('This test cannot be run on Windows.');
        }

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


diff --git a/...s/coverage/phpunit-with-listener.xml.dist → ...s/coverage/phpunit-with-listener.xml.dist b/...s/coverage/phpunit-with-listener.xml.dist → ...s/coverage/phpunit-with-listener.xml.dist
diff --git a/...overage/phpunit-without-listener.xml.dist → ...overage/phpunit-without-listener.xml.dist b/...overage/phpunit-without-listener.xml.dist → ...overage/phpunit-without-listener.xml.dist
diff --git a/...pUnit/Tests-Fixtures/coverage/src/Bar.php → ...pUnit/Tests/Fixtures/coverage/src/Bar.php b/...pUnit/Tests-Fixtures/coverage/src/Bar.php → ...pUnit/Tests/Fixtures/coverage/src/Bar.php
diff --git a/...pUnit/Tests-Fixtures/coverage/src/Foo.php → ...pUnit/Tests/Fixtures/coverage/src/Foo.php b/...pUnit/Tests-Fixtures/coverage/src/Foo.php → ...pUnit/Tests/Fixtures/coverage/src/Foo.php
diff --git a/...Tests-Fixtures/coverage/tests/BarTest.php → ...Tests/Fixtures/coverage/tests/BarTest.php b/...Tests-Fixtures/coverage/tests/BarTest.php → ...Tests/Fixtures/coverage/tests/BarTest.php
@@ -15,6 +15,10 @@ class BarTest extends TestCase
 {
    public function testBar()
    {
+        if (!class_exists('Foo')) {
+            $this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');
+        }
+
        $foo = new Foo();
        $bar = new Bar($foo);


diff --git a/...coverage/tests/CoversDefaultClassTest.php → ...coverage/tests/CoversDefaultClassTest.php b/...coverage/tests/CoversDefaultClassTest.php → ...coverage/tests/CoversDefaultClassTest.php
diff --git a/...ures/coverage/tests/CoversNothingTest.php → ...ures/coverage/tests/CoversNothingTest.php b/...ures/coverage/tests/CoversNothingTest.php → ...ures/coverage/tests/CoversNothingTest.php
diff --git a/...ts-Fixtures/coverage/tests/CoversTest.php → ...ts/Fixtures/coverage/tests/CoversTest.php b/...ts-Fixtures/coverage/tests/CoversTest.php → ...ts/Fixtures/coverage/tests/CoversTest.php
diff --git a/...ixtures/coverage/tests/SutNotFindTest.php → ...ixtures/coverage/tests/SutNotFindTest.php b/...ixtures/coverage/tests/SutNotFindTest.php → ...ixtures/coverage/tests/SutNotFindTest.php
diff --git a/...sts-Fixtures/coverage/tests/bootstrap.php → ...sts/Fixtures/coverage/tests/bootstrap.php b/...sts-Fixtures/coverage/tests/bootstrap.php → ...sts/Fixtures/coverage/tests/bootstrap.php
@@ -12,8 +12,8 @@
 require __DIR__.'/../src/Bar.php';
 require __DIR__.'/../src/Foo.php';

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