feature #16502 [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 94ce455dc12f · 2015-11-09T11:30:40.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist | Q | A | ------------- | --- | Bug fix? | yes | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This fixes the currently failing tests on travis by: - checking for class existence before checking for groups, recursively now, when loading `@group time-sensitive` annotations - allow specifying extra clock-mocked namespaces in phpunit.xml files, required e.g. when HttpKernel is tested standalone and requires clock-mocks to be enabled for the HttpFoundation namespace. Commits ------- cd36c07 [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -20,11 +20,26 @@
  */
 class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
 {
+    private static $globallyEnabled = false;
     private $state = -1;
     private $skippedFile = false;
     private $wasSkipped = array();
     private $isSkipped = array();
 
+    public function __construct(array $extraClockMockedNamespaces = array())
+    {
+        if ($extraClockMockedNamespaces) {
+            foreach ($extraClockMockedNamespaces as $ns) {
+                ClockMock::register($ns.'\DummyClass');
+            }
+        }
+        if (self::$globallyEnabled) {
+            $this->state = -2;
+        } else {
+            self::$globallyEnabled = true;
+        }
+    }
+
     public function __destruct()
     {
         if (0 < $this->state) {
@@ -56,9 +71,16 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
                     }
                 }
             }
-            foreach ($suite->tests() as $test) {
-                if ($test instanceof \PHPUnit_Framework_TestSuite && in_array('time-sensitive', \PHPUnit_Util_Test::getGroups($test->getName()), true)) {
-                    ClockMock::register($test->getName());
+            $testSuites = array($suite);
+            for ($i = 0; isset($testSuites[$i]); ++$i) {
+                foreach ($testSuites[$i]->tests() as $test) {
+                    if ($test instanceof \PHPUnit_Framework_TestSuite) {
+                        if (class_exists($test->getName(), false) && in_array('time-sensitive', \PHPUnit_Util_Test::getGroups($test->getName()), true)) {
+                            ClockMock::register($test->getName());
+                        } else {
+                            $testSuites[] = $test;
+                        }
+                    }
                 }
             }
         } elseif (2 === $this->state) {
@@ -91,7 +113,7 @@ public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $ti
 
     public function startTest(\PHPUnit_Framework_Test $test)
     {
-        if ($test instanceof \PHPUnit_Framework_TestCase) {
+        if (-2 < $this->state && $test instanceof \PHPUnit_Framework_TestCase) {
             $groups = \PHPUnit_Util_Test::getGroups(get_class($test), $test->getName());
 
             if (in_array('time-sensitive', $groups, true)) {
@@ -103,7 +125,7 @@ public function startTest(\PHPUnit_Framework_Test $test)
 
     public function endTest(\PHPUnit_Framework_Test $test, $time)
     {
-        if ($test instanceof \PHPUnit_Framework_TestCase) {
+        if (-2 < $this->state && $test instanceof \PHPUnit_Framework_TestCase) {
             $groups = \PHPUnit_Util_Test::getGroups(get_class($test), $test->getName());
 
             if (in_array('time-sensitive', $groups, true)) {
diff --git a/src/Symfony/Component/HttpKernel/phpunit.xml.dist b/src/Symfony/Component/HttpKernel/phpunit.xml.dist
@@ -25,4 +25,14 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
+            <arguments>
+                <array>
+                    <element><string>Symfony\Component\HttpFoundation</string></element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
