Merge pull request #216 from toin0u/RefactorAdapters

Refactored: adapters and its tests

Author: willdurand

src/Geocoder/HttpAdapter/ZendHttpAdapter.php

@@ -37,12 +37,7 @@ public function getContent($url)
     {
         try {
             $response = $this->client->setUri($url)->send();
-
-            if ($response->isSuccess()) {
-                $content = $response->getBody();
-            } else {
-                $content = null;
-            }
+            $content  = $response->isSuccess() ? $response->getBody() : null;
         } catch (\Exception $e) {
             $content = null;
         }

tests/Geocoder/Tests/HttpAdapter/BuzzHttpAdapterTest.php

@@ -11,23 +11,30 @@
  */
 class BuzzHttpAdapterTest extends TestCase
 {
+    protected $buzz;
+
     protected function setUp()
     {
         if (!class_exists('Buzz\Browser')) {
             $this->markTestSkipped('Buzz library has to be installed');
         }
+
+        $this->buzz = new BuzzHttpAdapter();
     }
 
     public function testGetNullContent()
     {
-        $buzz = new BuzzHttpAdapter();
-        $this->assertNull($buzz->getContent(null));
+        $this->assertNull($this->buzz->getContent(null));
     }
 
     public function testGetFalseContent()
     {
-        $buzz = new BuzzHttpAdapter();
-        $this->assertNull($buzz->getContent(false));
+        $this->assertNull($this->buzz->getContent(false));
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('buzz', $this->buzz->getName());
     }
 
     public function testGetContentWithCustomBrowser()

tests/Geocoder/Tests/HttpAdapter/CurlHttpAdapterTest.php

@@ -11,22 +11,29 @@
  */
 class CurlHttpAdapterTest extends TestCase
 {
+    protected $curl;
+
     protected function setUp()
     {
         if (!function_exists('curl_init')) {
             $this->markTestSkipped('cURL has to be enabled.');
         }
+
+        $this->curl = new CurlHttpAdapter();
     }
 
     public function testGetNullContent()
     {
-        $curl = new CurlHttpAdapter();
-        $this->assertNull($curl->getContent(null));
+        $this->assertNull($this->curl->getContent(null));
     }
 
     public function testGetFalseContent()
     {
-        $curl = new CurlHttpAdapter();
-        $this->assertNull($curl->getContent(null));
+        $this->assertNull($this->curl->getContent(false));
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('curl', $this->curl->getName());
     }
 }

tests/Geocoder/Tests/HttpAdapter/GuzzleHttpAdapterTest.php

@@ -21,10 +21,7 @@ protected function setUp()
         }
     }
 
-    /**
-     * @covers Geocoder\HttpAdapter\GuzzleHttpAdapter::__construct
-     */
-    public function testCreatesDefaultClient()
+    public function testGetName()
     {
         $adapter = new GuzzleHttpAdapter();
         $this->assertEquals('guzzle', $adapter->getName());

tests/Geocoder/Tests/HttpAdapter/ZendHttpAdapterTest.php

@@ -12,23 +12,30 @@
  */
 class ZendHttpAdapterTest extends TestCase
 {
+    protected $zend;
+
     protected function setUp()
     {
         if (!class_exists('Zend\Http\Client')) {
             $this->markTestSkipped('Zend library has to be installed');
         }
+
+        $this->zend = new ZendHttpAdapter();
     }
 
     public function testGetNullContent()
     {
-        $zend = new ZendHttpAdapter();
-        $this->assertNull($zend->getContent(null));
+        $this->assertNull($this->zend->getContent(null));
     }
 
     public function testGetFalseContent()
     {
-        $zend = new ZendHttpAdapter();
-        $this->assertNull($zend->getContent(false));
+        $this->assertNull($this->zend->getContent(false));
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('zend', $this->zend->getName());
     }
 
     public function testGetContentWithCustomAdapter()