diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/HttpFoundation/SessionListenerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/HttpFoundation/SessionListenerTest.php index c31b1851d3..1ab432c1d6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/HttpFoundation/SessionListenerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/HttpFoundation/SessionListenerTest.php @@ -37,55 +37,28 @@ class SessionListenerTest extends \PHPUnit_Framework_TestCase public function testShouldSaveMasterRequestSession() { - $this->handle(new Request()); - - $this->assertRequestIsMaster(); - $this->sessionMustBeSaved(); - $this->filterResponse(); + $this->filterResponse(new Request()); } public function testShouldNotSaveSubRequestSession() { - $this->handle(new Request(), HttpKernelInterface::SUB_REQUEST); - - $this->assertRequestIsNotMaster(); - $this->sessionMustNotBeSaved(); - $this->filterResponse(); + $this->filterResponse(new Request(), HttpKernelInterface::SUB_REQUEST); } - private function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST) + private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST) { $request->setSession($this->session); - - $this->listener->handle(new Event($this, 'core.request', array( - 'request' => $request, - 'request_type' => $type - ))); - } - - private function filterResponse() - { $response = new Response(); $this->assertSame($response, $this->listener->filter(new Event( - $this, 'core.response' + $this, 'core.response', array('request' => $request, 'request_type' => $type) ), $response)); } - private function assertRequestIsMaster() - { - $this->assertTrue($this->listener->isMaster()); - } - - private function assertRequestIsNotMaster() - { - $this->assertFalse($this->listener->isMaster()); - } - private function sessionMustNotBeSaved() { $this->session->expects($this->never())