Merge pull request #226 from FriendsOfSymfony/webserver-listener

Move WebServerListener

Author: dbu

doc/testing-your-application.rst

@@ -23,11 +23,40 @@ By having your test classes extend one of the test case classes, you get:
 The recommended way to configure the test case is by setting constants
 in your ``phpunit.xml``. Alternatively, you can override the getter methods.
 
+Web Server
+~~~~~~~~~~
+
 You will need to run a web server to provide the PHP application you want to
-test. The test cases only handle running the caching proxy. With PHP 5.4 or
-newer, the easiest is to use the PHP built in web server. See the
-``WebServerListener`` class in ``tests/Functional`` and how it is registered in
-``phpunit.xml.dist``.
+test. The test cases only handle running the caching proxy. It’s easiest to
+use PHP’s built in web server. Include the WebServerListener in your
+``phpunit.xml``:
+
+.. literalinclude:: ../phpunit.xml.dist
+    :prepend:
+        <?xml version="1.0" encoding="UTF-8"?>
+        <phpunit ...>
+            <listeners>
+    :language: xml
+    :start-after: <listeners>
+    :end-before: </listeners>
+    :append:
+            </listeners>
+        </phpunit>
+
+Then set the ``webserver`` group on your test to start PHP’s web server before
+it runs::
+
+    class YourTest extends \PHPUnit_Framework_TestCase
+    {
+        /**
+         * @group webserver
+         */
+        public function testYourApp()
+        {
+            // The web server will be started before this test code runs and
+            // shut down again after it finishes.
+        }
+    }
 
 Setting Constants
 ~~~~~~~~~~~~~~~~~

phpunit.xml.dist

@@ -15,12 +15,13 @@
     <filter>
         <whitelist>
             <directory>./src</directory>
+            <directory>./tests</directory>
         </whitelist>
     </filter>
 
     <listeners>
         <listener class="\Mockery\Adapter\Phpunit\TestListener" />
-        <listener class="\FOS\HttpCache\Tests\Functional\WebServerListener" />
+        <listener class="\FOS\HttpCache\Test\WebServerListener" />
     </listeners>
 
     <php>

tests/Functional/WebServerListener.php renamed to src/Test/WebServerListener.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace FOS\HttpCache\Tests\Functional;
+namespace FOS\HttpCache\Test;
 
 /**
  * A PHPUnit test listener that starts and stops the PHP built-in web server
@@ -41,7 +41,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
     {
         // Only run on PHP >= 5.4 as PHP below that and HHVM don't have a
         // built-in web server
-        if (defined('HHVM_VERSION') || version_compare(PHP_VERSION, '5.4.0', '<')) {
+        if (defined('HHVM_VERSION')) {
             return;
         }
 
@@ -155,17 +155,6 @@ protected function waitFor($ip, $port, $timeout)
             usleep(1000);
         }
 
-        $client = new \Guzzle\Http\Client();
-        $url = sprintf('http://%s:%d/cache.php', $this->getHostName(), $this->getPort());
-        for (; $i < $timeout; $i++) {
-            try {
-                if ($client->get($url)->send()->isSuccessful()) {
-                    return;
-                }
-            } catch (\Exception $e) {
-            }
-        }
-
         throw new \RuntimeException(
             sprintf(
                 'Webserver cannot be reached at %s:%s',