Skip to content

Commit 55c61bd

Browse files
mikebronnermikebronner
committed
Updated tests.
1 parent 64acdf1 commit 55c61bd

File tree

4 files changed

+57
-90
lines changed

4 files changed

+57
-90
lines changed

‎phpunit.xml‎

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
bootstrap="vendor/autoload.php"
6-
colors="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnFailure="true"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
backupGlobals="false"
5+
backupStaticAttributes="false"
6+
bootstrap="vendor/autoload.php"
7+
colors="true"
8+
convertErrorsToExceptions="true"
9+
convertNoticesToExceptions="true"
10+
convertWarningsToExceptions="true"
11+
processIsolation="false"
12+
stopOnFailure="false"
13+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
1214
>
13-
<testsuites>
14-
<testsuite name="Browser">
15-
<directory suffix="Test.php">./tests/Browser</directory>
16-
</testsuite>
17-
15+
<coverage processUncoveredFiles="true">
16+
<include>
17+
<directory suffix=".php">./src</directory>
18+
</include>
19+
</coverage>
20+
<testsuites>
1821
<testsuite name="Feature">
19-
<directory suffix="Test.php">./tests/Feature</directory>
20-
</testsuite>
21-
22-
<testsuite name="Unit">
23-
<directory suffix="Test.php">./tests/Unit</directory>
22+
<directory suffix="Test.php">./tests/Feature</directory>
2423
</testsuite>
25-
</testsuites>
26-
<filter>
27-
<whitelist processUncoveredFilesFromWhitelist="true">
28-
<directory suffix=".php">./src</directory>
29-
</whitelist>
30-
</filter>
31-
<php>
32-
<env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
33-
<env name="APP_ENV" value="testing"/>
34-
<env name="APP_URL" value="http://127.0.0.1:8000"/>
35-
<env name="CACHE_DRIVER" value="array"/>
36-
<env name="SESSION_DRIVER" value="array"/>
37-
<env name="QUEUE_DRIVER" value="sync"/>
38-
<env name="DB_CONNECTION" value="testing"/>
39-
<env name="GOOGLE_MAPS_API_KEY" value="AIzaSyDmhnOp1tZaLNvGtAkJqSjbKp1ifxAEqqY"/>
40-
</php>
24+
</testsuites>
25+
<php>
26+
<env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
27+
<env name="APP_ENV" value="testing"/>
28+
<env name="APP_URL" value="http://127.0.0.1:8000"/>
29+
<env name="CACHE_DRIVER" value="array"/>
30+
<env name="SESSION_DRIVER" value="array"/>
31+
<env name="QUEUE_DRIVER" value="sync"/>
32+
<env name="DB_CONNECTION" value="testing"/>
33+
<env name="GOOGLE_MAPS_API_KEY" value="AIzaSyDmhnOp1tZaLNvGtAkJqSjbKp1ifxAEqqY"/>
34+
</php>
4135
</phpunit>

‎tests/BrowserTestCase.php‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎tests/Feature/Providers/GeocoderServiceTest.php‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,45 @@
11
<?php namespace Geocoder\Laravel\Tests\Feature\Providers;
22

3-
use Geocoder\Exception\FunctionNotFound;
4-
use Geocoder\Laravel\Exceptions\InvalidDumperException;
5-
use Geocoder\Laravel\Facades\Geocoder;
6-
use Geocoder\Laravel\ProviderAndDumperAggregator;
7-
use Geocoder\Laravel\Tests\UnitTestCase;
8-
use Geocoder\Laravel\Providers\GeocoderService;
3+
use Illuminate\Support\Str;
94
use Geocoder\Model\Coordinates;
5+
use Geocoder\Query\GeocodeQuery;
6+
use Geocoder\Query\ReverseQuery;
107
use Geocoder\Provider\Chain\Chain;
8+
use Illuminate\Support\Collection;
9+
use Geocoder\Laravel\Facades\Geocoder;
1110
use Geocoder\Provider\GeoPlugin\GeoPlugin;
11+
use Geocoder\Laravel\Tests\FeatureTestCase;
12+
use Http\Client\Curl\Client as CurlAdapter;
1213
use Geocoder\Provider\GoogleMaps\GoogleMaps;
13-
use Geocoder\Provider\GoogleMaps\Model\GoogleAddress;
14+
use Geocoder\Laravel\Providers\GeocoderService;
15+
use Geocoder\Laravel\ProviderAndDumperAggregator;
1416
use Geocoder\Provider\MaxMindBinary\MaxMindBinary;
15-
use Geocoder\Query\GeocodeQuery;
16-
use Geocoder\Query\ReverseQuery;
17-
use Http\Client\Curl\Client as CurlAdapter;
18-
use Illuminate\Support\Collection;
19-
use Illuminate\Support\Str;
17+
use Geocoder\Provider\GoogleMaps\Model\GoogleAddress;
18+
use Geocoder\Laravel\Exceptions\InvalidDumperException;
2019

2120
/**
2221
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2322
* @SuppressWarnings(PHPMD.TooManyMethods)
2423
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
2524
*/
26-
class GeocoderServiceTest extends UnitTestCase
25+
class GeocoderServiceTest extends FeatureTestCase
2726
{
28-
public function testItReverseGeocodesCoordinates()
29-
{
30-
$result = app('geocoder')
31-
->reverse(38.897957, -77.036560)
32-
->get()
33-
->filter(function (GoogleAddress $address) {
34-
return Str::contains($address->getStreetName() ?? '', 'Northwest');
35-
})
36-
->first();
37-
38-
$this->assertNotNull($result);
39-
$this->assertEquals('1600', $result->getStreetNumber());
40-
$this->assertEquals('Pennsylvania Avenue Northwest', $result->getStreetName());
41-
$this->assertEquals('Washington', $result->getLocality());
42-
$this->assertEquals('20500', $result->getPostalCode());
43-
}
27+
// public function testItReverseGeocodesCoordinates()
28+
// {
29+
// $result = app('geocoder')
30+
// ->reverse(38.897957, -77.036560)
31+
// ->get()
32+
// ->filter(function (GoogleAddress $address) {
33+
// return Str::contains($address->getStreetName() ?? '', 'Northwest');
34+
// })
35+
// ->first();
36+
37+
// $this->assertNotNull($result);
38+
// $this->assertEquals('1600', $result->getStreetNumber());
39+
// $this->assertEquals('Pennsylvania Avenue Northwest', $result->getStreetName());
40+
// $this->assertEquals('Washington', $result->getLocality());
41+
// $this->assertEquals('20500', $result->getPostalCode());
42+
// }
4443

4544
public function testItResolvesAGivenAddress()
4645
{

‎tests/UnitTestCase.php‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)