refactor interator test that was still assuming a tree

Tobion · Tobion · commit 9e2bcb5d9e74 · 2013-03-05T15:23:54.000+01:00
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
@@ -54,16 +54,19 @@ public function testDeepOverriddenRoute()
         $this->assertEquals('/foo2', $collection->get('foo')->getPath());
     }
 
-    public function testIteratorWithOverriddenRoutes()
+    public function testIterator()
     {
         $collection = new RouteCollection();
         $collection->add('foo', new Route('/foo'));
 
         $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->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()
@@ -72,25 +75,12 @@ public function testCount()
         $collection->add('foo', new Route('/foo'));
 
         $collection1 = new RouteCollection();
-        $collection1->add('foo1', new Route('/foo1'));
+        $collection1->add('bar', new Route('/bar'));
         $collection->addCollection($collection1);
 
         $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()
     {
         if (!class_exists('Symfony\Component\Config\Resource\FileResource')) {
