Re-arrange tests, make sure IP addresses are geocoded.

Fixes #34

Author: mikebronner

composer.json

@@ -34,12 +34,14 @@
     },
     "autoload": {
         "psr-4": {
-            "Toin0u\\Geocoder\\": "src/"
+            "Toin0u\\Geocoder\\": "src/",
+            "Toin0u\\GeocoderLaravel\\Tests\\Laravel5_3\\": "tests/Laravel5_3/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Toin0u\\Tests\\Geocoder\\": "tests/"
+            "Toin0u\\Tests\\Geocoder\\": "tests/Geocoder/",
+            "Toin0u\\GeocoderLaravel\\Tests\\Laravel5_3\\": "tests/Laravel5_3/"
         }
     },
     "extra": {

config/geocoder.php

@@ -18,14 +18,9 @@
     // Providers get called in the chain order given here.
     // The first one to return a result will be used.
     'providers' => [
-        GoogleMaps::class => [
-            'en_US',
-            null,
-            true,
-            env('GOOGLE_MAPS_API_KEY'),
-        ],
+        GoogleMaps::class => null,
         BingMaps::class => [
-            'en_US',
+            'en-US',
             env('BING_MAPS_API_KEY'),
         ],
         FreeGeoIp::class  => null,

phpunit.xml.dist renamed to phpunit.xml

@@ -9,10 +9,11 @@
     stopOnFailure="false"
     syntaxCheck="false"
     bootstrap="vendor/autoload.php"
-    >
+>
     <testsuites>
         <testsuite name="Geocoder library for Laravel Test Suite">
-            <directory>./tests/</directory>
+            <directory suffix="Test.php">./tests/Geocoder</directory>
+            <directory suffix="Test.php">./tests/Laravel5_3</directory>
         </testsuite>
     </testsuites>
     <filter>

src/GeocoderServiceProvider.php

@@ -13,14 +13,15 @@
 
 use Geocoder\ProviderAggregator;
 use Geocoder\Provider\Chain;
+use Illuminate\Support\ServiceProvider;
 use ReflectionClass;
 
 /**
  * Geocoder service provider
  *
  * @author Antoine Corcy <[email protected]>
  */
-class GeocoderServiceProvider extends \Illuminate\Support\ServiceProvider
+class GeocoderServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap the application events.

tests/Facade/GeocoderTest.php renamed to tests/Geocoder/Facade/GeocoderTest.php

@@ -0,0 +1,25 @@
+<?php namespace Toin0u\GeocoderLaravel\Tests\Laravel5_3\Providers;
+
+use Toin0u\GeocoderLaravel\Tests\Laravel5_3\TestCase;
+
+class GeocoderServiceProviderTest extends TestCase
+{
+    public function testItResolvesAGivenAddress()
+    {
+        $result = app('geocoder')
+            ->geocode('1600 Pennsylvania Ave., Washington, DC USA')
+            ->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());
+    }
+
+    public function testItResolvesAGivenIPAddress()
+    {
+        $result = app('geocoder')
+            ->geocode('8.8.8.8')
+            ->all();
+        $this->assertEquals('US', $result[0]->getCountry()->getCode());
+    }
+}

tests/GeocoderServiceProviderTest.php renamed to tests/Geocoder/GeocoderServiceProviderTest.php

@@ -0,0 +1,24 @@
+<?php namespace Toin0u\GeocoderLaravel\Tests\Laravel5_3;
+
+use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+abstract class TestCase extends BaseTestCase
+{
+    use DatabaseMigrations;
+    use DatabaseTransactions;
+
+    protected $baseUrl = 'http://localhost';
+
+    public function createApplication() : Application
+    {
+        $app = require __DIR__ . '/../../../../../bootstrap/app.php';
+        $app->make(Kernel::class)->bootstrap();
+
+        return $app;
+    }
+}