Merge pull request #132 from dantleech/testing_component

[WIP] Integrating Testing Component

Author: dantleech

.gitignore

@@ -1,5 +1,5 @@
 phpunit.xml
 composer.lock
-/vendor
-Tests/Functional/config/parameters.yml
-Tests/Functional/app.sqlite
+vendor
+Tests/Resources/app/cache
+Tests/Resources/app/logs

.travis.yml

@@ -11,11 +11,8 @@ env:
   - SYMFONY_VERSION=dev-master
 
 before_script:
-  - composer self-update
   - composer require symfony/framework-bundle:${SYMFONY_VERSION} --prefer-source
-  - cp ./Tests/Functional/config/parameters.yml.dist ./Tests/Functional/config/parameters.yml
-  - php Tests/Functional/console doctrine:phpcr:init:dbal
-  - php Tests/Functional/console doctrine:phpcr:repository:init
+  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
 script: phpunit --coverage-text
 

Tests/Functional/Admin/RouteAdminTest.php

@@ -7,29 +7,26 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\Admin;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Admin\RouteAdmin;
-use Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\BaseTestCase;
 use Symfony\Component\Routing\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\BaseTestCase;
 
 class RouteAdminTest extends BaseTestCase
 {
     /**
      * @var RouteAdmin
      */
-    private static $routeAdmin;
+    private $routeAdmin;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     private $errorElement;
 
-    public static function setupBeforeClass(array $options = array(), $routebase = null)
-    {
-        parent::setUpBeforeClass($options, $routebase);
-        self::$routeAdmin = self::$kernel->getContainer()->get('cmf_routing.route_admin');
-    }
-
     protected function setUp()
     {
+        parent::setUp();
+        $this->db('PHPCR')->createTestNode();
+        $this->routeAdmin = $this->getContainer()->get('cmf_routing.route_admin');
         $this->errorElement = $this->getMockBuilder('Sonata\AdminBundle\Validator\ErrorElement')
             ->disableOriginalConstructor()
             ->getMock();
@@ -38,7 +35,7 @@ protected function setUp()
     public function testCorrectControllerPath()
     {
         $route = new Route('/', array('_controller' => 'FrameworkBundle:Redirect:redirect'));
-        self::$routeAdmin->validate($this->errorElement, $route);
+        $this->routeAdmin->validate($this->errorElement, $route);
     }
 
     public function testControllerPathViolation()
@@ -55,7 +52,7 @@ public function testControllerPathViolation()
         $this->errorElement->expects($this->once())
             ->method('end');
 
-        self::$routeAdmin->validate($this->errorElement, $route);
+        $this->routeAdmin->validate($this->errorElement, $route);
     }
 
     public function testTemplateViolation()
@@ -72,12 +69,12 @@ public function testTemplateViolation()
         $this->errorElement->expects($this->once())
             ->method('end');
 
-        self::$routeAdmin->validate($this->errorElement, $route);
+        $this->routeAdmin->validate($this->errorElement, $route);
     }
 
     public function testCorrectTemplate()
     {
         $route = new Route('/', array('_template' => 'TwigBundle::layout.html.twig'));
-        self::$routeAdmin->validate($this->errorElement, $route);
+        $this->routeAdmin->validate($this->errorElement, $route);
     }
 }

Tests/Functional/AppKernel.php

@@ -5,53 +5,39 @@
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Cmf\Component\Testing\Functional\BaseTestCase as ComponentBaseTestCase;
+use PHPCR\Util\PathHelper;
+use Symfony\Cmf\Component\Testing\Document\Content;
 
-class BaseTestCase extends WebTestCase
+class BaseTestCase extends ComponentBaseTestCase
 {
-    /**
-     * @var \Doctrine\ODM\PHPCR\DocumentManager
-     */
-    protected static $dm;
-
-    protected static function createKernel(array $options = array())
+    protected function getDm()
     {
-        return new AppKernel(
-            isset($options['config']) ? $options['config'] : 'default.yml'
-        );
+        $dm = $this->db('PHPCR')->getOm();
+        return $dm;
     }
 
-    /**
-     * careful: the kernel is shut down after the first test, if you need the
-     * kernel, recreate it.
-     *
-     * @param array  $options   passed to self:.createKernel
-     * @param string $routebase base name for routes under /test to use
-     */
-    public static function setupBeforeClass(array $options = array(), $routebase = null)
+    protected function createRoute($path)
     {
-        self::$kernel = self::createKernel($options);
-        self::$kernel->init();
-        self::$kernel->boot();
-
-        self::$dm = self::$kernel->getContainer()->get('doctrine_phpcr.odm.document_manager');
-
-        if (null == $routebase) {
-            return;
-        }
-
-        $session = self::$kernel->getContainer()->get('doctrine_phpcr.session');
-        if ($session->nodeExists("/test/$routebase")) {
-            $session->getNode("/test/$routebase")->remove();
-        }
-        if (! $session->nodeExists('/test')) {
-            $session->getRootNode()->addNode('test', 'nt:unstructured');
-        }
-        $session->save();
-
-        $root = self::$dm->find(null, '/test');
+        $parentPath = PathHelper::getParentPath($path);
+        $parent = $this->getDm()->find(null, $parentPath);
+        $name = PathHelper::getNodeName($path);
         $route = new Route;
-        $route->setPosition($root, $routebase);
-        self::$dm->persist($route);
-        self::$dm->flush();
+        $route->setPosition($parent, $name);
+        $this->getDm()->persist($route);
+        $this->getDm()->flush();
+
+        return $route;
+    }
+
+    protected function createContent($path)
+    {
+        $content = new Content;
+        $content->setId('/test/content');
+        $content->setTitle('Foo Content');
+        $this->getDm()->persist($content);
+        $this->getDm()->flush();
+
+        return $content;
     }
 }

Tests/Functional/BaseTestCase.php

@@ -3,13 +3,14 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\Controller;
 
 use PHPCR\Util\PathHelper;
-use Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\BaseTestCase;
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute;
 use Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController;
+use Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\BaseTestCase;
+use PHPCR\Util\NodeHelper;
 
 class RedirectControllerTest extends BaseTestCase
 {
@@ -18,32 +19,35 @@ class RedirectControllerTest extends BaseTestCase
     /**
      * @var \Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController
      */
-    protected static $controller;
+    protected $controller;
 
-    public static function setupBeforeClass(array $options = array(), $routebase = null)
+    public function setUp()
     {
-        parent::setupBeforeClass(array(), PathHelper::getNodeName(self::ROUTE_ROOT));
-        $router = self::$kernel->getContainer()->get('router');
-        self::$controller = new RedirectController($router);
+        parent::setUp();
+        $this->db('PHPCR')->createTestNode();
+        $this->createRoute(self::ROUTE_ROOT);
+
+        $router = $this->getContainer()->get('router');
+        $this->controller = new RedirectController($router);
     }
 
     public function testRedirectUri()
     {
-        $root = self::$dm->find(null, self::ROUTE_ROOT);
+        $root = $this->getDm()->find(null, self::ROUTE_ROOT);
 
         $redirect = new RedirectRoute;
         $redirect->setPosition($root, 'redirectUri');
         $redirect->setUri('http://example.com/test-url');
         $redirect->setParameters(array('test' => 7)); // parameters should be ignored in this case
         $redirect->setPermanent(true);
-        self::$dm->persist($redirect);
+        $this->getDm()->persist($redirect);
 
-        self::$dm->flush();
+        $this->getDm()->flush();
 
-        self::$dm->clear();
+        $this->getDm()->clear();
 
-        $redirect = self::$dm->find(null, self::ROUTE_ROOT.'/redirectUri');
-        $response = self::$controller->redirectAction($redirect);
+        $redirect = $this->getDm()->find(null, self::ROUTE_ROOT.'/redirectUri');
+        $response = $this->controller->redirectAction($redirect);
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
         $this->assertSame(301, $response->getStatusCode());
@@ -52,25 +56,27 @@ public function testRedirectUri()
 
     public function testRedirectContent()
     {
-        $root = self::$dm->find(null, self::ROUTE_ROOT);
+        $content = $this->createContent('/test/content');
+
+        $root = $this->getDm()->find(null, self::ROUTE_ROOT);
 
         $route = new Route;
-        $route->setContent($root); // this happens to be a referenceable node
+        $route->setContent($content);
         $route->setPosition($root, 'testroute');
-        self::$dm->persist($route);
+        $this->getDm()->persist($route);
 
         $redirect = new RedirectRoute;
         $redirect->setPosition($root, 'redirectContent');
         $redirect->setRouteTarget($route);
         $redirect->setParameters(array('test' => 'content'));
-        self::$dm->persist($redirect);
+        $this->getDm()->persist($redirect);
 
-        self::$dm->flush();
+        $this->getDm()->flush();
 
-        self::$dm->clear();
+        $this->getDm()->clear();
 
-        $redirect = self::$dm->find(null, self::ROUTE_ROOT.'/redirectContent');
-        $response = self::$controller->redirectAction($redirect);
+        $redirect = $this->getDm()->find(null, self::ROUTE_ROOT.'/redirectContent');
+        $response = $this->controller->redirectAction($redirect);
 
         $this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $response);
         $this->assertSame(302, $response->getStatusCode());
@@ -79,21 +85,20 @@ public function testRedirectContent()
 
     public function testRedirectName()
     {
-        $root = self::$dm->find(null, self::ROUTE_ROOT);
+        $root = $this->getDm()->find(null, self::ROUTE_ROOT);
 
         $redirect = new RedirectRoute;
         $redirect->setPosition($root, 'redirectName');
         $redirect->setRouteName('symfony_route');
         $redirect->setParameters(array('param'=>7)); // parameters should be ignored in this case
-        self::$dm->persist($redirect);
-
-        self::$dm->flush();
+        $this->getDm()->persist($redirect);
 
-        self::$dm->clear();
+        $this->getDm()->flush();
 
-        $redirect = self::$dm->find(null, self::ROUTE_ROOT.'/redirectName');
-        $response = self::$controller->redirectAction($redirect);
+        $this->getDm()->clear();
 
+        $redirect = $this->getDm()->find(null, self::ROUTE_ROOT.'/redirectName');
+        $response = $this->controller->redirectAction($redirect);
         $this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $response);
         $this->assertSame(302, $response->getStatusCode());
         $this->assertSame('http://localhost/symfony_route_test?param=7', $response->getTargetUrl());