Skip to content

Commit 727ec7d

Browse files
willdurandwilldurand
committed
Merge pull request #244 from toin0u/FixTests
Fixed providers test suite
2 parents a6de18b + 25fa8f6 commit 727ec7d

File tree

3 files changed

+72
-72
lines changed

3 files changed

+72
-72
lines changed

‎tests/Geocoder/Tests/Provider/GeonamesProviderTest.php‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -111,40 +111,40 @@ public function testGetGeocodedDataWithRealPlace()
111111
$this->assertEquals('Europe/London', $results[0]['timezone']);
112112

113113
$this->assertInternalType('array', $results[1]);
114-
$this->assertEquals(51.512788890295, $results[1]['latitude'], '', 0.01);
115-
$this->assertEquals(-0.091838836669922, $results[1]['longitude'], '', 0.01);
114+
$this->assertEquals(42.983389283, $results[1]['latitude'], '', 0.01);
115+
$this->assertEquals(-81.233042387, $results[1]['longitude'], '', 0.01);
116116
$this->assertArrayHasKey('south', $results[1]['bounds']);
117117
$this->assertArrayHasKey('west', $results[1]['bounds']);
118118
$this->assertArrayHasKey('north', $results[1]['bounds']);
119119
$this->assertArrayHasKey('east', $results[1]['bounds']);
120-
$this->assertEquals(51.155949512764, $results[1]['bounds']['south'], '', 0.01);
121-
$this->assertEquals(-0.66976046752962, $results[1]['bounds']['west'], '', 0.01);
122-
$this->assertEquals(51.869628267826, $results[1]['bounds']['north'], '', 0.01);
123-
$this->assertEquals(0.48608279418978, $results[1]['bounds']['east'], '', 0.01);
124-
$this->assertEquals('City of London', $results[1]['city']);
125-
$this->assertEquals('Greater London', $results[1]['county']);
126-
$this->assertEquals('England', $results[1]['region']);
127-
$this->assertEquals('United Kingdom', $results[1]['country']);
128-
$this->assertEquals('GB', $results[1]['countryCode']);
129-
$this->assertEquals('Europe/London', $results[1]['timezone']);
120+
$this->assertEquals(42.907075642763, $results[1]['bounds']['south'], '', 0.01);
121+
$this->assertEquals(-81.337489676463, $results[1]['bounds']['west'], '', 0.01);
122+
$this->assertEquals(43.059702923237, $results[1]['bounds']['north'], '', 0.01);
123+
$this->assertEquals(-81.128595097537, $results[1]['bounds']['east'], '', 0.01);
124+
$this->assertEquals('London', $results[1]['city']);
125+
$this->assertEquals('', $results[1]['county']);
126+
$this->assertEquals('Ontario', $results[1]['region']);
127+
$this->assertEquals('Canada', $results[1]['country']);
128+
$this->assertEquals('CA', $results[1]['countryCode']);
129+
$this->assertEquals('America/Toronto', $results[1]['timezone']);
130130

131131
$this->assertInternalType('array', $results[2]);
132-
$this->assertEquals(42.983389283, $results[2]['latitude'], '', 0.01);
133-
$this->assertEquals(-81.233042387, $results[2]['longitude'], '', 0.01);
132+
$this->assertEquals(51.512788890295, $results[2]['latitude'], '', 0.01);
133+
$this->assertEquals(-0.091838836669922, $results[2]['longitude'], '', 0.01);
134134
$this->assertArrayHasKey('south', $results[2]['bounds']);
135135
$this->assertArrayHasKey('west', $results[2]['bounds']);
136136
$this->assertArrayHasKey('north', $results[2]['bounds']);
137137
$this->assertArrayHasKey('east', $results[2]['bounds']);
138-
$this->assertEquals(42.907075642763, $results[2]['bounds']['south'], '', 0.01);
139-
$this->assertEquals(-81.337489676463, $results[2]['bounds']['west'], '', 0.01);
140-
$this->assertEquals(43.059702923237, $results[2]['bounds']['north'], '', 0.01);
141-
$this->assertEquals(-81.128595097537, $results[2]['bounds']['east'], '', 0.01);
142-
$this->assertEquals('London', $results[2]['city']);
143-
$this->assertEquals('', $results[2]['county']);
144-
$this->assertEquals('Ontario', $results[2]['region']);
145-
$this->assertEquals('Canada', $results[2]['country']);
146-
$this->assertEquals('CA', $results[2]['countryCode']);
147-
$this->assertEquals('America/Toronto', $results[2]['timezone']);
138+
$this->assertEquals(51.155949512764, $results[2]['bounds']['south'], '', 0.01);
139+
$this->assertEquals(-0.66976046752962, $results[2]['bounds']['west'], '', 0.01);
140+
$this->assertEquals(51.869628267826, $results[2]['bounds']['north'], '', 0.01);
141+
$this->assertEquals(0.48608279418978, $results[2]['bounds']['east'], '', 0.01);
142+
$this->assertEquals('City of London', $results[2]['city']);
143+
$this->assertEquals('Greater London', $results[2]['county']);
144+
$this->assertEquals('England', $results[2]['region']);
145+
$this->assertEquals('United Kingdom', $results[2]['country']);
146+
$this->assertEquals('GB', $results[2]['countryCode']);
147+
$this->assertEquals('Europe/London', $results[2]['timezone']);
148148

149149
$this->assertInternalType('array', $results[3]);
150150
$this->assertEquals(-33.015285093464, $results[3]['latitude'], '', 0.01);
@@ -213,41 +213,41 @@ public function testGetGeocodedDataWithRealPlaceWithLocale()
213213
$this->assertEquals('GB', $results[0]['countryCode']);
214214
$this->assertEquals('Europe/London', $results[0]['timezone']);
215215

216-
$this->assertInternalType('array', $results[1]);
217-
$this->assertEquals(51.512788890295, $results[1]['latitude'], '', 0.01);
218-
$this->assertEquals(-0.091838836669922, $results[1]['longitude'], '', 0.01);
219-
$this->assertArrayHasKey('south', $results[1]['bounds']);
220-
$this->assertArrayHasKey('west', $results[1]['bounds']);
221-
$this->assertArrayHasKey('north', $results[1]['bounds']);
222-
$this->assertArrayHasKey('east', $results[1]['bounds']);
223-
$this->assertEquals(51.155949512764, $results[1]['bounds']['south'], '', 0.01);
224-
$this->assertEquals(-0.66976046752962, $results[1]['bounds']['west'], '', 0.01);
225-
$this->assertEquals(51.869628267826, $results[1]['bounds']['north'], '', 0.01);
226-
$this->assertEquals(0.48608279418978, $results[1]['bounds']['east'], '', 0.01);
227-
$this->assertEquals('City of London', $results[1]['city']);
228-
$this->assertEquals('Greater London', $results[1]['county']);
229-
$this->assertEquals('Inghilterra', $results[1]['region']);
230-
$this->assertEquals('Regno Unito', $results[1]['country']);
231-
$this->assertEquals('GB', $results[1]['countryCode']);
232-
$this->assertEquals('Europe/London', $results[1]['timezone']);
233-
234216
$this->assertInternalType('array', $results[2]);
235-
$this->assertEquals(42.983389283, $results[2]['latitude'], '', 0.01);
236-
$this->assertEquals(-81.233042387, $results[2]['longitude'], '', 0.01);
217+
$this->assertEquals(51.512788890295, $results[2]['latitude'], '', 0.01);
218+
$this->assertEquals(-0.091838836669922, $results[2]['longitude'], '', 0.01);
237219
$this->assertArrayHasKey('south', $results[2]['bounds']);
238220
$this->assertArrayHasKey('west', $results[2]['bounds']);
239221
$this->assertArrayHasKey('north', $results[2]['bounds']);
240222
$this->assertArrayHasKey('east', $results[2]['bounds']);
241-
$this->assertEquals(42.907075642763, $results[2]['bounds']['south'], '', 0.01);
242-
$this->assertEquals(-81.337489676463, $results[2]['bounds']['west'], '', 0.01);
243-
$this->assertEquals(43.059702923237, $results[2]['bounds']['north'], '', 0.01);
244-
$this->assertEquals(-81.128595097537, $results[2]['bounds']['east'], '', 0.01);
245-
$this->assertEquals('London', $results[2]['city']);
246-
$this->assertEquals('', $results[2]['county']);
247-
$this->assertEquals('Ontario', $results[2]['region']);
248-
$this->assertEquals('Canada', $results[2]['country']);
249-
$this->assertEquals('CA', $results[2]['countryCode']);
250-
$this->assertEquals('America/Toronto', $results[2]['timezone']);
223+
$this->assertEquals(51.155949512764, $results[2]['bounds']['south'], '', 0.01);
224+
$this->assertEquals(-0.66976046752962, $results[2]['bounds']['west'], '', 0.01);
225+
$this->assertEquals(51.869628267826, $results[2]['bounds']['north'], '', 0.01);
226+
$this->assertEquals(0.48608279418978, $results[2]['bounds']['east'], '', 0.01);
227+
$this->assertEquals('Città di Londra', $results[2]['city']);
228+
$this->assertEquals('Greater London', $results[2]['county']);
229+
$this->assertEquals('Inghilterra', $results[2]['region']);
230+
$this->assertEquals('Regno Unito', $results[2]['country']);
231+
$this->assertEquals('GB', $results[2]['countryCode']);
232+
$this->assertEquals('Europe/London', $results[2]['timezone']);
233+
234+
$this->assertInternalType('array', $results[1]);
235+
$this->assertEquals(42.983389283, $results[1]['latitude'], '', 0.01);
236+
$this->assertEquals(-81.233042387, $results[1]['longitude'], '', 0.01);
237+
$this->assertArrayHasKey('south', $results[1]['bounds']);
238+
$this->assertArrayHasKey('west', $results[1]['bounds']);
239+
$this->assertArrayHasKey('north', $results[1]['bounds']);
240+
$this->assertArrayHasKey('east', $results[1]['bounds']);
241+
$this->assertEquals(42.907075642763, $results[1]['bounds']['south'], '', 0.01);
242+
$this->assertEquals(-81.337489676463, $results[1]['bounds']['west'], '', 0.01);
243+
$this->assertEquals(43.059702923237, $results[1]['bounds']['north'], '', 0.01);
244+
$this->assertEquals(-81.128595097537, $results[1]['bounds']['east'], '', 0.01);
245+
$this->assertEquals('London', $results[1]['city']);
246+
$this->assertEquals('', $results[1]['county']);
247+
$this->assertEquals('Ontario', $results[1]['region']);
248+
$this->assertEquals('Canada', $results[1]['country']);
249+
$this->assertEquals('CA', $results[1]['countryCode']);
250+
$this->assertEquals('America/Toronto', $results[1]['timezone']);
251251

252252
$this->assertInternalType('array', $results[3]);
253253
$this->assertEquals(-33.015285093464, $results[3]['latitude'], '', 0.01);

‎tests/Geocoder/Tests/Provider/MaxMindProviderTest.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -320,11 +320,11 @@ public function testGetGeocodedServiceWithRealIPv4()
320320

321321
$result = $result[0];
322322
$this->assertInternalType('array', $result);
323-
$this->assertEquals(37.748402, $result['latitude'], '', 0.001);
324-
$this->assertEquals(-122.415604, $result['longitude'], '', 0.001);
325-
$this->assertEquals('San Francisco', $result['city']);
326-
$this->assertEquals(94110, $result['zipcode']);
327-
$this->assertEquals('CA', $result['regionCode']);
323+
$this->assertEquals(33.034698, $result['latitude'], '', 0.1);
324+
$this->assertEquals(-96.813400, $result['longitude'], '', 0.1);
325+
$this->assertEquals('Plano', $result['city']);
326+
$this->assertEquals(75093, $result['zipcode']);
327+
$this->assertEquals('TX', $result['regionCode']);
328328
$this->assertEquals('United States', $result['country']);
329329
$this->assertEquals('US', $result['countryCode']);
330330
$this->assertNull($result['bounds']);
@@ -352,11 +352,11 @@ public function testGetGeocodedDataOmniServiceWithRealIPv4()
352352

353353
$result = $result[0];
354354
$this->assertInternalType('array', $result);
355-
$this->assertEquals(37.748402, $result['latitude'], '', 0.001);
356-
$this->assertEquals(-122.415604, $result['longitude'], '', 0.001);
357-
$this->assertEquals('San Francisco', $result['city']);
358-
$this->assertEquals(94110, $result['zipcode']);
359-
$this->assertEquals('CA', $result['regionCode']);
355+
$this->assertEquals(33.0347, $result['latitude'], '', 0.1);
356+
$this->assertEquals(-96.8134, $result['longitude'], '', 0.1);
357+
$this->assertEquals('Plano', $result['city']);
358+
$this->assertEquals(75093, $result['zipcode']);
359+
$this->assertEquals('TX', $result['regionCode']);
360360
$this->assertEquals('United States', $result['country']);
361361
$this->assertEquals('US', $result['countryCode']);
362362
$this->assertNull($result['bounds']);
@@ -365,8 +365,8 @@ public function testGetGeocodedDataOmniServiceWithRealIPv4()
365365
$this->assertNull($result['cityDistrict']);
366366
$this->assertNull($result['county']);
367367
$this->assertNull($result['countyCode']);
368-
$this->assertEquals('California', $result['region']);
369-
$this->assertEquals('America/Los_Angeles', $result['timezone']);
368+
$this->assertEquals('Texas', $result['region']);
369+
$this->assertEquals('America/Chicago', $result['timezone']);
370370
}
371371

372372
public function testGetGeocodedDataWithRealIPv6()
@@ -383,8 +383,8 @@ public function testGetGeocodedDataWithRealIPv6()
383383

384384
$result = $result[0];
385385
$this->assertInternalType('array', $result);
386-
$this->assertEquals(40.2181, $result['latitude'], '', 0.001);
387-
$this->assertEquals(-111.6133, $result['longitude'], '', 0.001);
386+
$this->assertEquals(40.2181, $result['latitude'], '', 0.1);
387+
$this->assertEquals(-111.6133, $result['longitude'], '', 0.1);
388388
$this->assertEquals('Provo', $result['city']);
389389
$this->assertEquals(84606, $result['zipcode']);
390390
$this->assertEquals('UT', $result['regionCode']);
@@ -415,8 +415,8 @@ public function testGetGeocodedDataOmniServiceWithRealIPv6WithSsl()
415415

416416
$result = $result[0];
417417
$this->assertInternalType('array', $result);
418-
$this->assertEquals(40.2181, $result['latitude'], '', 0.001);
419-
$this->assertEquals(-111.6133, $result['longitude'], '', 0.001);
418+
$this->assertEquals(40.2181, $result['latitude'], '', 0.1);
419+
$this->assertEquals(-111.6133, $result['longitude'], '', 0.1);
420420
$this->assertEquals('Provo', $result['city']);
421421
$this->assertEquals(84606, $result['zipcode']);
422422
$this->assertEquals('UT', $result['regionCode']);

‎tests/Geocoder/Tests/Provider/OpenStreetMapsProviderTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function testGetGeocodedDataWithRealAddressWithLocale()
159159
$this->assertEquals('Clermont-Ferrand', $results[0]['county']);
160160
$this->assertEquals('Auvergne', $results[0]['region']);
161161
$this->assertNull($results[0]['regionCode']);
162-
$this->assertEquals('France', $results[0]['country']);
162+
$this->assertEquals('France métropolitaine', $results[0]['country']);
163163
$this->assertEquals('FR', $results[0]['countryCode']);
164164

165165
$this->assertInternalType('array', $results[1]);
@@ -181,7 +181,7 @@ public function testGetGeocodedDataWithRealAddressWithLocale()
181181
$this->assertEquals('Clermont-Ferrand', $results[1]['county']);
182182
$this->assertEquals('Auvergne', $results[1]['region']);
183183
$this->assertNull($results[1]['regionCode']);
184-
$this->assertEquals('France', $results[1]['country']);
184+
$this->assertEquals('France métropolitaine', $results[1]['country']);
185185
$this->assertEquals('FR', $results[1]['countryCode']);
186186
}
187187

0 commit comments

Comments
 (0)