فهرست منبع

[HttpFoundation] fixed unit tests

Fabien Potencier 14 سال پیش
والد
کامیت
7a2522b6ed
1فایلهای تغییر یافته به همراه4 افزوده شده و 31 حذف شده
  1. 4 31
      src/Symfony/Bundle/FrameworkBundle/Tests/HttpFoundation/SessionListenerTest.php

+ 4 - 31
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())