Skip to content

Commit 90cdcc4

Browse files
committed
get rid of mocks
1 parent 2e8d45d commit 90cdcc4

File tree

3 files changed

+16
-83
lines changed

3 files changed

+16
-83
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"jackalope/jackalope-doctrine-dbal": "^1.3",
2424
"doctrine/phpcr-odm": "^1.4 || ^2.0",
2525
"symfony/phpunit-bridge": "^7.0.3",
26-
"matthiasnoback/symfony-dependency-injection-test": "^4.1.0",
27-
"matthiasnoback/symfony-config-test": "^4.1.0",
26+
"matthiasnoback/symfony-dependency-injection-test": "^4.1.0 || ^5.1.0",
27+
"matthiasnoback/symfony-config-test": "^4.1.0 || ^5.1.0",
2828
"doctrine/orm": "^2.9",
2929
"symfony-cmf/testing": "dev-sf7 as 4.2.0",
3030
"doctrine/data-fixtures": "^1.0.0",
@@ -70,5 +70,5 @@
7070
"composer/package-versions-deprecated": true
7171
}
7272
},
73-
"minimum-stability": "beta"
73+
"minimum-stability": "dev"
7474
}

tests/Unit/Doctrine/Orm/RouteProviderTest.php

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -201,38 +201,17 @@ public function testGetRoutesByNames(): void
201201
];
202202

203203
$this->objectRepositoryMock
204-
->expects($this->at(0))
205204
->method('findOneBy')
206-
->with(['name' => $paths[0]])
207-
->willReturn($this->routeMock)
208-
;
209-
$this->objectRepositoryMock
210-
->expects($this->at(1))
211-
->method('findOneBy')
212-
->with(['name' => $paths[1]])
213205
->willReturn($this->routeMock)
214206
;
215207

216208
$paths[] = '/no-candidate';
217209

218210
$candidatesMock = $this->createMock(CandidatesInterface::class);
219211
$candidatesMock
220-
->expects($this->at(0))
221212
->method('isCandidate')
222-
->with($paths[0])
223-
->willReturn(true)
224-
;
225-
$candidatesMock
226-
->expects($this->at(1))
227-
->method('isCandidate')
228-
->with($paths[1])
229-
->willReturn(true)
230-
;
231-
$candidatesMock
232-
->expects($this->at(2))
233-
->method('isCandidate')
234-
->with($paths[2])
235-
->willReturn(false)
213+
->withConsecutive([$paths[0]], [$paths[1]], [$paths[2]])
214+
->willReturnOnConsecutiveCalls(true, true, false)
236215
;
237216

238217
$routeProvider = new RouteProvider($this->managerRegistryMock, $candidatesMock, 'Route');

tests/Unit/Doctrine/Phpcr/RouteProviderTest.php

Lines changed: 11 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
use Doctrine\Common\Collections\ArrayCollection;
1515
use Doctrine\ODM\PHPCR\DocumentManager;
16+
use Doctrine\ODM\PHPCR\Query\Builder\From;
1617
use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
17-
use Doctrine\ODM\PHPCR\Query\Builder\SourceFactory;
1818
use Doctrine\ODM\PHPCR\Query\Query;
1919
use Doctrine\ODM\PHPCR\UnitOfWork;
2020
use Doctrine\Persistence\ManagerRegistry;
@@ -87,10 +87,10 @@ public function testGetRouteCollectionForRequest(): void
8787
->willReturn($candidates)
8888
;
8989

90-
$objects = [
90+
$objects = new ArrayCollection([
9191
new Route('/my'),
9292
$this,
93-
];
93+
]);
9494

9595
$this->dmMock
9696
->expects($this->once())
@@ -327,28 +327,9 @@ public function testGetRoutesByNames(): void
327327
;
328328

329329
$this->candidatesMock
330-
->expects($this->at(0))
331330
->method('isCandidate')
332-
->with('/cms/routes/test-route')
333-
->willReturn(true)
334-
;
335-
$this->candidatesMock
336-
->expects($this->at(1))
337-
->method('isCandidate')
338-
->with('/cms/simple/other-route')
339-
->willReturn(true)
340-
;
341-
$this->candidatesMock
342-
->expects($this->at(2))
343-
->method('isCandidate')
344-
->with('/cms/routes/not-a-route')
345-
->willReturn(true)
346-
;
347-
$this->candidatesMock
348-
->expects($this->at(3))
349-
->method('isCandidate')
350-
->with('/outside/prefix')
351-
->willReturn(false)
331+
->withConsecutive(['/cms/routes/test-route'], ['/cms/simple/other-route'], ['/cms/routes/not-a-route'], ['/outside/prefix'])
332+
->willReturnOnConsecutiveCalls(true, true, true, false)
352333
;
353334

354335
$paths[] = '/outside/prefix';
@@ -374,21 +355,8 @@ public function testGetRoutesByNamesNotCandidates(): void
374355
;
375356

376357
$this->candidatesMock
377-
->expects($this->at(0))
378-
->method('isCandidate')
379-
->with('/cms/routes/test-route')
380-
->willReturn(false)
381-
;
382-
$this->candidatesMock
383-
->expects($this->at(1))
384358
->method('isCandidate')
385-
->with('/cms/simple/other-route')
386-
->willReturn(false)
387-
;
388-
$this->candidatesMock
389-
->expects($this->at(2))
390-
->method('isCandidate')
391-
->with('/cms/routes/not-a-route')
359+
->withConsecutive(['/cms/routes/test-route'], ['/cms/simple/other-route'], ['/cms/routes/not-a-route'])
392360
->willReturn(false)
393361
;
394362

@@ -429,29 +397,15 @@ public function testGetRoutesByNamesUuid(): void
429397
->willReturn($uow)
430398
;
431399
$uow
432-
->expects($this->at(0))
433400
->method('getDocumentId')
434-
->with($route1)
435-
->willReturn('/cms/routes/test-route')
436-
;
437-
$uow
438-
->expects($this->at(1))
439-
->method('getDocumentId')
440-
->with($route2)
441-
->willReturn('/cms/routes/other-route')
401+
->withConsecutive([$route1], [$route2])
402+
->willReturnOnConsecutiveCalls('/cms/routes/test-route', '/cms/routes/other-route')
442403
;
443404

444405
$this->candidatesMock
445-
->expects($this->at(0))
446-
->method('isCandidate')
447-
->with('/cms/routes/test-route')
448-
->willReturn(true)
449-
;
450-
$this->candidatesMock
451-
->expects($this->at(1))
452406
->method('isCandidate')
453-
->with('/cms/routes/other-route')
454-
->willReturn(false)
407+
->withConsecutive(['/cms/routes/test-route'], ['/cms/routes/other-route'])
408+
->willReturnOnConsecutiveCalls(true, false)
455409
;
456410

457411
$routeProvider = new RouteProvider($this->managerRegistryMock, $this->candidatesMock);
@@ -463,7 +417,7 @@ public function testGetRoutesByNamesUuid(): void
463417

464418
private function doRouteDump($limit): void
465419
{
466-
$from = $this->createMock(SourceFactory::class);
420+
$from = $this->createMock(From::class);
467421
$from->expects($this->once())
468422
->method('document')
469423
->with(Route::class, 'd')

0 commit comments

Comments
 (0)