Fixed tests

Ilya Shtricul · Ilya Shtricul · commit d93d903a7d0b · 2015-12-22T15:00:20.000+03:00
diff --git a/tests/Facade/GeocoderTest.php b/tests/Facade/GeocoderTest.php
@@ -20,6 +20,6 @@ public function testGeocoderFacade()
     {
         $this->assertTrue(is_array($providers = \Geocoder::getProviders()));
         $this->assertArrayHasKey('chain', $providers);
-        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $providers['chain']);
+        $this->assertInstanceOf('Geocoder\\Provider\\Chain', $providers['chain']);
     }
 }
diff --git a/tests/GeocoderServiceProviderTest.php b/tests/GeocoderServiceProviderTest.php
@@ -19,10 +19,10 @@ class GeocoderServiceProviderTest extends TestCase
     public function testConfig()
     {
         $this->assertTrue(is_array($providers = $this->app['config']->get('geocoder.providers')));
-        $this->assertCount(2, $providers);
-        $this->assertArrayHasKey('Geocoder\\Provider\\GoogleMapsProvider', $providers);
-        $this->assertArrayHasKey('Geocoder\\Provider\\FreeGeoIpProvider', $providers);
-        $this->assertSame('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['config']->get('geocoder.adapter'));
+        $this->assertCount(3, $providers);
+        $this->assertArrayHasKey('Geocoder\\Provider\\GoogleMaps', $providers);
+        $this->assertArrayHasKey('Geocoder\\Provider\\FreeGeoIp', $providers);
+        $this->assertSame('Ivory\\HttpAdapter\\CurlHttpAdapter', $this->app['config']->get('geocoder.adapter'));
     }
 
     public function testLoadedProviders()
@@ -35,25 +35,38 @@ public function testLoadedProviders()
 
     public function testGeocoderDefaultAdapter()
     {
-        $this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['geocoder.adapter']);
+        $this->assertInstanceOf('Ivory\\HttpAdapter\\CurlHttpAdapter', $this->app['geocoder.adapter']);
     }
 
     public function testGeocoderChainProvider()
     {
-        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $this->app['geocoder.chain']);
+        $providers = $this->getProtectedProperty($this->app['geocoder'], 'providers');
+
+        $this->assertArrayHasKey('chain', $providers);
+
+        $this->assertInstanceOf('Geocoder\\Provider\\Chain', $providers['chain']);
+
+        $chainProviders = $this->getProtectedProperty($providers['chain'], 'providers');
+
+        $this->assertInstanceOf('Geocoder\\Provider\\GoogleMaps', $chainProviders[0]);
+        $this->assertSame('fr-FR', $chainProviders[0]->getLocale());
+        $this->assertInstanceOf('Ivory\\HttpAdapter\\CurlHttpAdapter', $chainProviders[0]->getAdapter());
+
+        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIp', $chainProviders[1]);
+        $this->assertInstanceOf('Ivory\\HttpAdapter\\CurlHttpAdapter', $chainProviders[1]->getAdapter());
+
     }
 
-    public function testGeocoderDefaultProvider()
+    public function testGeocoderNamedProviders()
     {
-        $providers = $this->getProtectedProperty($this->app['geocoder.chain'], 'providers');
+        $providers = $this->getProtectedProperty($this->app['geocoder'], 'providers');
 
-        $this->assertInstanceOf('Geocoder\\Provider\\GoogleMapsProvider', $providers[0]);
-        $this->assertSame('fr-FR', $providers[0]->getLocale());
-        $this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $providers[0]->getAdapter());
+        $this->assertInstanceOf('Geocoder\\Provider\\GoogleMaps', $providers['google_maps']);
+        $this->assertSame('fr-FR', $providers['google_maps']->getLocale());
+        $this->assertInstanceOf('Ivory\\HttpAdapter\\CurlHttpAdapter', $providers['google_maps']->getAdapter());
 
-        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $providers[1]);
-        $this->assertNull($providers[1]->getLocale());
-        $this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $providers[1]->getAdapter());
+        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIp', $providers['free_geo_ip']);
+        $this->assertInstanceOf('Ivory\\HttpAdapter\\CurlHttpAdapter', $providers['free_geo_ip']->getAdapter());
     }
 
     public function testGeocoder()

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public function testGeocoderFacade()`
`20`	`20`	`{`
`21`	`21`	`$this->assertTrue(is_array($providers = \Geocoder::getProviders()));`
`22`	`22`	`$this->assertArrayHasKey('chain', $providers);`
`23`		`- $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $providers['chain']);`
	`23`	`+ $this->assertInstanceOf('Geocoder\\Provider\\Chain', $providers['chain']);`
`24`	`24`	`}`
`25`	`25`	`}`