[Framework][router commands] fixed failing test.

Author: aitboudad

Tests/Command/RouterDebugCommandTest.php

@@ -56,7 +56,7 @@ private function createCommandTester()
         $command->setContainer($this->getContainer());
         $application->add($command);
 
-        return new CommandTester($application->find('router:debug'));
+        return new CommandTester($application->find('debug:router'));
     }
 
     private function getContainer()
@@ -65,24 +65,29 @@ private function getContainer()
         $routeCollection->add('foo', new Route('foo'));
         $router = $this->getMock('Symfony\Component\Routing\RouterInterface');
         $router
-            ->expects($this->atLeastOnce())
+            ->expects($this->any())
             ->method('getRouteCollection')
             ->will($this->returnValue($routeCollection))
         ;
 
+        $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
+             ->disableOriginalConstructor()
+             ->getMock();
+
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container
             ->expects($this->once())
             ->method('has')
             ->with('router')
             ->will($this->returnValue(true))
         ;
+
         $container
-            ->expects($this->atLeastOnce())
             ->method('get')
-            ->with('router')
-            ->will($this->returnValue($router))
-        ;
+            ->will($this->returnValueMap(array(
+                array('router', 1, $router),
+                array('controller_name_converter', 1, $loader),
+            )));
 
         return $container;
     }

Tests/Command/RouterMatchCommandTest.php

@@ -74,19 +74,22 @@ private function getContainer()
             ->will($this->returnValue($requestContext))
         ;
 
+        $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
+             ->disableOriginalConstructor()
+             ->getMock();
+
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container
             ->expects($this->once())
             ->method('has')
             ->with('router')
-            ->will($this->returnValue(true))
-        ;
-        $container
-            ->expects($this->atLeastOnce())
-            ->method('get')
-            ->with('router')
-            ->will($this->returnValue($router))
-        ;
+            ->will($this->returnValue(true));
+        $container->method('get')
+            ->will($this->returnValueMap(array(
+                array('router', 1, $router),
+                array('controller_name_converter', 1, $loader),
+
+            )));
 
         return $container;
     }