Merge branch '3.0'

* 3.0:
  fix controller tests
  move test methods to test case class

Author: xabbuh

Tests/Controller/ControllerTest.php

@@ -19,6 +19,8 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\User\User;
@@ -342,49 +344,6 @@ public function testIsCsrfTokenValid()
 
         $this->assertTrue($controller->isCsrfTokenValid('foo', 'bar'));
     }
-}
-
-class TestController extends Controller
-{
-    public function forward($controller, array $path = array(), array $query = array())
-    {
-        return parent::forward($controller, $path, $query);
-    }
-
-    public function getUser()
-    {
-        return parent::getUser();
-    }
-
-    public function json($data, $status = 200, $headers = array(), $context = array())
-    {
-        return parent::json($data, $status, $headers, $context);
-    }
-
-    public function isGranted($attributes, $object = null)
-    {
-        return parent::isGranted($attributes, $object);
-    }
-
-    public function denyAccessUnlessGranted($attributes, $object = null, $message = 'Access Denied.')
-    {
-        parent::denyAccessUnlessGranted($attributes, $object, $message);
-    }
-
-    public function redirectToRoute($route, array $parameters = array(), $status = 302)
-    {
-        return parent::redirectToRoute($route, $parameters, $status);
-    }
-
-    public function addFlash($type, $message)
-    {
-        parent::addFlash($type, $message);
-    }
-
-    public function isCsrfTokenValid($id, $token)
-    {
-        return parent::isCsrfTokenValid($id, $token);
-    }
 
     public function testGenerateUrl()
     {
@@ -394,15 +353,15 @@ public function testGenerateUrl()
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container->expects($this->at(0))->method('get')->will($this->returnValue($router));
 
-        $controller = new Controller();
+        $controller = new TestController();
         $controller->setContainer($container);
 
         $this->assertEquals('/foo', $controller->generateUrl('foo'));
     }
 
     public function testRedirect()
     {
-        $controller = new Controller();
+        $controller = new TestController();
         $response = $controller->redirect('http://dunglas.fr', 301);
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
@@ -416,9 +375,10 @@ public function testRenderViewTemplating()
         $templating->expects($this->once())->method('render')->willReturn('bar');
 
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-        $container->expects($this->at(0))->method('get')->will($this->returnValue($templating));
+        $container->expects($this->at(0))->method('has')->willReturn(true);
+        $container->expects($this->at(1))->method('get')->will($this->returnValue($templating));
 
-        $controller = new Controller();
+        $controller = new TestController();
         $controller->setContainer($container);
 
         $this->assertEquals('bar', $controller->renderView('foo'));
@@ -430,9 +390,10 @@ public function testRenderTemplating()
         $templating->expects($this->once())->method('renderResponse')->willReturn(new Response('bar'));
 
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-        $container->expects($this->at(0))->method('get')->will($this->returnValue($templating));
+        $container->expects($this->at(0))->method('has')->willReturn(true);
+        $container->expects($this->at(1))->method('get')->will($this->returnValue($templating));
 
-        $controller = new Controller();
+        $controller = new TestController();
         $controller->setContainer($container);
 
         $this->assertEquals('bar', $controller->render('foo')->getContent());
@@ -443,17 +404,18 @@ public function testStreamTemplating()
         $templating = $this->getMock('Symfony\Component\Routing\RouterInterface');
 
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-        $container->expects($this->at(0))->method('get')->will($this->returnValue($templating));
+        $container->expects($this->at(0))->method('has')->willReturn(true);
+        $container->expects($this->at(1))->method('get')->will($this->returnValue($templating));
 
-        $controller = new Controller();
+        $controller = new TestController();
         $controller->setContainer($container);
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $controller->stream('foo'));
     }
 
     public function testCreateNotFoundException()
     {
-        $controller = new Controller();
+        $controller = new TestController();
 
         $this->assertInstanceOf('Symfony\Component\HttpKernel\Exception\NotFoundHttpException', $controller->createNotFoundException());
     }
@@ -468,7 +430,7 @@ public function testCreateForm()
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container->expects($this->at(0))->method('get')->will($this->returnValue($formFactory));
 
-        $controller = new Controller();
+        $controller = new TestController();
         $controller->setContainer($container);
 
         $this->assertEquals($form, $controller->createForm('foo'));
@@ -484,7 +446,7 @@ public function testCreateFormBuilder()
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container->expects($this->at(0))->method('get')->will($this->returnValue($formFactory));
 
-        $controller = new Controller();
+        $controller = new TestController();
         $controller->setContainer($container);
 
         $this->assertEquals($formBuilder, $controller->createFormBuilder('foo'));
@@ -498,9 +460,102 @@ public function testGetDoctrine()
         $container->expects($this->at(0))->method('has')->will($this->returnValue(true));
         $container->expects($this->at(1))->method('get')->will($this->returnValue($doctrine));
 
-        $controller = new Controller();
+        $controller = new TestController();
         $controller->setContainer($container);
 
         $this->assertEquals($doctrine, $controller->getDoctrine());
     }
 }
+
+class TestController extends Controller
+{
+    public function generateUrl($route, $parameters = array(), $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
+    {
+        return parent::generateUrl($route, $parameters, $referenceType);
+    }
+
+    public function redirect($url, $status = 302)
+    {
+        return parent::redirect($url, $status);
+    }
+
+    public function forward($controller, array $path = array(), array $query = array())
+    {
+        return parent::forward($controller, $path, $query);
+    }
+
+    public function getUser()
+    {
+        return parent::getUser();
+    }
+
+    public function json($data, $status = 200, $headers = array(), $context = array())
+    {
+        return parent::json($data, $status, $headers, $context);
+    }
+
+    public function isGranted($attributes, $object = null)
+    {
+        return parent::isGranted($attributes, $object);
+    }
+
+    public function denyAccessUnlessGranted($attributes, $object = null, $message = 'Access Denied.')
+    {
+        parent::denyAccessUnlessGranted($attributes, $object, $message);
+    }
+
+    public function redirectToRoute($route, array $parameters = array(), $status = 302)
+    {
+        return parent::redirectToRoute($route, $parameters, $status);
+    }
+
+    public function addFlash($type, $message)
+    {
+        parent::addFlash($type, $message);
+    }
+
+    public function isCsrfTokenValid($id, $token)
+    {
+        return parent::isCsrfTokenValid($id, $token);
+    }
+
+    public function renderView($view, array $parameters = array())
+    {
+        return parent::renderView($view, $parameters);
+    }
+
+    public function render($view, array $parameters = array(), Response $response = null)
+    {
+        return parent::render($view, $parameters, $response);
+    }
+
+    public function stream($view, array $parameters = array(), StreamedResponse $response = null)
+    {
+        return parent::stream($view, $parameters, $response);
+    }
+
+    public function createNotFoundException($message = 'Not Found', \Exception $previous = null)
+    {
+        return parent::createNotFoundException($message, $previous);
+    }
+
+    public function createAccessDeniedException($message = 'Access Denied.', \Exception $previous = null)
+    {
+        return parent::createAccessDeniedException($message, $previous);
+    }
+
+    public function createForm($type, $data = null, array $options = array())
+    {
+        return parent::createForm($type, $data, $options);
+    }
+
+    public function createFormBuilder($data = null, array $options = array())
+    {
+        return parent::createFormBuilder($data, $options);
+    }
+
+    public function getDoctrine()
+    {
+        return parent::getDoctrine();
+    }
+}