Merge pull request #228 from toin0u/FixTests

Fixed provider's tests

Author: willdurand

tests/Geocoder/Tests/Provider/IpInfoDbProviderTest.php

@@ -117,14 +117,14 @@ public function testGetGeocodedDataWithRealIPv4()
         $provider = new IpInfoDbProvider(new \Geocoder\HttpAdapter\CurlHttpAdapter(), $_SERVER['IPINFODB_API_KEY']);
         $result   = $provider->getGeocodedData('74.125.45.100');
 
-        $this->assertEquals(37.3861, $result['latitude'], '', 0.0001);
-        $this->assertEquals(-122.084, $result['longitude'], '', 0.0001);
+        $this->assertEquals(37.406, $result['latitude'], '', 0.001);
+        $this->assertEquals(-122.079, $result['longitude'], '', 0.001);
         $this->assertEquals(94043, $result['zipcode']);
         $this->assertEquals('MOUNTAIN VIEW', $result['city']);
         $this->assertEquals('CALIFORNIA', $result['region']);
         $this->assertEquals('UNITED STATES', $result['country']);
         $this->assertEquals('US', $result['countryCode']);
-        $this->assertEquals('America/Los_Angeles', $result['timezone']);
+        $this->assertEquals('America/Denver', $result['timezone']);
     }
 
     /**

tests/Geocoder/Tests/Provider/MapQuestProviderTest.php

@@ -50,7 +50,7 @@ public function testGetGeocodedDataWithRealAddress()
         $this->assertEquals('Paris', $result['city']);
         $this->assertEquals('Paris', $result['county']);
         $this->assertEquals('Île-de-France', $result['region']);
-        $this->assertEquals('France', $result['country']);
+        $this->assertEquals('FR', $result['country']);
 
         $this->assertNull($result['countryCode']);
         $this->assertNull($result['timezone']);
@@ -93,7 +93,7 @@ public function testGetReversedDataWithRealCoordinates()
         $this->assertEquals('Lancaster', $result['city']);
         $this->assertEquals('Lancashire', $result['county']);
         $this->assertEquals('England', $result['region']);
-        $this->assertEquals('United Kingdom', $result['country']);
+        $this->assertEquals('GB', $result['country']);
 
         $this->assertNull($result['countryCode']);
         $this->assertNull($result['timezone']);
@@ -108,14 +108,25 @@ public function testGetGeocodedDataWithCity()
         $this->assertNull($result['timezone']);
     }
 
-    /**
-     * @expectedException Geocoder\Exception\NoResultException
-     * @expectedExceptionMessage Could not find results for given query: http://open.mapquestapi.com/geocoding/v1/address?location=Kalbacher+Hauptstra%C3%9Fe+10%2C+60437+Frankfurt%2C+Germany&outFormat=json&maxResults=1&thumbMaps=false
-     */
     public function testGetGeocodedDataWithCityDistrict()
     {
         $provider = new MapQuestProvider(new \Geocoder\HttpAdapter\CurlHttpAdapter());
-        $provider->getGeocodedData('Kalbacher Hauptstraße 10, 60437 Frankfurt, Germany');
+        $result = $provider->getGeocodedData('Kalbacher Hauptstraße 10, 60437 Frankfurt, Germany');
+
+        $this->assertEquals(50.189062, $result['latitude'], '', 0.01);
+        $this->assertEquals(8.636567, $result['longitude'], '', 0.01);
+        $this->assertNull($result['bounds']);
+        $this->assertNull($result['streetNumber']);
+        $this->assertEquals('Kalbacher Hauptstraße 10', $result['streetName']);
+        $this->assertEquals(60437, $result['zipcode']);
+        $this->assertEquals('Frankfurt am Main', $result['city']);
+        $this->assertEquals('Frankfurt am Main', $result['county']);
+        $this->assertEquals('Hesse', $result['region']);
+        $this->assertEquals('DE', $result['country']);
+
+        $this->assertNull($result['countryCode']);
+        $this->assertNull($result['regionCode']);
+        $this->assertNull($result['timezone']);
     }
 
     /**

tests/Geocoder/Tests/Provider/OpenStreetMapsProviderTest.php

@@ -116,7 +116,7 @@ public function testGetReversedDataWithRealCoordinatesWithLocale()
         $this->assertEquals('Kalbacher Hauptstraße', $result['streetName']);
         $this->assertEquals(60437, $result['zipcode']);
         $this->assertEquals('Frankfurt am Main', $result['city']);
-        $this->assertEquals('Bonames', $result['cityDistrict']);
+        $this->assertEquals('Kalbach', $result['cityDistrict']);
         $this->assertEquals('Frankfurt am Main', $result['county']);
         $this->assertEquals('Hessen', $result['region']);
         $this->assertNull($result['regionCode']);