merged branch jakzal/2.3-router-tests (PR #8102)
This PR was merged into the 2.3 branch.
Discussion
----------
[Routing] Added Router tests and fixed an exception message
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
e61ba7d
[Routing] Added Router tests and fixed an exception message.
This commit is contained in:
commit
750ca71e18
@ -125,7 +125,7 @@ class Router implements RouterInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($invalid) {
|
if ($invalid) {
|
||||||
throw new \InvalidArgumentException(sprintf('The Router does not support the following options: "%s".', implode('\', \'', $invalid)));
|
throw new \InvalidArgumentException(sprintf('The Router does not support the following options: "%s".', implode('", "', $invalid)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
138
src/Symfony/Component/Routing/Tests/RouterTest.php
Normal file
138
src/Symfony/Component/Routing/Tests/RouterTest.php
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Routing\Tests;
|
||||||
|
|
||||||
|
use Symfony\Component\Routing\Router;
|
||||||
|
|
||||||
|
class RouterTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
private $router = null;
|
||||||
|
|
||||||
|
private $loader = null;
|
||||||
|
|
||||||
|
protected function setUp()
|
||||||
|
{
|
||||||
|
$this->loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
|
||||||
|
$this->router = new Router($this->loader, 'routing.yml');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSetOptionsWithSupportedOptions()
|
||||||
|
{
|
||||||
|
$this->router->setOptions(array(
|
||||||
|
'cache_dir' => './cache',
|
||||||
|
'debug' => true,
|
||||||
|
'resource_type' => 'ResourceType'
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertSame('./cache', $this->router->getOption('cache_dir'));
|
||||||
|
$this->assertTrue($this->router->getOption('debug'));
|
||||||
|
$this->assertSame('ResourceType', $this->router->getOption('resource_type'));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage The Router does not support the following options: "option_foo", "option_bar"
|
||||||
|
*/
|
||||||
|
public function testSetOptionsWithUnsupportedOptions()
|
||||||
|
{
|
||||||
|
$this->router->setOptions(array(
|
||||||
|
'cache_dir' => './cache',
|
||||||
|
'option_foo' => true,
|
||||||
|
'option_bar' => 'baz',
|
||||||
|
'resource_type' => 'ResourceType'
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSetOptionWithSupportedOption()
|
||||||
|
{
|
||||||
|
$this->router->setOption('cache_dir', './cache');
|
||||||
|
|
||||||
|
$this->assertSame('./cache', $this->router->getOption('cache_dir'));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage The Router does not support the "option_foo" option
|
||||||
|
*/
|
||||||
|
public function testSetOptionWithUnsupportedOption()
|
||||||
|
{
|
||||||
|
$this->router->setOption('option_foo', true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage The Router does not support the "option_foo" option
|
||||||
|
*/
|
||||||
|
public function testGetOptionWithUnsupportedOption()
|
||||||
|
{
|
||||||
|
$this->router->getOption('option_foo', true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testThatRouteCollectionIsLoaded()
|
||||||
|
{
|
||||||
|
$this->router->setOption('resource_type', 'ResourceType');
|
||||||
|
|
||||||
|
$routeCollection = $this->getMock('Symfony\Component\Routing\RouteCollection');
|
||||||
|
|
||||||
|
$this->loader->expects($this->once())
|
||||||
|
->method('load')->with('routing.yml', 'ResourceType')
|
||||||
|
->will($this->returnValue($routeCollection));
|
||||||
|
|
||||||
|
$this->assertSame($routeCollection, $this->router->getRouteCollection());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideMatcherOptionsPreventingCaching
|
||||||
|
*/
|
||||||
|
public function testMatcherIsCreatedIfCacheIsNotConfigured($option)
|
||||||
|
{
|
||||||
|
$this->router->setOption($option, null);
|
||||||
|
|
||||||
|
$this->loader->expects($this->once())
|
||||||
|
->method('load')->with('routing.yml', null)
|
||||||
|
->will($this->returnValue($this->getMock('Symfony\Component\Routing\RouteCollection')));
|
||||||
|
|
||||||
|
$this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function provideMatcherOptionsPreventingCaching()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('cache_dir'),
|
||||||
|
array('matcher_cache_class')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideGeneratorOptionsPreventingCaching
|
||||||
|
*/
|
||||||
|
public function testGeneratorIsCreatedIfCacheIsNotConfigured($option)
|
||||||
|
{
|
||||||
|
$this->router->setOption($option, null);
|
||||||
|
|
||||||
|
$this->loader->expects($this->once())
|
||||||
|
->method('load')->with('routing.yml', null)
|
||||||
|
->will($this->returnValue($this->getMock('Symfony\Component\Routing\RouteCollection')));
|
||||||
|
|
||||||
|
$this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function provideGeneratorOptionsPreventingCaching()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('cache_dir'),
|
||||||
|
array('generator_cache_class')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user