Skip to content

Commit 172ca5c

Browse files
nidenniden
committed
[#.x] - correcting tests
1 parent 8ec4ab6 commit 172ca5c

File tree

4 files changed

+65
-25
lines changed

4 files changed

+65
-25
lines changed

‎tests/Unit/Domain/Application/Company/Handler/CompanyHandlerDeleteTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public function testHandlerWithCompanyId(): void
2929
$factory = $this->container->get(CompanyCommandFactory::class);
3030

3131
/**
32-
* We need to ask for a user to be deleted with an ID that does not
33-
* exist in the database. To ensure that, we will create a user,
34-
* delete it and then try to delete the same user with that ID
32+
* We need to ask for a company to be deleted with an ID that does not
33+
* exist in the database. To ensure that, we will create a company,
34+
* delete it and then try to delete the same company with that ID
3535
*/
3636
$migration = new CompaniesMigration($this->getConnection());
3737
$dbCompany = $this->getNewCompany($migration);

‎tests/Unit/Domain/Application/Company/Handler/CompanyHandlerPostTest.php‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use Phalcon\Api\Domain\Infrastructure\DataSource\Company\Mapper\CompanyMapper;
2222
use Phalcon\Api\Domain\Infrastructure\DataSource\Company\Mapper\CompanyMapperInterface;
2323
use Phalcon\Api\Domain\Infrastructure\DataSource\Company\Repository\CompanyRepository;
24+
use Phalcon\Api\Domain\Infrastructure\DataSource\User\Mapper\UserMapper;
2425
use Phalcon\Api\Tests\AbstractUnitTestCase;
2526
use Phalcon\Support\Registry;
2627

@@ -49,23 +50,28 @@ public function testHandlerFailureNoIdReturned(): void
4950
$handler = $this->container->get(CompanyPostHandler::class);
5051
/** @var CompanyMapper $companyMapper */
5152
$companyMapper = $this->container->get(CompanyMapper::class);
53+
/** @var UserMapper $userMapper */
54+
$userMapper = $this->container->get(UserMapper::class);
5255
/** @var Registry $registry */
5356
$registry = $this->container->get(Registry::class);
5457
/** @var CompanyCommandFactory $factory */
5558
$factory = $this->container->get(CompanyCommandFactory::class);
5659

60+
$userData = $this->getNewUserData();
61+
$userData['usr_id'] = 1;
5762
$companyData = $this->getNewCompanyData();
5863
$companyData['com_id'] = 1;
5964

6065
/**
6166
* $companyData is a db record. We need a domain object here
6267
*/
6368
$domainCompany = $companyMapper->domain($companyData);
69+
$domainUser = $userMapper->domain($userData);
6470
/**
6571
* Store the domain user in the registry - to be used for *_com_id
6672
* field updates
6773
*/
68-
$registry->set('user', $domainCompany);
74+
$registry->set('user', $domainUser);
6975

7076
$domainData = $domainCompany->toArray();
7177
$command = $factory->insert($domainData);
@@ -109,23 +115,28 @@ public function testHandlerFailurePdoError(): void
109115
$handler = $this->container->get(CompanyPostHandler::class);
110116
/** @var CompanyMapper $companyMapper */
111117
$companyMapper = $this->container->get(CompanyMapper::class);
118+
/** @var UserMapper $userMapper */
119+
$userMapper = $this->container->get(UserMapper::class);
112120
/** @var Registry $registry */
113121
$registry = $this->container->get(Registry::class);
114122
/** @var CompanyCommandFactory $factory */
115123
$factory = $this->container->get(CompanyCommandFactory::class);
116124

125+
$userData = $this->getNewUserData();
126+
$userData['usr_id'] = 1;
117127
$companyData = $this->getNewCompanyData();
118128
$companyData['com_id'] = 1;
119129

120130
/**
121131
* $companyData is a db record. We need a domain object here
122132
*/
123133
$domainCompany = $companyMapper->domain($companyData);
134+
$domainUser = $userMapper->domain($userData);
124135
/**
125136
* Store the domain user in the registry - to be used for *_com_id
126137
* field updates
127138
*/
128-
$registry->set('user', $domainCompany);
139+
$registry->set('user', $domainUser);
129140

130141
$domainData = $domainCompany->toArray();
131142
$command = $factory->insert($domainData);
@@ -193,25 +204,31 @@ public function testHandlerSuccess(): void
193204
$handler = $this->container->get(CompanyPostHandler::class);
194205
/** @var CompanyMapperInterface $companyMapper */
195206
$companyMapper = $this->container->get(CompanyMapper::class);
207+
/** @var UserMapper $userMapper */
208+
$userMapper = $this->container->get(UserMapper::class);
196209
/** @var Registry $registry */
197210
$registry = $this->container->get(Registry::class);
198211
/** @var CompanyCommandFactory $factory */
199212
$factory = $this->container->get(CompanyCommandFactory::class);
200213

214+
$userData = $this->getNewUserData();
215+
$userData['usr_id'] = 1;
216+
201217
$companyData = $this->getNewCompanyData();
202218

203219
/**
204220
* $companyData is a db record. We need a domain object here
205221
*/
206-
$domainUser = $companyMapper->domain($companyData);
222+
$domainCompany = $companyMapper->domain($companyData);
223+
$domainUser = $userMapper->domain($userData);
207224

208225
/**
209226
* Store the domain user in the registry - to be used for *_com_id
210227
* field updates
211228
*/
212229
$registry->set('user', $domainUser);
213230

214-
$domainData = $domainUser->toArray();
231+
$domainData = $domainCompany->toArray();
215232
$command = $factory->insert($domainData);
216233
$payload = $handler->__invoke($command);
217234

@@ -295,17 +312,23 @@ public function testHandlerSuccessEmptyDates(): void
295312
$handler = $this->container->get(CompanyPostHandler::class);
296313
/** @var CompanyMapperInterface $companyMapper */
297314
$companyMapper = $this->container->get(CompanyMapper::class);
315+
/** @var UserMapper $userMapper */
316+
$userMapper = $this->container->get(UserMapper::class);
298317
/** @var Registry $registry */
299318
$registry = $this->container->get(Registry::class);
300319
/** @var CompanyCommandFactory $factory */
301320
$factory = $this->container->get(CompanyCommandFactory::class);
302321

322+
$userData = $this->getNewUserData();
323+
$userData['usr_id'] = 1;
324+
303325
$companyData = $this->getNewCompanyData();
304326

305327
/**
306328
* $companyData is a db record. We need a domain object here
307329
*/
308-
$domainUser = $companyMapper->domain($companyData);
330+
$domainCompany = $companyMapper->domain($companyData);
331+
$domainUser = $userMapper->domain($userData);
309332

310333
/**
311334
* Store the domain user in the registry - to be used for *_com_id
@@ -384,14 +407,14 @@ public function testHandlerSuccessEmptyDates(): void
384407
$actual = $data['createdDate'];
385408
$this->assertStringContainsString($today, $actual);
386409

387-
$expected = 0;
410+
$expected = 1;
388411
$actual = $data['createdUserId'];
389412
$this->assertSame($expected, $actual);
390413

391414
$actual = $data['updatedDate'];
392415
$this->assertStringContainsString($today, $actual);
393416

394-
$expected = 0;
417+
$expected = 1;
395418
$actual = $data['updatedUserId'];
396419
$this->assertSame($expected, $actual);
397420
}

‎tests/Unit/Domain/Application/Company/Service/CompanyServiceDeleteTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public function testServiceWithCompanyId(): void
2626
$service = $this->container->get(CompanyDeleteService::class);
2727

2828
/**
29-
* We need to ask for a user to be deleted with an ID that does not
30-
* exist in the database. To ensure that, we will create a user,
31-
* delete it and then try to delete the same user with that ID
29+
* We need to ask for a company to be deleted with an ID that does not
30+
* exist in the database. To ensure that, we will create a company,
31+
* delete it and then try to delete the same company with that ID
3232
*/
3333
$migration = new CompaniesMigration($this->getConnection());
3434
$dbCompany = $this->getNewCompany($migration);

‎tests/Unit/Domain/Application/Company/Service/CompanyServicePostTest.php‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,26 @@ public function testServiceFailureNoIdReturned(): void
5050
$service = $this->container->get(CompanyPostService::class);
5151
/** @var CompanyMapper $companyMapper */
5252
$companyMapper = $this->container->get(CompanyMapper::class);
53+
/** @var UserMapper $userMapper */
54+
$userMapper = $this->container->get(UserMapper::class);
5355
/** @var Registry $registry */
5456
$registry = $this->container->get(Registry::class);
5557

58+
$userData = $this->getNewUserData();
59+
$userData['usr_id'] = 1;
5660
$companyData = $this->getNewCompanyData();
5761
$companyData['com_id'] = 1;
5862

5963
/**
6064
* $companyData is a db record. We need a domain object here
6165
*/
6266
$domainCompany = $companyMapper->domain($companyData);
67+
$domainUser = $userMapper->domain($userData);
6368
/**
6469
* Store the domain user in the registry - to be used for *_com_id
6570
* field updates
6671
*/
67-
$registry->set('user', $domainCompany);
72+
$registry->set('user', $domainUser);
6873

6974
$domainData = $domainCompany->toArray();
7075

@@ -108,21 +113,26 @@ public function testServiceFailurePdoError(): void
108113
$service = $this->container->get(CompanyPostService::class);
109114
/** @var CompanyMapper $companyMapper */
110115
$companyMapper = $this->container->get(CompanyMapper::class);
116+
/** @var UserMapper $userMapper */
117+
$userMapper = $this->container->get(UserMapper::class);
111118
/** @var Registry $registry */
112119
$registry = $this->container->get(Registry::class);
113120

121+
$userData = $this->getNewUserData();
122+
$userData['usr_id'] = 1;
114123
$companyData = $this->getNewCompanyData();
115124
$companyData['com_id'] = 1;
116125

117126
/**
118127
* $companyData is a db record. We need a domain object here
119128
*/
120129
$domainCompany = $companyMapper->domain($companyData);
130+
$domainUser = $userMapper->domain($userData);
121131
/**
122132
* Store the domain user in the registry - to be used for *_com_id
123133
* field updates
124134
*/
125-
$registry->set('user', $domainCompany);
135+
$registry->set('user', $domainUser);
126136

127137
$domainData = $domainCompany->toArray();
128138

@@ -187,20 +197,22 @@ public function testServiceSuccess(): void
187197
/** @var CompanyPostService $service */
188198
$service = $this->container->get(CompanyPostService::class);
189199
/** @var UserMapperInterface $companyMapper */
190-
$companyMapper = $this->container->get(UserMapper::class);
200+
$userMapper = $this->container->get(UserMapper::class);
191201
/** @var CompanyMapperInterface $companyMapper */
192202
$companyMapper = $this->container->get(CompanyMapper::class);
193203
/** @var Registry $registry */
194204
$registry = $this->container->get(Registry::class);
195205

196-
$companyData = $this->getNewUserData();
197-
$companyData = $this->getNewCompanyData();
206+
$userData = $this->getNewUserData();
207+
$userData['usr_id'] = 1;
208+
$companyData = $this->getNewCompanyData();
209+
$companyData['com_id'] = 1;
198210

199211
/**
200212
* $companyData is a db record. We need a domain object here
201213
*/
202-
$domainUser = $companyMapper->domain($companyData);
203-
214+
$domainCompany = $companyMapper->domain($companyData);
215+
$domainUser = $userMapper->domain($userData);
204216
/**
205217
* Store the domain user in the registry - to be used for *_com_id
206218
* field updates
@@ -292,16 +304,21 @@ public function testServiceSuccessEmptyDates(): void
292304
$service = $this->container->get(CompanyPostService::class);
293305
/** @var CompanyMapperInterface $companyMapper */
294306
$companyMapper = $this->container->get(CompanyMapper::class);
307+
/** @var UserMapper $userMapper */
308+
$userMapper = $this->container->get(UserMapper::class);
295309
/** @var Registry $registry */
296310
$registry = $this->container->get(Registry::class);
297311

298-
$companyData = $this->getNewCompanyData();
312+
$userData = $this->getNewUserData();
313+
$userData['usr_id'] = 1;
314+
$companyData = $this->getNewCompanyData();
315+
$companyData['com_id'] = 1;
299316

300317
/**
301318
* $companyData is a db record. We need a domain object here
302319
*/
303-
$domainUser = $companyMapper->domain($companyData);
304-
320+
$domainCompany = $companyMapper->domain($companyData);
321+
$domainUser = $userMapper->domain($userData);
305322
/**
306323
* Store the domain user in the registry - to be used for *_com_id
307324
* field updates
@@ -378,14 +395,14 @@ public function testServiceSuccessEmptyDates(): void
378395
$actual = $data['createdDate'];
379396
$this->assertStringContainsString($today, $actual);
380397

381-
$expected = 0;
398+
$expected = 1;
382399
$actual = $data['createdUserId'];
383400
$this->assertSame($expected, $actual);
384401

385402
$actual = $data['updatedDate'];
386403
$this->assertStringContainsString($today, $actual);
387404

388-
$expected = 0;
405+
$expected = 1;
389406
$actual = $data['updatedUserId'];
390407
$this->assertSame($expected, $actual);
391408
}

0 commit comments

Comments
 (0)