8000 fix tests mocking final events by Tobion · Pull Request #33482 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

fix tests mocking final events #33482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2019
Merged

fix tests mocking final events #33482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions src/Symfony/Bridge/Monolog/Tests/Processor/RouteProcessorTest.php
View file
Open in desktop
< 8000 /tr>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
use Symfony\Component\HttpFoundation\ParameterBag;
< 8000 /td> use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;

class RouteProcessorTest extends TestCase
{
Expand All @@ -28,7 +29,7 @@ public function testProcessor()
{
$request = $this->mockFilledRequest();
$processor = new RouteProcessor();
$processor->addRouteData($this->mockGetResponseEvent($request));
$processor->addRouteData($this->getRequestEvent($request));

$record = $processor(['extra' => []]);

Expand All @@ -44,7 +45,7 @@ public function testProcessorWithoutParams()
{
$request = $this->mockFilledRequest();
$processor = new RouteProcessor(false);
$processor->addRouteData($this->mockGetResponseEvent($request));
$processor->addRouteData($this->getRequestEvent($request));

$record = $processor(['extra' => []]);

Expand All @@ -63,8 +64,8 @@ public function testProcessorWithSubRequests()
$subRequest = $this->mockFilledRequest($controllerFromSubRequest);

$processor = new RouteProcessor(false);
$processor->addRouteData($this->mockGetResponseEvent($mainRequest));
$processor->addRouteData($this->mockGetResponseEvent($subRequest));
$processor->addRouteData($this->getRequestEvent($mainRequest));
$processor->addRouteData($this->getRequestEvent($subRequest, HttpKernelInterface::SUB_REQUEST));

$record = $processor(['extra' => []]);

Expand All @@ -86,9 +87,9 @@ public function testFinishRequestRemovesRelatedEntry()
$subRequest = $this->mockFilledRequest('OtherController::otherMethod');

$processor = new RouteProcessor(false);
$processor->addRouteData($this->mockGetResponseEvent($mainRequest));
$processor->addRouteData($this->mockGetResponseEvent($subRequest));
$processor->removeRouteData($this->mockFinishRequestEvent($subRequest));
$processor->addRouteData($this->getRequestEvent($mainRequest));
$processor->addRouteData($this->getRequestEvent($subRequest, HttpKernelInterface::SUB_REQUEST));
$processor->removeRouteData($this->getFinishRequestEvent($subRequest));
$record = $processor(['extra' => []]);

$this->assertArrayHasKey('requests', $record['extra']);
Expand All @@ -98,7 +99,7 @@ public function testFinishRequestRemovesRelatedEntry()
$record['extra']['requests'][0]
);

$processor->removeRouteData($this->mockFinishRequestEvent($mainRequest));
$processor->removeRouteData($this->getFinishRequestEvent($mainRequest));
$record = $processor(['extra' => []]);

$this->assertArrayNotHasKey('requests', $record['extra']);
Expand All @@ -108,7 +109,7 @@ public function testProcessorWithEmptyRequest()
{
$request = $this->mockEmptyRequest();
$processor = new RouteProcessor();
$processor->addRouteData($this->mockGetResponseEvent($request));
$processor->addRouteData($this->getRequestEvent($request));

$record = $processor(['extra' => []]);
$this->assertEquals(['extra' => []], $record);
Expand All @@ -122,20 +123,14 @@ public function testProcessorDoesNothingWhenNoRequest()
$this->assertEquals(['extra' => []], $record);
}

private function mockGetResponseEvent(Request $request): GetResponseEvent
private function getRequestEvent(Request $request, int $requestType = HttpKernelInterface::MASTER_REQUEST): RequestEvent
{
$event = $this->getMockBuilder(GetResponseEvent::class)->disableOriginalConstructor()->getMock();
$event->method('getRequest')->willReturn($request);

return $event;
return new RequestEvent($this->createMock(HttpKernelInterface::class), $request, $requestType);
}

private function mockFinishRequestEvent(Request $request): FinishRequestEvent
private function getFinishRequestEvent(Request $request): FinishRequestEvent
{
$event = $this->getMockBuilder(FinishRequestEvent::class)->disableOriginalConstructor()->getMock();
$event->method('getRequest')->willReturn($request);

return $event;
return new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);
}

private function mockEmptyRequest(): Request
Expand Down
13 changes: 3 additions & 10 deletions src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Symfony\Bridge\Monolog\Processor\WebProcessor;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;

class WebProcessorTest extends TestCase
{
Expand Down Expand Up @@ -71,7 +72,7 @@ public function testCanBeConstructedWithExtraFields()
$this->assertEquals($server['HTTP_REFERER'], $record['extra']['referrer']);
}

private function createRequestEvent($additionalServerParameters = []): array
private function createRequestEvent(array $additionalServerParameters = []): array
{
$server = array_merge(
[
Expand All @@ -88,15 +89,7 @@ private function createRequestEvent($additionalServerParameters = []): array
$request->server->replace($server);
$request->headers->replace($server);

$event = $this->getMockBuilder(RequestEvent::class)
->disableOriginalConstructor()
->getMock();
$event->expects($this->any())
->method('isMasterRequest')
->willReturn(true);
$event->expects($this->any())
->method('getRequest')
->willReturn($request);
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST);

return [$event, $server];
}
Expand Down
3 changes: 2 additions & 1 deletion src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\EventListener\LocaleListener;
use Symfony\Component\HttpKernel\HttpKernelInterface;
Expand Down Expand Up @@ -96,7 +97,7 @@ public function testRouterResetWithParentRequestOnKernelFinishRequest()

$this->requestStack->expects($this->once())->method('getParentRequest')->willReturn($parentRequest);

$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\FinishRequestEvent')->disableOriginalConstructor()->getMock();
$event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MASTER_REQUEST);

$listener = new LocaleListener($this->requestStack, 'fr', $router);
$listener->onKernelFinishRequest($event);
Expand Down
10 changes: 1 addition & 9 deletions src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,6 @@ public function testOnKernelResponseListenerRemovesItself()
{
$tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
$dispatcher = $this->getMockBuilder(EventDispatcherInterface::class)->getMock();
$event = $this->getMockBuilder(ResponseEvent::class)
->disableOriginalConstructor()
->getMock();

$listener = new ContextListener($tokenStorage, [], 'key123', null, $dispatcher);

Expand All @@ -218,12 +215,7 @@ public function testOnKernelResponseListenerRemovesItself()
->method('hasSession')
->willReturn(true);

$event->expects($this->any())
->method('isMasterRequest')
->willReturn(true);
$event->expects($this->any())
->method('getRequest')
->willReturn($request);
$event = new ResponseEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST, new Response());

$dispatcher->expects($this->once())
->method('removeListener')
Expand Down
12 changes: 2 additions & 10 deletions src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,8 @@ private function getResponse()
return $response;
}

private function getEvent($request, $response, $type = HttpKernelInterface::MASTER_REQUEST)
private function getEvent(Request $request, Response $response, int $type = HttpKernelInterface::MASTER_REQUEST): ResponseEvent
{
$event = $this->getMockBuilder(ResponseEvent::class)
->disableOriginalConstructor()
->getMock();

$event->expects($this->any())->method('getRequest')->willReturn($request);
$event->expects($this->any())->method('isMasterRequest')->willReturn(HttpKernelInterface::MASTER_REQUEST === $type);
$event->expects($this->any())->method('getResponse')->willReturn($response);

return $event;
return new ResponseEvent($this->createMock(HttpKernelInterface::class), $request, $type, $response);
}
}
6 changes: 2 additions & 4 deletions src/Symfony/Component/WebLink/Tests/EventListener/AddLinkHeaderListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Event\ResponseEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\WebLink\EventListener\AddLinkHeaderListener;
use Symfony\Component\WebLink\GenericLinkProvider;
Expand All @@ -33,10 +34,7 @@ public function testOnKernelResponse()

$subscriber = new AddLinkHeaderListener();

$event = $this->getMockBuilder(ResponseEvent::class)->disableOriginalConstructor()->getMock();
$event->method('isMasterRequest')->willReturn(true);
$event->method('getRequest')->willReturn($request);
$event->method('getResponse')->willReturn($response);
$event = new ResponseEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MASTER_REQUEST, $response);

$subscriber->onKernelResponse($event);

Expand Down
0