fix tests

Author: lsmith77

Tests/Routing/ContentAwareGeneratorTest.php

@@ -96,7 +96,7 @@ public function testGenerateEmptyRouteString()
 
     public function testGenerateRouteMultilang()
     {
-        $route_en = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Routing\\RouteMock', array('getDefaults', 'compile', 'getRouteContent'));
+        $route_en = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Routing\\RouteMock', array('getDefaults', 'compile', 'getContent'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');
@@ -106,7 +106,7 @@ public function testGenerateRouteMultilang()
             ->will($this->returnValue(array($route_en, $route_de)))
         ;
         $route_en->expects($this->once())
-            ->method('getRouteContent')
+            ->method('getContent')
             ->will($this->returnValue($this->contentDocument))
         ;
         $route_en->expects($this->never())
@@ -122,7 +122,7 @@ public function testGenerateRouteMultilang()
 
     public function testGenerateRouteMultilangLocaleNomatch()
     {
-        $route_en = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Routing\\RouteMock', array('getDefaults', 'compile', 'getRouteContent'));
+        $route_en = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Routing\\RouteMock', array('getDefaults', 'compile', 'getContent'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');
@@ -132,7 +132,7 @@ public function testGenerateRouteMultilangLocaleNomatch()
             ->will($this->returnValue(array($route_en, $route_de)))
         ;
         $route_en->expects($this->once())
-            ->method('getRouteContent')
+            ->method('getContent')
             ->will($this->returnValue($this->contentDocument))
         ;
         $route_en->expects($this->once())
@@ -148,7 +148,7 @@ public function testGenerateRouteMultilangLocaleNomatch()
 
     public function testGenerateNoncmfRouteMultilang()
     {
-        $route_en = $this->buildMock('Symfony\\Component\\Routing\\Route', array('getDefaults', 'compile', 'getRouteContent'));
+        $route_en = $this->buildMock('Symfony\\Component\\Routing\\Route', array('getDefaults', 'compile', 'getContent'));
 
         $route_en->expects($this->once())
             ->method('compile')
@@ -161,7 +161,7 @@ public function testGenerateNoncmfRouteMultilang()
     public function testGenerateRoutenameMultilang()
     {
         $name = 'foo/bar';
-        $route_en = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Routing\\RouteMock', array('getDefaults', 'compile', 'getRouteContent'));
+        $route_en = $this->buildMock('Symfony\\Cmf\\Component\\Routing\\Tests\\Routing\\RouteMock', array('getDefaults', 'compile', 'getContent'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');
@@ -176,7 +176,7 @@ public function testGenerateRoutenameMultilang()
             ->will($this->returnValue(array($route_en, $route_de)))
         ;
         $route_en->expects($this->once())
-            ->method('getRouteContent')
+            ->method('getContent')
             ->will($this->returnValue($this->contentDocument))
         ;
         $route_en->expects($this->never())

Tests/Routing/RouteMock.php

@@ -13,10 +13,12 @@ public function setLocale($locale)
     {
         $this->locale = $locale;
     }
-    public function getRouteContent()
+
+    public function getContent()
     {
         return null;
     }
+
     public function getDefaults()
     {
         $defaults = array();
@@ -26,6 +28,7 @@ public function getDefaults()
 
         return $defaults;
     }
+
     public function getRequirement($key)
     {
         if (! $key == '_locale') {
@@ -34,6 +37,7 @@ public function getRequirement($key)
 
         return $this->locale;
     }
+
     public function getRouteKey()
     {
         return null;