diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor interator test that was still assuming a tree

Browse Source
This commit is contained in:
Tobias Schultze 2012-12-07 11:44:47 +01:00
parent ceb9ab44a4
commit 9e2bcb5d9e
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
View File

@ -54,16 +54,19 @@ class RouteCollectionTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('/foo2', $collection->get('foo')->getPath()); $this->assertEquals('/foo2', $collection->get('foo')->getPath());
} }
public function testIteratorWithOverriddenRoutes() public function testIterator()
{ {
$collection = new RouteCollection(); $collection = new RouteCollection();
$collection->add('foo', new Route('/foo')); $collection->add('foo', new Route('/foo'));
$collection1 = new RouteCollection(); $collection1 = new RouteCollection();
$collection1->add('foo', new Route('/foo1')); $collection1->add('bar', $bar = new Route('/bar'));
$collection1->add('foo', $foo = new Route('/foo-new'));
$collection->addCollection($collection1); $collection->addCollection($collection1);
$collection->add('last', $last = new Route('/last'));
$this->assertEquals('/foo1', $this->getFirstNamedRoute($collection, 'foo')->getPath()); $this->assertInstanceOf('\ArrayIterator', $collection->getIterator());
$this->assertSame(array('bar' => $bar, 'foo' => $foo, 'last' => $last), $collection->getIterator()->getArrayCopy());
} }
public function testCount() public function testCount()
@ -72,25 +75,12 @@ class RouteCollectionTest extends \PHPUnit_Framework_TestCase
$collection->add('foo', new Route('/foo')); $collection->add('foo', new Route('/foo'));
$collection1 = new RouteCollection(); $collection1 = new RouteCollection();
$collection1->add('foo1', new Route('/foo1')); $collection1->add('bar', new Route('/bar'));
$collection->addCollection($collection1); $collection->addCollection($collection1);
$this->assertCount(2, $collection); $this->assertCount(2, $collection);
} }
protected function getFirstNamedRoute(RouteCollection $routeCollection, $name)
{
foreach ($routeCollection as $key => $route) {
if ($route instanceof RouteCollection) {
return $this->getFirstNamedRoute($route, $name);
}
if ($name === $key) {
return $route;
}
}
}
public function testAddCollection() public function testAddCollection()
{ {
if (!class_exists('Symfony\Component\Config\Resource\FileResource')) { if (!class_exists('Symfony\Component\Config\Resource\FileResource')) {