Improve quality of some of the integration tests

mikebronner · mikebronner · commit 6c4ac3138106 · 2016-10-04T18:31:10.000-07:00
diff --git a/src/Providers/GeocoderService.php b/src/Providers/GeocoderService.php
@@ -25,6 +25,8 @@
  */
 class GeocoderService extends ServiceProvider
 {
+    protected $defer = false;
+
     /**
      * Bootstrap the application events.
      *
diff --git a/tests/Laravel5_3/Providers/GeocoderServiceTest.php b/tests/Laravel5_3/Providers/GeocoderServiceTest.php
@@ -7,16 +7,30 @@
 use Geocoder\Provider\Chain;
 use Geocoder\Provider\FreeGeoIp;
 use Geocoder\Provider\GoogleMaps;
+use Geocoder\Provider\MaxMindBinary;
+use Geocoder\Exception\FunctionNotFound;
 use Ivory\HttpAdapter\CurlHttpAdapter;
 
 class GeocoderServiceTest extends TestCase
 {
+    public function setUp()
+    {
+        parent::setUp();
+
+        app()->register(GeocoderService::class);
+    }
+
     public function testItResolvesAGivenAddress()
     {
+        // Arrange
+
+        // Act
         $result = app('geocoder')
             ->using('chain')
             ->geocode('1600 Pennsylvania Ave., Washington, DC USA')
             ->all();
+
+        // Assert
         $this->assertEquals('1600', $result[0]->getStreetNumber());
         $this->assertEquals('Pennsylvania Avenue Southeast', $result[0]->getStreetName());
         $this->assertEquals('Washington', $result[0]->getLocality());
@@ -25,32 +39,68 @@ public function testItResolvesAGivenAddress()
 
     public function testItResolvesAGivenIPAddress()
     {
+        // Arrange
+
+        // Act
         $result = app('geocoder')
             ->geocode('8.8.8.8')
             ->all();
+
+        // Assert
         $this->assertEquals('US', $result[0]->getCountry()->getCode());
     }
 
     public function testItResolvesAGivenAddressWithUmlauts()
     {
+        // Arrange
+
+        // Act
         $result = app('geocoder')
             ->geocode('Obere Donaustrasse 22, Wien, Österreich')
             ->all();
+
+        // Assert
         $this->assertEquals('22', $result[0]->getStreetNumber());
         $this->assertEquals('Obere Donaustraße', $result[0]->getStreetName());
         $this->assertEquals('Wien', $result[0]->getLocality());
         $this->assertEquals('1020', $result[0]->getPostalCode());
     }
 
-    public function testItCanUseMaxMindBinaryWithoutProvider()
+    public function testItResolvesAGivenAddressWithUmlautsInRegion()
     {
+        // Arrange
+        config()->set('geocoder.providers.Geocoder\Provider\Chain.Geocoder\Provider\GoogleMaps', [
+            'de-DE',
+            'Wien, Österreich',
+            true,
+            null,
+        ]);
+        app()->register(GeocoderService::class);
+
+        // Act
         $result = app('geocoder')
-            ->geocode('1600 Pennsylvania Ave., Washington, DC USA')
+            ->geocode('Obere Donaustrasse 22, Wien, Österreich')
             ->all();
-        $this->assertEquals('1600', $result[0]->getStreetNumber());
-        $this->assertEquals('Pennsylvania Avenue Southeast', $result[0]->getStreetName());
-        $this->assertEquals('Washington', $result[0]->getLocality());
-        $this->assertEquals('20003', $result[0]->getPostalCode());
+
+        // Assert
+        $this->assertEquals('22', $result[0]->getStreetNumber());
+        $this->assertEquals('Obere Donaustraße', $result[0]->getStreetName());
+        $this->assertEquals('Wien', $result[0]->getLocality());
+        $this->assertEquals('1020', $result[0]->getPostalCode());
+    }
+
+    public function testItCanUseMaxMindBinaryWithoutProvider()
+    {
+        //Arrange
+        $this->expectException(FunctionNotFound::class);
+        $provider = new MaxMindBinary('dummy');
+
+        // Act
+        app('geocoder')->registerProvider($provider);
+
+        // Assert
+        // By getting past the constructor parameters requirements, we know we
+        // are instantiating the provider correctly.
     }
 
     public function testItCanUseASpecificProvider()
diff --git a/tests/Laravel5_3/TestCase.php b/tests/Laravel5_3/TestCase.php
@@ -19,7 +19,6 @@ public function createApplication()
     {
         $app = require __DIR__ . '/../../vendor/laravel/laravel/bootstrap/app.php';
         $app->make(Kernel::class)->bootstrap();
-        $app->register(GeocoderService::class);
 
         return $app;
     }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`*/`
`26`	`26`	`class GeocoderService extends ServiceProvider`
`27`	`27`	`{`
	`28`	`+ protected $defer = false;`
	`29`	`+`
`28`	`30`	`/**`
`29`	`31`	`* Bootstrap the application events.`
`30`	`32`	`*`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public function createApplication()`
`19`	`19`	`{`
`20`	`20`	`$app = require __DIR__ . '/../../vendor/laravel/laravel/bootstrap/app.php';`
`21`	`21`	`$app->make(Kernel::class)->bootstrap();`
`22`		`- $app->register(GeocoderService::class);`
`23`	`22`
`24`	`23`	`return $app;`
`25`	`24`	`}`