merged branch jfsimon/issue-7325 (PR symfony#7393)

fabpot · fabpot · commit 3a03f3e346b1 · 2013-03-16T16:52:12.000+01:00
This PR was merged into the 2.1 branch. Commits ------- bd38483 [Security] fixed HttpUtils class tests Discussion ---------- [Security] fixed HttpUtils class tests This fixes tests broken in symfony#7325. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#7325
diff --git a/src/Symfony/Component/Security/Tests/Http/HttpUtilsTest.php b/src/Symfony/Component/Security/Tests/Http/HttpUtilsTest.php
@@ -137,16 +137,16 @@ public function testCheckRequestPathWithUrlMatcherLoadingException()
         $utils->checkRequestPath($this->getRequest(), 'foobar');
     }
 
-    public function testGenerateUrlRemovesQueryString()
+    public function testGenerateUriRemovesQueryString()
     {
-        $method = new \ReflectionMethod('Symfony\Component\Security\Http\HttpUtils', 'generateUrl');
+        $method = new \ReflectionMethod('Symfony\Component\Security\Http\HttpUtils', 'generateUri');
         $method->setAccessible(true);
 
         $utils = new HttpUtils($this->getUrlGenerator());
-        $this->assertEquals('/foo/bar', $method->invoke($utils, 'route_name'));
+        $this->assertEquals('/foo/bar', $method->invoke($utils, new Request(), 'route_name'));
 
         $utils = new HttpUtils($this->getUrlGenerator('/foo/bar?param=value'));
-        $this->assertEquals('/foo/bar', $method->invoke($utils, 'route_name'));
+        $this->assertEquals('/foo/bar', $method->invoke($utils, new Request(), 'route_name'));
     }
 
     private function getUrlGenerator($generatedUrl = '/foo/bar')

Original file line number	Diff line number	Diff line change
`@@ -137,16 +137,16 @@ public function testCheckRequestPathWithUrlMatcherLoadingException()`
`137`	`137`	`$utils->checkRequestPath($this->getRequest(), 'foobar');`
`138`	`138`	`}`
`139`	`139`
`140`		`- public function testGenerateUrlRemovesQueryString()`
	`140`	`+ public function testGenerateUriRemovesQueryString()`
`141`	`141`	`{`
`142`		`- $method = new \ReflectionMethod('Symfony\Component\Security\Http\HttpUtils', 'generateUrl');`
	`142`	`+ $method = new \ReflectionMethod('Symfony\Component\Security\Http\HttpUtils', 'generateUri');`
`143`	`143`	`$method->setAccessible(true);`
`144`	`144`
`145`	`145`	`$utils = new HttpUtils($this->getUrlGenerator());`
`146`		`- $this->assertEquals('/foo/bar', $method->invoke($utils, 'route_name'));`
	`146`	`+ $this->assertEquals('/foo/bar', $method->invoke($utils, new Request(), 'route_name'));`
`147`	`147`
`148`	`148`	`$utils = new HttpUtils($this->getUrlGenerator('/foo/bar?param=value'));`
`149`		`- $this->assertEquals('/foo/bar', $method->invoke($utils, 'route_name'));`
	`149`	`+ $this->assertEquals('/foo/bar', $method->invoke($utils, new Request(), 'route_name'));`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`private function getUrlGenerator($generatedUrl = '/foo/bar')`