Removed Provider tests are they are not required/covered by the lower…

… level tests. Added remaining tests for the base Metar class.

lib/Helpers/MetarHTTPClient.php

@@ -39,15 +39,11 @@ public function __construct($config = [])
      * Make a HTTP request and retrieve the body.
      * @param string $url The URL to request
      * @return string
-     * @throws Exception
      */
     public function getMetarAPIResponse($url)
     {
         $client = new HttpClient($this->guzzle_conf);
         $response = $client->get($url);
-        if ($response->getStatusCode() != 200) {
-            throw new Exception('An error occured when attempting to access the remote webservice, please try again shortly!');
-        }
         return $response->getBody();
     }
 }

tests/MetarHttpClientTest.php

@@ -1,11 +1,7 @@
 <?php
-use \PHPUnit_Framework_TestCase;
-use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Exception\RequestException;
 
 /**
  * Metar
@@ -19,7 +15,7 @@
  * @link http://www.bobbyallen.me
  *
  */
-class MetarHttpClientTest extends PHPUnit_Framework_TestCase
+class MetarHttpClientTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
@@ -72,4 +68,18 @@ public function testInvalidReport()
         $this->setExpectedException('Exception', 'Client error: `GET http://metar.vatsim.net/metar.php?id=EGSSA` resulted in a `404 Not Found` response:');
         $client->getMetarAPIResponse(sprintf(self::VATSIM_SERVICE_URL, 'EGSSA'));
     }
+
+    /**
+     * Test recieving an unprocessable response (eg. a 502 response).
+     */
+    public function testServiceUnavailableRepsonse()
+    {
+        $mock = new MockHandler([
+            new Response(502),
+        ]);
+        $this->handler = HandlerStack::create($mock);
+        $client = new Ballen\Metar\Helpers\MetarHTTPClient(['handler' => $this->handler]);
+        $this->setExpectedException('Exception', 'Server error: `GET http://metar.vatsim.net/metar.php?id=EGSS` resulted in a `502 Bad Gateway` respsone:');
+        $client->getMetarAPIResponse(sprintf(self::VATSIM_SERVICE_URL, 'EGSS'));
+    }
 }

tests/MetarTest.php

@@ -1,5 +1,4 @@
 <?php
-use \PHPUnit_Framework_TestCase;
 use Ballen\Metar\Metar;
 
 /**
@@ -14,7 +13,7 @@
  * @link http://www.bobbyallen.me
  *
  */
-class MetarTest extends PHPUnit_Framework_TestCase
+class MetarTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetValidIcao()
@@ -35,7 +34,7 @@ public function testSetValidProvider()
     }
 
     public function testSetInvalidProvider()
-    {    
+    {
         $metar = new Metar('EGSS');
         $this->setExpectedException('InvalidArgumentException', 'The service provider your specified does not exist in the namespace \'' . Metar::SERVICES_NAMESPACE . '\'');
         $metar->setProvider('An_Invalid_Provider');