Merge pull request #392 from symfony-cmf/cleanup-testing

cleanup unit testing

Author: dbu

.travis.yml

@@ -16,7 +16,7 @@ env:
   matrix:
     - SYMFONY_VERSION=3.2.*
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=231
+    - SYMFONY_DEPRECATIONS_HELPER=4
     - SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_DIR="./.phpunit" SYMFONY_PHPUNIT_VERSION=5.7
 
 matrix:

tests/Unit/Controller/RedirectControllerTest.php

@@ -12,10 +12,9 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Unit\Controller;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController;
-use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
 use Symfony\Component\Routing\RouterInterface;
 
-class RedirectControllerTest extends CmfUnitTestCase
+class RedirectControllerTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructor()
     {

tests/Unit/DependencyInjection/CmfRoutingExtensionTest.php

@@ -258,27 +258,6 @@ public function getBasePathsMergingTests()
         ];
     }
 
-    public function testLegacyRouteBasepath()
-    {
-        $this->container->setParameter(
-            'kernel.bundles',
-            ['CmfRoutingBundle' => true]
-        );
-
-        $this->load([
-            'dynamic' => [
-                'enabled' => true,
-                'persistence' => [
-                    'phpcr' => [
-                        'route_basepath' => '/cms/test',
-                    ],
-                ],
-            ],
-        ]);
-
-        $this->assertContainerBuilderHasParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths', ['/cms/test']);
-    }
-
     public function testInitializerEnabled()
     {
         $this->container->setParameter(

tests/Unit/Doctrine/Orm/RouteProviderTest.php

@@ -17,11 +17,10 @@
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\Route;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\RouteProvider;
 use Symfony\Cmf\Component\Routing\Candidates\CandidatesInterface;
-use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouteCollection;
 
-class RouteProviderTest extends CmfUnitTestCase
+class RouteProviderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Route|\PHPUnit_Framework_MockObject_MockObject

tests/Unit/Doctrine/Phpcr/IdPrefixListenerTest.php

@@ -16,9 +16,8 @@
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\IdPrefixListener;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\PrefixCandidates;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
-use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
 
-class IdPrefixListenerTest extends CmfUnitTestCase
+class IdPrefixListenerTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var IdPrefixListener

tests/Unit/Doctrine/Phpcr/LocaleListenerTest.php

@@ -17,9 +17,8 @@
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\LocaleListener;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\PrefixCandidates;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
-use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
 
-class LocaleListenerTest extends CmfUnitTestCase
+class LocaleListenerTest extends \PHPUnit_Framework_TestCase
 {
     /** @var LocaleListener */
     protected $listener;

tests/Unit/Doctrine/Phpcr/PrefixCandidatesTest.php

@@ -17,10 +17,9 @@
 use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
 use Doctrine\ODM\PHPCR\Translation\LocaleChooser\LocaleChooserInterface;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\PrefixCandidates;
-use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 
-class PrefixCandidatesTest extends CmfUnitTestCase
+class PrefixCandidatesTest extends \PHPUnit_Framework_TestCase
 {
     public function testAddPrefix()
     {

tests/Unit/Doctrine/Phpcr/RouteProviderTest.php

@@ -21,12 +21,11 @@
 use PHPCR\Util\UUIDHelper;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\PrefixCandidates;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RouteProvider;
-use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-class RouteProviderTest extends CmfUnitTestCase
+class RouteProviderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var ManagerRegistry|\PHPUnit_Framework_MockObject_MockObject

tests/Unit/Routing/DynamicRouterTest.php

@@ -15,7 +15,6 @@
 use Symfony\Cmf\Component\Routing\Event\Events;
 use Symfony\Cmf\Component\Routing\Event\RouterMatchEvent;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
-use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -24,7 +23,7 @@
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
 
-class DynamicRouterTest extends CmfUnitTestCase
+class DynamicRouterTest extends \PHPUnit_Framework_TestCase
 {
     protected $matcher;
     protected $generator;