Skip to content

Commit d5b2a45

Browse files
author
slavaveremeevskii
committed
update composer, unitest
1 parent c555440 commit d5b2a45

File tree

3 files changed

+15
-62
lines changed

3 files changed

+15
-62
lines changed

composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
}
1212
],
1313
"require": {
14+
"php": ">=5.6.0",
1415
"willdurand/geocoder": "^4.2",
1516
"glendemon/dadata-suggestions": "^1.0"
1617
},

composer.lock

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/DaDataTest.php

+10-60
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,29 @@
11
<?php
22

3-
43
class DaDataTest extends \PHPUnit\Framework\TestCase
54
{
65
/**
7-
* @var \DadataSuggestions\DadataSuggestionsService
8-
*/
9-
private $service;
10-
11-
/**
12-
* @var \Dadata\DaData
6+
* @var \Dadata\DaData | \PHPUnit\Framework\MockObject\MockObject
137
*/
148
private $daData;
159

1610
public function setUp(): void
1711
{
1812
parent::setUp();
19-
20-
$this->service = $this->getService();
21-
$this->daData = $this->getDaData($this->service);
22-
}
23-
24-
25-
public function testDaDataTypes()
26-
{
27-
$data = $this->daData->geocodeQuery(\Geocoder\Query\GeocodeQuery::create('Moscow'));
28-
29-
$this->assertInstanceOf(\Geocoder\Model\AddressCollection::class, $data);
30-
31-
foreach ($data as $key => $item) {
32-
$this->assertInstanceOf(\Dadata\Model\DaDataAddress::class, $item);
33-
}
13+
$this->daData = $this->createMock(\Dadata\DaData::class);
3414
}
3515

36-
public function testDaData()
16+
public function testGeocodeQuery()
3717
{
38-
$query = \Geocoder\Query\GeocodeQuery::create('г Москва, улица Академика Королева, дом 15, корп. 2');
39-
$data = $this->daData->geocodeQuery($query);
40-
41-
$this->assertNotEmpty($data);
42-
43-
$daDataAddres = array_pop($data->all());
44-
45-
$this->assertNotEmpty($daDataAddres->getCoordinates());
4618

47-
$this->assertEquals($daDataAddres->getStreetName(), 'Академика Королева');
19+
$this->assertInstanceOf(\Dadata\DaData::class, $this->daData);
20+
$geocodeQuery = \Geocoder\Query\GeocodeQuery::create('г Москва, улица Академика Королева, дом 15, корп. 2');
4821

49-
$this->assertEquals($daDataAddres->getStreetNumber(), 15);
22+
$data = $this->daData->method('geocodeQuery')
23+
->with($geocodeQuery)
24+
->will($this->returnValue(\Geocoder\Collection::class));
5025

51-
$this->assertEquals($daDataAddres->getSubLocality(), 'г Москва');
5226

53-
$this->assertEquals($daDataAddres->getLocality(), 'г Москва');
54-
55-
$this->assertObjectHasAttribute('name', $daDataAddres->getCountry());
56-
57-
$this->assertObjectHasAttribute('code', $daDataAddres->getCountry());
58-
59-
}
60-
61-
/**
62-
* @return \DadataSuggestions\DadataSuggestionsService
63-
*/
64-
private function getService()
65-
{
66-
$service = new \DadataSuggestions\DadataSuggestionsService();
67-
$service->setToken('ab626ac37b47868748ea2f408293ed6a1e420944');
68-
return $service;
69-
}
70-
71-
/**
72-
* @param \DadataSuggestions\DadataSuggestionsService $service
73-
* @return \Dadata\DaData
74-
*/
75-
private function getDaData(\DadataSuggestions\DadataSuggestionsService $service)
76-
{
77-
return new \Dadata\DaData($service);
27+
$this->assertIsObject($data);
7828
}
79-
}
29+
}

0 commit comments

Comments
 (0)