fixed a test

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php

@@ -11,34 +11,32 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
 
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper;
 
 class SessionHelperTest extends \PHPUnit_Framework_TestCase
 {
-    protected $request;
+    protected $requestStack;
 
     protected function setUp()
     {
-        $this->request = new Request();
+        $this->requestStack = new RequestStack();
 
         $session = new Session(new MockArraySessionStorage());
         $session->set('foobar', 'bar');
         $session->getFlashBag()->set('notice', 'bar');
 
-        $this->request->setSession($session);
-    }
-
-    protected function tearDown()
-    {
-        $this->request = null;
+        $request = new Request();
+        $request->setSession($session);
+        $this->requestStack->push($request);
     }
 
     public function testFlash()
     {
-        $helper = new SessionHelper($this->request);
+        $helper = new SessionHelper($this->requestStack);
 
         $this->assertTrue($helper->hasFlash('notice'));
 
@@ -47,13 +45,13 @@ public function testFlash()
 
     public function testGetFlashes()
     {
-        $helper = new SessionHelper($this->request);
+        $helper = new SessionHelper($this->requestStack);
         $this->assertEquals(array('notice' => array('bar')), $helper->getFlashes());
     }
 
     public function testGet()
     {
-        $helper = new SessionHelper($this->request);
+        $helper = new SessionHelper($this->requestStack);
 
         $this->assertEquals('bar', $helper->get('foobar'));
         $this->assertEquals('foo', $helper->get('bar', 'foo'));
@@ -63,7 +61,7 @@ public function testGet()
 
     public function testGetName()
     {
-        $helper = new SessionHelper($this->request);
+        $helper = new SessionHelper($this->requestStack);
 
         $this->assertEquals('session', $helper->getName());
     }

src/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -127,7 +127,7 @@ public function testAdd()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException LogicException
      * @expectedExceptionMessage You must call the parent constructor in "Foo5Command::__construct()"
      */
     public function testAddCommandWithEmptyContructor()