Merge pull request #23 from dantleech/testing_comp

[WIP] Integration of testing component

Author: dantleech

.gitignore

@@ -1,2 +1,4 @@
-/vendor/
-/Tests/Functional/app/cache/
+Tests/Resources/app/cache
+Tests/Resources/app/logs
+composer.lock
+vendor

.travis.yml

@@ -1,17 +1,13 @@
 language: php
 
-php:
-    - 5.3
-    - 5.4
-
 env:
-  - SYMFONY_VERSION=2.1.*
   - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=dev-master
 
 before_script:
-  - ./Tests/Functional/init_travis.sh
+  - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
+  - composer install --dev
+  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
 script: phpunit --coverage-text
 

EventListener/AutoRouteListener.php

@@ -6,7 +6,6 @@
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Document\AutoRoute;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\AutoRouteManager;
 
 /**
  * Doctrine PHPCR ODM listener for maintaining automatic routes.

Tests/Functional/BaseTestCase.php

@@ -2,36 +2,15 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional;
 
-require __DIR__.'/app/AppKernel.php';
-
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\AppKernel;
+use Symfony\Cmf\Component\Testing\Functional\BaseTestCase as TestingBaseTestCase;
 
-class BaseTestCase extends WebTestCase
+class BaseTestCase extends TestingBaseTestCase
 {
-    static protected function createKernel(array $options = array())
-    {
-        return new AppKernel(
-            isset($options['config']) ? $options['config'] : 'default.yml'
-        );
-    }
-
-    public function getContainer()
-    {
-        return self::$kernel->getContainer();
-    }
-
-    public function getDm()
-    {
-        return $this->getContainer()->get('doctrine_phpcr.odm.document_manager');
-    }
-
     public function setUp(array $options = array(), $routebase = null)
     {
-        self::$kernel = self::createKernel($options);
-        self::$kernel->init();
-        self::$kernel->boot();
-
         $session = $this->getContainer()->get('doctrine_phpcr.session');
 
         if ($session->nodeExists('/test')) {
@@ -50,5 +29,10 @@ public function getApplication()
         $application = new Application(self::$kernel);
         return $application;
     }
+
+    public function getDm()
+    {
+        return $this->db('PHPCR')->getOm();
+    }
 }
 

Tests/Functional/Command/RefreshCommandTest.php

@@ -2,9 +2,10 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\Command;
 
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\app\Document\Blog;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\app\Document\Post;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post;
+
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Command\RefreshCommand;

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -2,9 +2,9 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\Subscriber;
 
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\app\Document\Blog;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\app\Document\Post;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post;
 
 class AutoRouteListenerTest extends BaseTestCase
 {