Skip to content

Commit 06ff201

Browse files
toin0utoin0u
committed
fix Geonames provider tests
1 parent c417a6b commit 06ff201

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ public function testGeocodeWithRealPlace()
103103
$this->assertEquals(51.865368153381, $result->getBounds()->getNorth(), '', 0.01);
104104
$this->assertEquals(0.45212493672386, $result->getBounds()->getEast(), '', 0.01);
105105
$this->assertEquals('London', $result->getLocality());
106-
$this->assertEquals('Greater London', $result->getCounty());
107-
$this->assertEquals('England', $result->getRegion());
108-
$this->assertEquals('United Kingdom', $result->getCountry());
106+
$this->assertEquals('Greater London', $result->getCounty()->getName());
107+
$this->assertEquals('England', $result->getRegion()->getName());
108+
$this->assertEquals('United Kingdom', $result->getCountry()->getName());
109109
$this->assertEquals('GB', $result->getCountryCode());
110110
$this->assertEquals('Europe/London', $result->getTimezone());
111111

@@ -120,9 +120,9 @@ public function testGeocodeWithRealPlace()
120120
$this->assertEquals(-32.925573728925, $result->getBounds()->getNorth(), '', 0.01);
121121
$this->assertEquals(28.018503381239, $result->getBounds()->getEast(), '', 0.01);
122122
$this->assertEquals('East London', $result->getLocality());
123-
$this->assertEquals('Buffalo City Metropolitan Municipality', $result->getCounty());
124-
$this->assertEquals('Eastern Cape', $result->getRegion());
125-
$this->assertEquals('South Africa', $result->getCountry());
123+
$this->assertEquals('Buffalo City Metropolitan Municipality', $result->getCounty()->getName());
124+
$this->assertEquals('Eastern Cape', $result->getRegion()->getName());
125+
$this->assertEquals('South Africa', $result->getCountry()->getName());
126126
$this->assertEquals('ZA', $result->getCountryCode());
127127
$this->assertEquals('Africa/Johannesburg', $result->getTimezone());
128128

@@ -137,9 +137,9 @@ public function testGeocodeWithRealPlace()
137137
$this->assertEquals(51.869628267826, $result->getBounds()->getNorth(), '', 0.01);
138138
$this->assertEquals(0.48608279418978, $result->getBounds()->getEast(), '', 0.01);
139139
$this->assertEquals('City of London', $result->getLocality());
140-
$this->assertEquals('Greater London', $result->getCounty());
141-
$this->assertEquals('England', $result->getRegion());
142-
$this->assertEquals('United Kingdom', $result->getCountry());
140+
$this->assertEquals('Greater London', $result->getCounty()->getName());
141+
$this->assertEquals('England', $result->getRegion()->getName());
142+
$this->assertEquals('United Kingdom', $result->getCountry()->getName());
143143
$this->assertEquals('GB', $result->getCountryCode());
144144
$this->assertEquals('Europe/London', $result->getTimezone());
145145

@@ -154,9 +154,9 @@ public function testGeocodeWithRealPlace()
154154
$this->assertEquals(43.059702923237, $result->getBounds()->getNorth(), '', 0.01);
155155
$this->assertEquals(-81.128595097537, $result->getBounds()->getEast(), '', 0.01);
156156
$this->assertEquals('London', $result->getLocality());
157-
$this->assertEquals('', $result->getCounty());
158-
$this->assertEquals('Ontario', $result->getRegion());
159-
$this->assertEquals('Canada', $result->getCountry());
157+
$this->assertEquals('', $result->getCounty()->getName());
158+
$this->assertEquals('Ontario', $result->getRegion()->getName());
159+
$this->assertEquals('Canada', $result->getCountry()->getName());
160160
$this->assertEquals('CA', $result->getCountryCode());
161161
$this->assertEquals('America/Toronto', $result->getTimezone());
162162

@@ -171,9 +171,9 @@ public function testGeocodeWithRealPlace()
171171
$this->assertEquals(41.377219912096, $result->getBounds()->getNorth(), '', 0.01);
172172
$this->assertEquals(-72.070780545154, $result->getBounds()->getEast(), '', 0.01);
173173
$this->assertEquals('New London', $result->getLocality());
174-
$this->assertEquals('New London County', $result->getCounty());
175-
$this->assertEquals('Connecticut', $result->getRegion());
176-
$this->assertEquals('United States', $result->getCountry());
174+
$this->assertEquals('New London County', $result->getCounty()->getName());
175+
$this->assertEquals('Connecticut', $result->getRegion()->getName());
176+
$this->assertEquals('United States', $result->getCountry()->getName());
177177
$this->assertEquals('US', $result->getCountryCode());
178178
$this->assertEquals('America/New_York', $result->getTimezone());
179179
}
@@ -201,9 +201,9 @@ public function testGeocodeWithRealPlaceWithLocale()
201201
$this->assertEquals(51.86537, $result->getBounds()->getNorth(), '', 0.01);
202202
$this->assertEquals(0.45212, $result->getBounds()->getEast(), '', 0.01);
203203
$this->assertEquals('Londra', $result->getLocality());
204-
$this->assertEquals('Greater London', $result->getCounty());
205-
$this->assertEquals('Inghilterra', $result->getRegion());
206-
$this->assertEquals('Regno Unito', $result->getCountry());
204+
$this->assertEquals('Greater London', $result->getCounty()->getName());
205+
$this->assertEquals('Inghilterra', $result->getRegion()->getName());
206+
$this->assertEquals('Regno Unito', $result->getCountry()->getName());
207207
$this->assertEquals('GB', $result->getCountryCode());
208208
$this->assertEquals('Europe/London', $result->getTimezone());
209209

@@ -218,9 +218,9 @@ public function testGeocodeWithRealPlaceWithLocale()
218218
$this->assertEquals(-32.925573728925, $result->getBounds()->getNorth(), '', 0.01);
219219
$this->assertEquals(28.018503381239, $result->getBounds()->getEast(), '', 0.01);
220220
$this->assertEquals('East London', $result->getLocality());
221-
$this->assertEquals('Buffalo City Metropolitan Municipality', $result->getCounty());
222-
$this->assertEquals('Eastern Cape', $result->getRegion());
223-
$this->assertEquals('Sudafrica', $result->getCountry());
221+
$this->assertEquals('Buffalo City Metropolitan Municipality', $result->getCounty()->getName());
222+
$this->assertEquals('Eastern Cape', $result->getRegion()->getName());
223+
$this->assertEquals('Sudafrica', $result->getCountry()->getName());
224224
$this->assertEquals('ZA', $result->getCountryCode());
225225
$this->assertEquals('Africa/Johannesburg', $result->getTimezone());
226226

@@ -235,9 +235,9 @@ public function testGeocodeWithRealPlaceWithLocale()
235235
$this->assertEquals(51.869628267826, $result->getBounds()->getNorth(), '', 0.01);
236236
$this->assertEquals(0.48608279418978, $result->getBounds()->getEast(), '', 0.01);
237237
$this->assertEquals('Città di Londra', $result->getLocality());
238-
$this->assertEquals('Greater London', $result->getCounty());
239-
$this->assertEquals('Inghilterra', $result->getRegion());
240-
$this->assertEquals('Regno Unito', $result->getCountry());
238+
$this->assertEquals('Greater London', $result->getCounty()->getName());
239+
$this->assertEquals('Inghilterra', $result->getRegion()->getName());
240+
$this->assertEquals('Regno Unito', $result->getCountry()->getName());
241241
$this->assertEquals('GB', $result->getCountryCode());
242242
$this->assertEquals('Europe/London', $result->getTimezone());
243243

@@ -252,9 +252,9 @@ public function testGeocodeWithRealPlaceWithLocale()
252252
$this->assertEquals(43.059702923237, $result->getBounds()->getNorth(), '', 0.01);
253253
$this->assertEquals(-81.128595097537, $result->getBounds()->getEast(), '', 0.01);
254254
$this->assertEquals('London', $result->getLocality());
255-
$this->assertEquals('', $result->getCounty());
256-
$this->assertEquals('Ontario', $result->getRegion());
257-
$this->assertEquals('Canada', $result->getCountry());
255+
$this->assertEquals('', $result->getCounty()->getName());
256+
$this->assertEquals('Ontario', $result->getRegion()->getName());
257+
$this->assertEquals('Canada', $result->getCountry()->getName());
258258
$this->assertEquals('CA', $result->getCountryCode());
259259
$this->assertEquals('America/Toronto', $result->getTimezone());
260260

@@ -269,9 +269,9 @@ public function testGeocodeWithRealPlaceWithLocale()
269269
$this->assertEquals(41.377219912096, $result->getBounds()->getNorth(), '', 0.01);
270270
$this->assertEquals(-72.070780545154, $result->getBounds()->getEast(), '', 0.01);
271271
$this->assertEquals('New London', $result->getLocality());
272-
$this->assertEquals('Contea di New London', $result->getCounty());
273-
$this->assertEquals('Connecticut', $result->getRegion());
274-
$this->assertEquals('Stati Uniti', $result->getCountry());
272+
$this->assertEquals('Contea di New London', $result->getCounty()->getName());
273+
$this->assertEquals('Connecticut', $result->getRegion()->getName());
274+
$this->assertEquals('Stati Uniti', $result->getCountry()->getName());
275275
$this->assertEquals('US', $result->getCountryCode());
276276
$this->assertEquals('America/New_York', $result->getTimezone());
277277
}
@@ -294,9 +294,9 @@ public function testReverseWithRealCoordinates()
294294
$this->assertEquals(51.50853, $result->getLatitude(), '', 0.01);
295295
$this->assertEquals(-0.12574, $result->getLongitude(), '', 0.01);
296296
$this->assertEquals('London', $result->getLocality());
297-
$this->assertEquals('Greater London', $result->getCounty());
298-
$this->assertEquals('England', $result->getRegion());
299-
$this->assertEquals('United Kingdom', $result->getCountry());
297+
$this->assertEquals('Greater London', $result->getCounty()->getName());
298+
$this->assertEquals('England', $result->getRegion()->getName());
299+
$this->assertEquals('United Kingdom', $result->getCountry()->getName());
300300
$this->assertEquals('GB', $result->getCountryCode());
301301
$this->assertEquals('Europe/London', $result->getTimezone());
302302
}
@@ -319,9 +319,9 @@ public function testReverseWithRealCoordinatesWithLocale()
319319
$this->assertEquals(51.50853, $result->getLatitude(), '', 0.01);
320320
$this->assertEquals(-0.12574, $result->getLongitude(), '', 0.01);
321321
$this->assertEquals('Londra', $result->getLocality());
322-
$this->assertEquals('Greater London', $result->getCounty());
323-
$this->assertEquals('Inghilterra', $result->getRegion());
324-
$this->assertEquals('Regno Unito', $result->getCountry());
322+
$this->assertEquals('Greater London', $result->getCounty()->getName());
323+
$this->assertEquals('Inghilterra', $result->getRegion()->getName());
324+
$this->assertEquals('Regno Unito', $result->getCountry()->getName());
325325
$this->assertEquals('GB', $result->getCountryCode());
326326
$this->assertEquals('Europe/London', $result->getTimezone());
327327
}

0 commit comments

Comments
 (0)