Merge pull request #105 from FriendsOfSymfony/test-exception

testing guzzle exceptions

Author: ddeboer

src/ProxyClient/AbstractProxyClient.php

@@ -18,7 +18,7 @@
 use Guzzle\Http\Client;
 use Guzzle\Http\ClientInterface;
 use Guzzle\Http\Exception\CurlException;
-use Guzzle\Http\Exception\MultiTransferException;
+use Guzzle\Common\Exception\ExceptionCollection as GuzzleExceptionCollection;
 use Guzzle\Http\Exception\RequestException;
 use Guzzle\Http\Message\RequestInterface;
 
@@ -173,19 +173,19 @@ private function sendRequests(array $requests)
 
         try {
             $this->client->send($allRequests);
-        } catch (MultiTransferException $e) {
+        } catch (GuzzleExceptionCollection $e) {
             $this->handleException($e);
         }
     }
 
     /**
      * Handle request exception
      *
-     * @param MultiTransferException $exceptions
+     * @param GuzzleExceptionCollection $exceptions
      *
      * @throws ExceptionCollection
      */
-    protected function handleException(MultiTransferException $exceptions)
+    protected function handleException(GuzzleExceptionCollection $exceptions)
     {
         $collection = new ExceptionCollection();
 

tests/Unit/ProxyClient/VarnishTest.php

@@ -15,6 +15,8 @@
 use FOS\HttpCache\ProxyClient\Varnish;
 use Guzzle\Http\Client;
 use Guzzle\Http\Exception\CurlException;
+use Guzzle\Http\Exception\MultiTransferException;
+use Guzzle\Http\Exception\RequestException;
 use Guzzle\Plugin\Mock\MockPlugin;
 use Guzzle\Http\Message\Response;
 use Guzzle\Http\Message\Request;
@@ -176,6 +178,56 @@ public function testUnreachableException()
         $varnish->purge('/path')->flush();
     }
 
+    public function curlExceptionProvider()
+    {
+        $requestException = new RequestException('request');
+        $requestException->setRequest(new Request('GET', '/'));
+
+        $curlException = new CurlException('curl');
+        $curlException->setRequest(new Request('GET', '/'));
+        return array(
+            array($curlException, '\FOS\HttpCache\Exception\ProxyUnreachableException'),
+            array($requestException, '\FOS\HttpCache\Exception\ProxyResponseException'),
+            array(new \InvalidArgumentException('something'), '\InvalidArgumentException'),
+        );
+    }
+
+    /**
+     * @dataProvider curlExceptionProvider
+     *
+     * @param \Exception $exception The exception that curl should throw.
+     * @param string     $type      The returned exception class to be expected.
+     */
+    public function testExceptions(\Exception $exception, $type)
+    {
+        // the guzzle mock plugin does not allow arbitrary exceptions
+        // mockery does not provide all methods of the interface
+        $collection = new MultiTransferException();
+        $collection->setExceptions(array($exception));
+        $client = $this->getMock('\Guzzle\Http\ClientInterface');
+        $client->expects($this->any())
+            ->method('createRequest')
+            ->willReturn(new Request('GET', '/'))
+        ;
+        $client->expects($this->once())
+            ->method('send')
+            ->willThrowException($collection)
+        ;
+
+        $varnish = new Varnish(array('http://127.0.0.1:123'), 'my_hostname.dev', $client);
+
+        $varnish->ban(array());
+        try {
+            $varnish->flush();
+            $this->fail('Should have aborted with an exception');
+        } catch (ExceptionCollection $exceptions) {
+            $this->assertCount(1, $exceptions);
+            $this->assertInstanceOf($type, $exceptions->getFirst());
+        } catch (\Exception $e) {
+            die(get_class($e));
+        }
+    }
+
     /**
      * @expectedException \FOS\HttpCache\Exception\MissingHostException
      * @expectedExceptionMessage cannot be invalidated without a host